diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 68773ecab3..030de9159c 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -39,5 +39,8 @@ jobs:
           path: "doc-base"
           repository: "php/doc-base"
 
+      - name: "Quality Assurance scripts"
+        run: "php8.0 doc-base/scripts/qa/extensions.xml.php --check"
+
       - name: "Build documentation for ${{ matrix.language }}"
         run: "php8.0 doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }}"
diff --git a/appendices/aliases.xml b/appendices/aliases.xml
index 2c85c0f598..2384241d9c 100644
--- a/appendices/aliases.xml
+++ b/appendices/aliases.xml
@@ -221,11 +221,6 @@
       <entry><function>ldap_unbind</function></entry>
       <entry><link linkend="ref.ldap">LDAP</link></entry>
      </row>
-     <row>
-      <entry>magic_quotes_runtime</entry>
-      <entry><function>set_magic_quotes_runtime</function></entry>
-      <entry>Base syntax</entry>
-     </row>
      <row>
       <entry>mbstrcut</entry>
       <entry><function>mb_strcut</function></entry>
diff --git a/appendices/configure/misc.xml b/appendices/configure/misc.xml
index d9f5d68004..a5416ec9cc 100644
--- a/appendices/configure/misc.xml
+++ b/appendices/configure/misc.xml
@@ -168,29 +168,6 @@ code!
     </listitem>
    </varlistentry>
 
-   <varlistentry xml:id="configure.enable-memory-limit">
-    <term>
-     <option role="configure">--enable-memory-limit</option>
-    </term>
-    <listitem>
-     <para>
-      Compile with memory limit support.
-      (not available since PHP 5.2.1 - always enabled)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="configure.disable-url-fopen-wrapper">
-    <term>
-     <option role="configure">--disable-url-fopen-wrapper</option>
-    </term>
-    <listitem>
-     <para>
-      Disable the URL-aware fopen wrapper that allows
-      accessing files via HTTP or FTP.
-      (not available since PHP 5.2.5)
-     </para>
-    </listitem>
-   </varlistentry>
    <varlistentry xml:id="configure.enable-versioning.php4">
     <term>
      <option role="configure">--enable-versioning</option>
diff --git a/appendices/configure/servers.xml b/appendices/configure/servers.xml
index e0fa3c67d3..cac0e0148f 100644
--- a/appendices/configure/servers.xml
+++ b/appendices/configure/servers.xml
@@ -73,7 +73,7 @@
     </term>
     <listitem>
      <para>
-      Enable phpdbg interactive debugger SAPI module support in PHP 5.6.x or later.
+      Enable phpdbg interactive debugger SAPI module support.
      </para>
     </listitem>
    </varlistentry>
@@ -112,100 +112,11 @@
       Disable building CGI version of PHP.
      </para>
      <para>
-      As of PHP 5.3.0 this argument enables FastCGI which previously 
-      had to be enabled using <literal>--enable-fastcgi</literal>.
+      This argument also enables FastCGI.
      </para>
     </listitem>
    </varlistentry>
 
-   <varlistentry xml:id="configure.enable-force-cgi-redirect">
-    <term>
-     <option role="configure">--enable-force-cgi-redirect</option>
-    </term>
-    <listitem>
-     <para>
-      Enable the security check for internal server redirects. You should use
-      this if you are running the CGI version with Apache.
-     </para>
-     <para>
-      As of PHP 5.3.0 this argument is enabled by default and no longer 
-      exists. To disable this, the 
-      <link linkend="ini.cgi.force-redirect">cgi.force_redirect</link> ini directive 
-      should be set to <literal>0</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="configure.enable-discard-path">
-    <term>
-     <option role="configure">--enable-discard-path</option>
-    </term>
-    <listitem>
-     <para>
-      If this is enabled, the PHP CGI binary can safely be placed outside of
-      the web tree and people will not be able to circumvent &htaccess;
-      security.
-     </para>
-     <para>
-      As of PHP 5.3.0 this argument is disabled by default and no longer 
-      exists. To enable this feature the cgi.discard_path ini directive 
-      must be set to <literal>1</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-  <!--<varlistentry xml:id="configure.disable-path-info-check">
-    <term>
-     <option role="configure">disable-path-info-check</option>
-    </term>
-    <listitem>
-     <para>
-      Disables path info checks, disabling paths such as 
-      <literal>/file.php/test?a=b</literal>.
-     </para>
-     <para>
-      As of PHP 5.3.0 this argument is enabled by default and no longer 
-      exists. To disable this, the 
-      <link linkend="ini.cgi.fix-pathinfo">cgi.fix_pathinfo</link> ini directive 
-      should be set to <literal>0</literal>.
-     </para>
-    </listitem>
-   </varlistentry> -->
-
-   <varlistentry xml:id="configure.enable-fastcgi">
-    <term>
-     <option role="configure">--enable-fastcgi</option>
-    </term>
-    <listitem>
-     <para>
-      If this is enabled, the CGI module will be built with support for FastCGI
-      also.
-     </para>
-     <para>
-      As of PHP 5.3.0 this argument no longer exists and is enabled by 
-      <literal>--enable-cgi</literal> instead.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="configure.disable-path-info-check">
-    <term>
-     <option role="configure">--disable-path-info-check</option>
-    </term>
-    <listitem>
-     <para>
-      If this is disabled, paths such as <filename>/info.php/test?a=b</filename>
-      will fail to work. For more information see the
-      <link xlink:href="&url.apache.core;#acceptpathinfo">Apache Manual</link>.
-     </para>
-     <para>
-      As of PHP 5.3.0 this argument is enabled by default and no longer exists.
-      To disable this feature the <link
-      linkend="ini.cgi.fix-pathinfo">cgi.fix_pathinfo</link> ini directive must
-      be set to <literal>0</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
   </variablelist>
  </sect3>
 
diff --git a/appendices/extensions.xml b/appendices/extensions.xml
index 93533d781d..110e3a5b4d 100644
--- a/appendices/extensions.xml
+++ b/appendices/extensions.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
 <!--
   DO NOT TRANSLATE THIS FILE! All the content that is displayed
   on the extension categorization page in your translated manual
@@ -18,9 +17,10 @@
    <listitem><simpara><xref linkend="book.bc"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.bzip2"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.calendar"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.classkit"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.classobj"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.cmark"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.com"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.componere"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.csprng"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ctype"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.cubrid"/></simpara></listitem>
@@ -28,7 +28,6 @@
    <listitem><simpara><xref linkend="book.datetime"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dba"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dbase"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.dbplus"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dio"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dir"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dom"/></simpara></listitem>
@@ -42,11 +41,10 @@
    <listitem><simpara><xref linkend="book.exif"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.expect"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.fann"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.fann"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.fbsql"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.fdf"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.ffi"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.fileinfo"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.filepro"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.filesystem"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.filter"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.fpm"/></simpara></listitem>
@@ -68,13 +66,13 @@
    <listitem><simpara><xref linkend="book.imagick"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.imap"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.info"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ingres"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.inotify"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.intl"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.json"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ldap"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.libxml"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.lua"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.luasandbox"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.lzf"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mail"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mailparse"/></simpara></listitem>
@@ -83,22 +81,13 @@
    <listitem><simpara><xref linkend="book.mcrypt"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.memcache"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.memcached"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.memtrack"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mhash"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.misc"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mongo"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.bson"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mongodb"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mqseries"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mysql"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.mysql-xdevapi"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mysqli"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mysqlnd"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mysqlnd-memcache"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mysqlnd-ms"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mysqlnd-mux"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mysqlnd-qc"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.mysqlnd-uh"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ncurses"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.network"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.oauth"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.oci8"/></simpara></listitem>
@@ -106,7 +95,7 @@
    <listitem><simpara><xref linkend="book.openal"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.openssl"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.outcontrol"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.paradox"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.parallel"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.parle"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.password"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.pcntl"/></simpara></listitem>
@@ -125,19 +114,20 @@
    <listitem><simpara><xref linkend="ref.pdo-sqlsrv"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.pgsql"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.phar"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.phpdbg"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.pht"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.posix"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.proctitle"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ps"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.pspell"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.pthreads"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.quickhash"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.radius"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.rar"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.readline"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.recode"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.reflection"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.regex"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.rpminfo"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.rrd"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.runkit7"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.scoutapm"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.seaslog"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.sem"/></simpara></listitem>
@@ -149,17 +139,14 @@
    <listitem><simpara><xref linkend="book.sockets"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.sodium"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.solr"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.sphinx"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.spl"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.sqlite3"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.sqlsrv"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ssdeep"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ssh2"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.stats"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.stomp"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.stream"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.strings"/></simpara></listitem>
-   <!-- <listitem><simpara><xref linkend="book.suhosin"/></simpara></listitem> -->
    <listitem><simpara><xref linkend="book.svm"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.svn"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.swoole"/></simpara></listitem>
@@ -168,7 +155,6 @@
    <listitem><simpara><xref linkend="book.tcpwrap"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.tidy"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.tokenizer"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.tokyo-tyrant"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.trader"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ui"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.uodbc"/></simpara></listitem>
@@ -178,19 +164,20 @@
    <listitem><simpara><xref linkend="book.var"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.varnish"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.wddx"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.weakref"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.win32service"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.wincache"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.wkhtmltox"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xattr"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xdiff"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xhprof"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.xlswriter"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xml"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xmldiff"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xmlreader"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xmlrpc"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xmlwriter"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.xsl"/></simpara></listitem>
+   <listitem><simpara><xref linkend="book.yac"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.yaconf"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.yaf"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.yaml"/></simpara></listitem>
@@ -218,24 +205,23 @@
     <listitem><para><xref linkend="book.errorfunc"/></para></listitem>
     <listitem><para><xref linkend="book.exec"/></para></listitem>
     <listitem><para><xref linkend="book.filesystem"/></para></listitem>
-    <listitem><para><xref linkend="book.filter"/></para></listitem>
+    <listitem><para><xref linkend="book.fpm"/></para></listitem>
     <listitem><para><xref linkend="book.funchand"/></para></listitem>
     <listitem><para><xref linkend="book.hash"/></para></listitem>
     <listitem><para><xref linkend="book.info"/></para></listitem>
+    <listitem><para><xref linkend="book.json"/></para></listitem>
     <listitem><para><xref linkend="book.mail"/></para></listitem>
     <listitem><para><xref linkend="book.math"/></para></listitem>
     <listitem><para><xref linkend="book.misc"/></para></listitem>
     <listitem><para><xref linkend="book.network"/></para></listitem>
+    <listitem><para><xref linkend="book.opcache"/></para></listitem>
     <listitem><para><xref linkend="book.outcontrol"/></para></listitem>
     <listitem><para><xref linkend="book.password"/></para></listitem>
-    <listitem><para><xref linkend="book.phar"/></para></listitem>
+    <listitem><para><xref linkend="book.pcre"/></para></listitem>
     <listitem><para><xref linkend="book.reflection"/></para></listitem>
-    <listitem><para><xref linkend="book.regex"/></para></listitem>
-    <listitem><para><xref linkend="book.session"/></para></listitem>
     <listitem><para><xref linkend="book.spl"/></para></listitem>
     <listitem><para><xref linkend="book.stream"/></para></listitem>
     <listitem><para><xref linkend="book.strings"/></para></listitem>
-    <listitem><para><xref linkend="book.tokenizer"/></para></listitem>
     <listitem><para><xref linkend="book.url"/></para></listitem>
     <listitem><para><xref linkend="book.var"/></para></listitem>
    </itemizedlist>
@@ -252,23 +238,27 @@
     <listitem><para><xref linkend="book.ctype"/></para></listitem>
     <listitem><para><xref linkend="book.dba"/></para></listitem>
     <listitem><para><xref linkend="book.exif"/></para></listitem>
+    <listitem><para><xref linkend="book.ffi"/></para></listitem>
     <listitem><para><xref linkend="book.fileinfo"/></para></listitem>
+    <listitem><para><xref linkend="book.filter"/></para></listitem>
     <listitem><para><xref linkend="book.ftp"/></para></listitem>
+    <listitem><para><xref linkend="book.hrtime"/></para></listitem>
     <listitem><para><xref linkend="book.iconv"/></para></listitem>
     <listitem><para><xref linkend="book.image"/></para></listitem>
     <listitem><para><xref linkend="book.intl"/></para></listitem>
-    <listitem><para><xref linkend="book.json"/></para></listitem>
     <listitem><para><xref linkend="book.mbstring"/></para></listitem>
-    <listitem><para><xref linkend="book.opcache"/></para></listitem>
+    <listitem><para><xref linkend="book.mhash"/></para></listitem>
     <listitem><para><xref linkend="book.pcntl"/></para></listitem>
-    <listitem><para><xref linkend="book.pcre"/></para></listitem>
     <listitem><para><xref linkend="book.pdo"/></para></listitem>
+    <listitem><para><xref linkend="book.phar"/></para></listitem>
+    <listitem><para><xref linkend="book.phpdbg"/></para></listitem>
     <listitem><para><xref linkend="book.posix"/></para></listitem>
     <listitem><para><xref linkend="book.sem"/></para></listitem>
+    <listitem><para><xref linkend="book.session"/></para></listitem>
     <listitem><para><xref linkend="book.shmop"/></para></listitem>
     <listitem><para><xref linkend="book.sockets"/></para></listitem>
     <listitem><para><xref linkend="book.sqlite3"/></para></listitem>
-    <listitem><para><xref linkend="book.xmlrpc"/></para></listitem>
+    <listitem><para><xref linkend="book.tokenizer"/></para></listitem>
     <listitem><para><xref linkend="book.zlib"/></para></listitem>
    </itemizedlist>
   </section>
@@ -279,19 +269,14 @@
    <itemizedlist>
     <listitem><para><xref linkend="book.bzip2"/></para></listitem>
     <listitem><para><xref linkend="book.curl"/></para></listitem>
-    <listitem><para><xref linkend="book.dbase"/></para></listitem>
     <listitem><para><xref linkend="book.dom"/></para></listitem>
     <listitem><para><xref linkend="book.enchant"/></para></listitem>
     <listitem><para><xref linkend="book.fbsql"/></para></listitem>
     <listitem><para><xref linkend="book.gettext"/></para></listitem>
     <listitem><para><xref linkend="book.gmp"/></para></listitem>
-    <listitem><para><xref linkend="book.ibase"/></para></listitem>
     <listitem><para><xref linkend="book.imap"/></para></listitem>
     <listitem><para><xref linkend="book.ldap"/></para></listitem>
     <listitem><para><xref linkend="book.libxml"/></para></listitem>
-    <listitem><para><xref linkend="book.mcrypt"/></para></listitem>
-    <listitem><para><xref linkend="book.mhash"/></para></listitem>
-    <listitem><para><xref linkend="book.mysql"/></para></listitem>
     <listitem><para><xref linkend="book.mysqli"/></para></listitem>
     <listitem><para><xref linkend="book.mysqlnd"/></para></listitem>
     <listitem><para><xref linkend="book.oci8"/></para></listitem>
@@ -304,16 +289,15 @@
     <listitem><para><xref linkend="ref.pdo-pgsql"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-sqlite"/></para></listitem>
     <listitem><para><xref linkend="book.pgsql"/></para></listitem>
+    <listitem><para><xref linkend="book.pht"/></para></listitem>
     <listitem><para><xref linkend="book.pspell"/></para></listitem>
     <listitem><para><xref linkend="book.readline"/></para></listitem>
-    <listitem><para><xref linkend="book.recode"/></para></listitem>
     <listitem><para><xref linkend="book.simplexml"/></para></listitem>
     <listitem><para><xref linkend="book.snmp"/></para></listitem>
     <listitem><para><xref linkend="book.soap"/></para></listitem>
     <listitem><para><xref linkend="book.sodium"/></para></listitem>
     <listitem><para><xref linkend="book.tidy"/></para></listitem>
     <listitem><para><xref linkend="book.uodbc"/></para></listitem>
-    <listitem><para><xref linkend="book.wddx"/></para></listitem>
     <listitem><para><xref linkend="book.xml"/></para></listitem>
     <listitem><para><xref linkend="book.xmlreader"/></para></listitem>
     <listitem><para><xref linkend="book.xmlwriter"/></para></listitem>
@@ -326,82 +310,90 @@
    &extcat.membership.pecl;
 
    <itemizedlist>
-    <listitem><para><xref linkend="book.classkit"/></para></listitem>
+    <listitem><para><xref linkend="book.apcu"/></para></listitem>
+    <listitem><para><xref linkend="book.cmark"/></para></listitem>
+    <listitem><para><xref linkend="book.componere"/></para></listitem>
     <listitem><para><xref linkend="book.cubrid"/></para></listitem>
-    <listitem><para><xref linkend="book.dbplus"/></para></listitem>
+    <listitem><para><xref linkend="book.dbase"/></para></listitem>
     <listitem><para><xref linkend="book.dio"/></para></listitem>
+    <listitem><para><xref linkend="book.ds"/></para></listitem>
     <listitem><para><xref linkend="book.eio"/></para></listitem>
     <listitem><para><xref linkend="book.ev"/></para></listitem>
     <listitem><para><xref linkend="book.event"/></para></listitem>
     <listitem><para><xref linkend="book.expect"/></para></listitem>
+    <listitem><para><xref linkend="book.fann"/></para></listitem>
     <listitem><para><xref linkend="book.fdf"/></para></listitem>
-    <listitem><para><xref linkend="book.filepro"/></para></listitem>
     <listitem><para><xref linkend="book.gearman"/></para></listitem>
     <listitem><para><xref linkend="book.gender"/></para></listitem>
     <listitem><para><xref linkend="book.geoip"/></para></listitem>
     <listitem><para><xref linkend="book.gmagick"/></para></listitem>
     <listitem><para><xref linkend="book.gnupg"/></para></listitem>
+    <listitem><para><xref linkend="book.ibase"/></para></listitem>
     <listitem><para><xref linkend="book.ibm-db2"/></para></listitem>
     <listitem><para><xref linkend="book.imagick"/></para></listitem>
-    <listitem><para><xref linkend="book.ingres"/></para></listitem>
     <listitem><para><xref linkend="book.inotify"/></para></listitem>
     <listitem><para><xref linkend="book.lua"/></para></listitem>
     <listitem><para><xref linkend="book.luasandbox"/></para></listitem>
     <listitem><para><xref linkend="book.lzf"/></para></listitem>
     <listitem><para><xref linkend="book.mailparse"/></para></listitem>
+    <listitem><para><xref linkend="book.mcrypt"/></para></listitem>
     <listitem><para><xref linkend="book.memcache"/></para></listitem>
     <listitem><para><xref linkend="book.memcached"/></para></listitem>
-    <listitem><para><xref linkend="book.memtrack"/></para></listitem>
-    <listitem><para><xref linkend="book.mongo"/></para></listitem>
     <listitem><para><xref linkend="book.mqseries"/></para></listitem>
-    <listitem><para><xref linkend="book.mysqlnd-memcache"/></para></listitem>
-    <listitem><para><xref linkend="book.mysqlnd-ms"/></para></listitem>
-    <listitem><para><xref linkend="book.mysqlnd-mux"/></para></listitem>
-    <listitem><para><xref linkend="book.mysqlnd-qc"/></para></listitem>
-    <listitem><para><xref linkend="book.mysqlnd-uh"/></para></listitem>
-    <listitem><para><xref linkend="book.ncurses"/></para></listitem>
+    <listitem><para><xref linkend="book.mysql"/></para></listitem>
+    <listitem><para><xref linkend="book.mysql-xdevapi"/></para></listitem>
     <listitem><para><xref linkend="book.oauth"/></para></listitem>
     <listitem><para><xref linkend="book.openal"/></para></listitem>
-    <listitem><para><xref linkend="book.paradox"/></para></listitem>
+    <listitem><para><xref linkend="book.parallel"/></para></listitem>
+    <listitem><para><xref linkend="book.parle"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-cubrid"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-ibm"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-informix"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-sqlsrv"/></para></listitem>
-    <listitem><para><xref linkend="book.proctitle"/></para></listitem>
+    <listitem><para><xref linkend="book.pht"/></para></listitem>
     <listitem><para><xref linkend="book.ps"/></para></listitem>
     <listitem><para><xref linkend="book.pthreads"/></para></listitem>
-    <listitem><para><xref linkend="book.quickhash"/></para></listitem>
     <listitem><para><xref linkend="book.radius"/></para></listitem>
     <listitem><para><xref linkend="book.rar"/></para></listitem>
+    <listitem><para><xref linkend="book.recode"/></para></listitem>
+    <listitem><para><xref linkend="book.rpminfo"/></para></listitem>
     <listitem><para><xref linkend="book.rrd"/></para></listitem>
     <listitem><para><xref linkend="book.runkit7"/></para></listitem>
     <listitem><para><xref linkend="book.scoutapm"/></para></listitem>
     <listitem><para><xref linkend="book.seaslog"/></para></listitem>
     <listitem><para><xref linkend="book.solr"/></para></listitem>
-    <listitem><para><xref linkend="book.sphinx"/></para></listitem>
     <listitem><para><xref linkend="book.sqlsrv"/></para></listitem>
     <listitem><para><xref linkend="book.ssdeep"/></para></listitem>
     <listitem><para><xref linkend="book.ssh2"/></para></listitem>
-    <listitem><para><xref linkend="book.stats"/></para></listitem>
     <listitem><para><xref linkend="book.stomp"/></para></listitem>
-    <listitem><para><xref linkend="book.swoole"/></para></listitem>
     <listitem><para><xref linkend="book.svm"/></para></listitem>
     <listitem><para><xref linkend="book.svn"/></para></listitem>
+    <listitem><para><xref linkend="book.swoole"/></para></listitem>
+    <listitem><para><xref linkend="book.sync"/></para></listitem>
     <listitem><para><xref linkend="book.taint"/></para></listitem>
     <listitem><para><xref linkend="book.tcpwrap"/></para></listitem>
-    <listitem><para><xref linkend="book.tokyo-tyrant"/></para></listitem>
     <listitem><para><xref linkend="book.trader"/></para></listitem>
+    <listitem><para><xref linkend="book.ui"/></para></listitem>
+    <listitem><para><xref linkend="book.uopz"/></para></listitem>
     <listitem><para><xref linkend="book.v8js"/></para></listitem>
     <listitem><para><xref linkend="book.varnish"/></para></listitem>
-    <listitem><para><xref linkend="book.weakref"/></para></listitem>
+    <listitem><para><xref linkend="book.wddx"/></para></listitem>
     <listitem><para><xref linkend="book.win32service"/></para></listitem>
     <listitem><para><xref linkend="book.wincache"/></para></listitem>
+    <listitem><para><xref linkend="book.wkhtmltox"/></para></listitem>
     <listitem><para><xref linkend="book.xattr"/></para></listitem>
     <listitem><para><xref linkend="book.xdiff"/></para></listitem>
     <listitem><para><xref linkend="book.xhprof"/></para></listitem>
+    <listitem><para><xref linkend="book.xlswriter"/></para></listitem>
+    <listitem><para><xref linkend="book.xmldiff"/></para></listitem>
+    <listitem><para><xref linkend="book.xmlrpc"/></para></listitem>
+    <listitem><para><xref linkend="book.yac"/></para></listitem>
+    <listitem><para><xref linkend="book.yaconf"/></para></listitem>
     <listitem><para><xref linkend="book.yaf"/></para></listitem>
     <listitem><para><xref linkend="book.yaml"/></para></listitem>
+    <listitem><para><xref linkend="book.yar"/></para></listitem>
     <listitem><para><xref linkend="book.yaz"/></para></listitem>
+    <listitem><para><xref linkend="book.zmq"/></para></listitem>
     <listitem><para><xref linkend="book.zookeeper"/></para></listitem>
    </itemizedlist>
   </section>
@@ -414,7 +406,7 @@
    &extcat.state.deprecated;
 
    <itemizedlist>
-    <listitem><para><xref linkend="book.memtrack"/></para></listitem>
+    <listitem><para/></listitem>
    </itemizedlist>
   </section>
 
@@ -422,11 +414,8 @@
    &extcat.state.experimental;
 
    <itemizedlist>
-    <listitem><para><xref linkend="book.dbplus"/></para></listitem>
     <listitem><para><xref linkend="book.hash"/></para></listitem>
     <listitem><para><xref linkend="book.imagick"/></para></listitem>
-    <listitem><para><xref linkend="book.ncurses"/></para></listitem>
-    <listitem><para><xref linkend="book.paradox"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-dblib"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-firebird"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-oci"/></para></listitem>
diff --git a/appendices/ini.core.xml b/appendices/ini.core.xml
index c071d5ada0..d8bb14dc7f 100644
--- a/appendices/ini.core.xml
+++ b/appendices/ini.core.xml
@@ -322,7 +322,7 @@ Fatal error: Maximum execution time of 30+2 seconds exceeded (terminated) in Unk
         is used, both zend.multibyte and zend.script_encoding must be used.
        </para>
        <para>
-        Literal strings will be transliterated from zend.script_enconding to
+        Literal strings will be transliterated from zend.script_encoding to
         mbstring.internal_encoding, as if
         <function>mb_convert_encoding</function> would have been called.
        </para>
@@ -564,7 +564,7 @@ Fatal error: Maximum execution time of 30+2 seconds exceeded (terminated) in Unk
         <entry><link linkend="ini.enable-post-data-reading">enable_post_data_reading</link></entry>
         <entry>"1"</entry>
         <entry>PHP_INI_PERDIR</entry>
-        <entry>Available as of PHP 5.4.0</entry>
+        <entry></entry>
        </row>
        <row>
         <entry><link linkend="ini.post-max-size">post_max_size</link></entry>
@@ -975,12 +975,6 @@ Fatal error: Maximum execution time of 30+2 seconds exceeded (terminated) in Unk
       
     </variablelist>
    </para>
-   <para>
-    See also: <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>,
-    <link linkend="ini.magic-quotes-runtime">magic_quotes_runtime</link>,
-    and
-    magic_quotes_sybase.
-   </para>
   </section>
   
   <section xml:id="ini.sect.path-directory">
@@ -1261,6 +1255,12 @@ include_path = ".:${USER}/pear/php"
          to <literal>0</literal> and thus <emphasis>disable</emphasis> the realpath cache.
         </para>
        </note>
+       <caution>
+        <para>
+         <literal>open_basedir</literal> is just an extra safety net, that is in no way
+         comprehensive, and can therefore not be relied upon when security is needed.
+        </para>
+       </caution>
       </listitem>
      </varlistentry>
      
@@ -1629,6 +1629,9 @@ include_path = ".:${USER}/pear/php"
        <para>
         The maximum size of an uploaded file.
        </para>
+       <para>
+        <link linkend="ini.post-max-size">post_max_size</link> must be larger than this value.
+       </para>
        
        &ini.shorthandbytes;
        
@@ -1643,7 +1646,7 @@ include_path = ".:${USER}/pear/php"
       <listitem>
        <para>
         The maximum number of files allowed to be uploaded simultaneously.
-        Starting with PHP 5.3.4, upload fields left blank on submission do not
+        Upload fields left blank on submission do not
         count towards this limit.
        </para>
       </listitem>
diff --git a/appendices/ini.list.xml b/appendices/ini.list.xml
index d9e751e852..072267d8b8 100644
--- a/appendices/ini.list.xml
+++ b/appendices/ini.list.xml
@@ -484,7 +484,6 @@
        <entry></entry>
       </row>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('intl.configuration.list')/*)"><xi:fallback/></xi:include>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ingres.configuration.list')/*)"><xi:fallback/></xi:include>
       <row>
        <entry><link linkend="ini.last-modified">last_modified</link></entry>
        <entry>"0"</entry>
@@ -555,15 +554,9 @@
        <entry>PHP_INI_ALL</entry>
        <entry></entry>
       </row>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongo.configuration.list')/*)"><xi:fallback/></xi:include>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysql.configuration.list')/*)"><xi:fallback/></xi:include>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqli.configuration.list')/*)"><xi:fallback/></xi:include>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd.config.options.list')/*)"><xi:fallback/></xi:include>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-memcache.configuration.list')/*)"><xi:fallback/></xi:include>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-ms.configuration.list')/*)"><xi:fallback/></xi:include>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-mux.configuration.list')/*)"><xi:fallback/></xi:include>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-qc.configuration.list')/*)"><xi:fallback/></xi:include>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-uh.configuration.list')/*)"><xi:fallback/></xi:include>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('oci8.configuration.list')/*)"><xi:fallback/></xi:include>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('odbc.configuration.list')/*)"><xi:fallback/></xi:include>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('opcache.configuration.list')/*)"><xi:fallback/></xi:include>
diff --git a/appendices/ini.sections.xml b/appendices/ini.sections.xml
index 27d976763e..b58b6f05fb 100644
--- a/appendices/ini.sections.xml
+++ b/appendices/ini.sections.xml
@@ -32,12 +32,12 @@
       <row>
        <entry><link linkend="ini.per-host">[HOST=]</link></entry>
        <entry>PHP_INI_SYSTEM</entry>
-       <entry>Added in PHP 5.3.0.</entry>
+       <entry></entry>
       </row>
       <row>
        <entry><link linkend="ini.per-path">[PATH=]</link></entry>
        <entry>PHP_INI_SYSTEM</entry>
-       <entry>Added in PHP 5.3.0.</entry>
+       <entry></entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/appendices/migration70/incompatible/removed-functions.xml b/appendices/migration70/incompatible/removed-functions.xml
index 4c7352e7c2..ffac64c434 100644
--- a/appendices/migration70/incompatible/removed-functions.xml
+++ b/appendices/migration70/incompatible/removed-functions.xml
@@ -27,7 +27,7 @@
    All ereg* functions
   </title>
   <para>
-   All <link linkend="book.regex">ereg</link> functions were removed. 
+   All <literal>ereg</literal> functions were removed.
    <link linkend="book.pcre">PCRE</link> is a recommended alternative.
   </para>
  </sect3>
diff --git a/appendices/migration73/other-changes.xml b/appendices/migration73/other-changes.xml
index ddc026db45..d7dc8d1b23 100644
--- a/appendices/migration73/other-changes.xml
+++ b/appendices/migration73/other-changes.xml
@@ -46,9 +46,12 @@
       <term><link linkend="ini.syslog.filter">syslog.filter</link></term>
       <listitem>
        <simpara>
-        Specifies the filter type to filter the logged messages. There are three
+        Specifies the filter type to filter the logged messages, with the
         supported filter types - <literal>all</literal>,
         <literal>no-ctrl</literal> and <literal>ascii</literal>.
+        Starting with PHP 7.3.8, <literal>raw</literal> is also available, 
+        restoring the way syslog behaved in previous PHP versions.
+        This filter will also affect calls to <function>syslog</function>.
        </simpara>
       </listitem>
      </varlistentry>
diff --git a/appendices/migration74/incompatible.xml b/appendices/migration74/incompatible.xml
index 384c132d97..cd86a24395 100644
--- a/appendices/migration74/incompatible.xml
+++ b/appendices/migration74/incompatible.xml
@@ -249,6 +249,12 @@
    supported and resulted in corrupted reflection objects. It has been
    explicitly prohibited now.
   </para>
+
+  <para>
+   The values of the class constant of <classname>ReflectionClassConstant</classname>,
+   <classname>ReflectionMethod</classname> and <classname>ReflectionProperty</classname>
+   have changed.
+  </para>
  </sect2>
 
  <sect2 xml:id="migration74.incompatible.spl">
diff --git a/appendices/migration74/new-features.xml b/appendices/migration74/new-features.xml
index 7b0b89e796..51b671cffc 100644
--- a/appendices/migration74/new-features.xml
+++ b/appendices/migration74/new-features.xml
@@ -142,7 +142,7 @@ $fruits = ['banana', 'orange', ...$parts, 'watermelon'];
    <title>Weak references</title>
 
    <para>
-    Weak references allow the programmer to retain a reference to an object
+    <link linkend="class.weakreference">Weak references</link> allow the programmer to retain a reference to an object
     that does not prevent the object from being destroyed.
    </para>
   </sect3>
@@ -233,7 +233,7 @@ $fruits = ['banana', 'orange', ...$parts, 'watermelon'];
    The <function>preg_replace_callback</function> and <function>preg_replace_callback_array</function>
    functions now accept an additional <parameter>flags</parameter> argument, with support for the
    <constant>PREG_OFFSET_CAPTURE</constant> and <constant>PREG_UNMATCHED_AS_NULL</constant> flags.
-   This influences the format of the matches array passed to to the callback function.
+   This influences the format of the matches array passed to the callback function.
   </para>
  </sect2>
 
diff --git a/appendices/migration74/new-functions.xml b/appendices/migration74/new-functions.xml
index e11df1f4da..1a5bc154ec 100644
--- a/appendices/migration74/new-functions.xml
+++ b/appendices/migration74/new-functions.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <sect1 xml:id="migration74.new-functions">
  <title>New Functions</title>
 
@@ -38,6 +36,18 @@
   </itemizedlist>
  </sect2>
 
+ <sect2 xml:id="migration74.new-functions.mbstring">
+  <title>Multibyte String</title>
+
+  <itemizedlist>
+   <listitem>
+    <simpara>
+     <function>mb_str_split</function>
+    </simpara>
+   </listitem>
+  </itemizedlist>
+ </sect2>
+
  <sect2 xml:id="migration74.new-functions.openssl">
   <title>OpenSSL</title>
 
@@ -80,7 +90,6 @@
  </sect2>
 
 </sect1>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/appendices/migration80/deprecated.xml b/appendices/migration80/deprecated.xml
index 9f3ec4b5fc..3ad9be8085 100644
--- a/appendices/migration80/deprecated.xml
+++ b/appendices/migration80/deprecated.xml
@@ -95,7 +95,10 @@ function test(?A $a, $b) {}       // Recommended
   <para>
    <function>libxml_disable_entity_loader</function> has been deprecated. As libxml 2.9.0 is now
    required, external entity loading is guaranteed to be disabled by default, and this function is
-   no longer needed to protect against XXE attacks.
+   no longer needed to protect against XXE attacks, unless the (still vulnerable)
+   <constant>LIBXML_NOENT</constant> is used.
+   In that case, it is recommended to refactor the code using
+   <function>libxml_set_external_entity_loader</function> to suppress loading of external entities.
   </para>
  </sect2>
 
diff --git a/appendices/migration80/new-features.xml b/appendices/migration80/new-features.xml
index fb5be958c4..5c199d90ce 100644
--- a/appendices/migration80/new-features.xml
+++ b/appendices/migration80/new-features.xml
@@ -71,8 +71,7 @@
    <itemizedlist>
     <listitem>
      <para>
-      <!-- we cannot use <classname>WeakMap</classname> because that would link to the wrong class -->
-      The <literal>WeakMap</literal> class has been added.
+      The <link linkend="class.weakmap">WeakMap</link> class has been added.
       <!-- RFC: https://wiki.php.net/rfc/weak_maps -->
      </para>
     </listitem>
diff --git a/appendices/reserved.constants.core.xml b/appendices/reserved.constants.core.xml
index 678586e1b8..d148c8abcd 100644
--- a/appendices/reserved.constants.core.xml
+++ b/appendices/reserved.constants.core.xml
@@ -27,7 +27,7 @@
      <listitem>
       <simpara>
        The current PHP "major" version as an integer (e.g., int(5) 
-       from version "5.2.7-extra"). Available since PHP 5.2.7.
+       from version "5.2.7-extra").
       </simpara>
      </listitem>
     </varlistentry>
@@ -39,7 +39,7 @@
      <listitem>
       <simpara>
        The current PHP "minor" version as an integer (e.g., int(2) 
-       from version "5.2.7-extra"). Available since PHP 5.2.7.
+       from version "5.2.7-extra").
       </simpara>
      </listitem>
     </varlistentry>
@@ -51,7 +51,7 @@
      <listitem>
       <simpara>
        The current PHP "release" version as an integer (e.g., int(7) 
-       from version "5.2.7-extra"). Available since PHP 5.2.7.
+       from version "5.2.7-extra").
       </simpara>
      </listitem>
     </varlistentry>
@@ -64,7 +64,6 @@
       <simpara>
        The current PHP version as an integer, useful for 
        version comparisons (e.g., int(50207) from version "5.2.7-extra").
-       Available since PHP 5.2.7.
       </simpara>
      </listitem>
     </varlistentry>
@@ -77,8 +76,7 @@
       <simpara>
        The current PHP "extra" version as a string (e.g., '-extra'
        from version "5.2.7-extra"). Often used by distribution
-       vendors to indicate a package version. Available since
-       PHP 5.2.7.
+       vendors to indicate a package version.
       </simpara>
      </listitem>
     </varlistentry>
@@ -89,7 +87,7 @@
      </term>
      <listitem>
       <simpara>
-       Available since PHP 5.2.7.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -100,7 +98,7 @@
      </term>
      <listitem>
       <simpara>
-       Available since PHP 5.2.7.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -112,7 +110,7 @@
      <listitem>
       <simpara>
        The maximum length of filenames (including path) supported
-       by this build of PHP. Available since PHP 5.3.0.
+       by this build of PHP.
       </simpara>
      </listitem>
     </varlistentry>
@@ -162,7 +160,6 @@
      <listitem>
       <simpara>
        The correct 'End Of Line' symbol for this platform.
-       Available since PHP 5.0.2
       </simpara>
      </listitem>
     </varlistentry>
@@ -175,7 +172,6 @@
       <simpara>
        The largest integer supported in this build of PHP. Usually int(2147483647)
        in 32 bit systems and int(9223372036854775807) in 64 bit systems.
-       Available since PHP 5.0.5
       </simpara>
      </listitem>
     </varlistentry>
@@ -187,7 +183,7 @@
      <listitem>
       <simpara>
        The smallest integer supported in this build of PHP. Usually int(-2147483648) in 32 bit systems and
-       int(-9223372036854775808) in 64 bit systems. Available since PHP 7.0.0.
+       int(-9223372036854775808) in 64 bit systems.
        Usually, PHP_INT_MIN === ~PHP_INT_MAX.
       </simpara>
      </listitem>
@@ -199,7 +195,7 @@
      </term>
      <listitem>
       <simpara>
-       The size of an integer in bytes in this build of PHP. Available since PHP 5.0.5
+       The size of an integer in bytes in this build of PHP.
       </simpara>
      </listitem>
     </varlistentry>
@@ -294,7 +290,9 @@
      </term>
      <listitem>
       <simpara>
-       
+       The default directory where to look for dynamically loadable extensions
+       (unless overridden by <link linkend="ini.extension-dir">extension_dir</link>).
+       Defaults to <constant>PHP_PREFIX</constant> (or <code>PHP_PREFIX . "\\ext"</code> on Windows).
       </simpara>
      </listitem>
     </varlistentry>
@@ -343,7 +341,6 @@
      <listitem>
       <simpara>
        Specifies where the manpages were installed into.
-       Available since PHP 5.3.7.
       </simpara>
      </listitem>
     </varlistentry>
@@ -566,7 +563,6 @@
      <listitem>
       <simpara>
        <link linkend="errorfunc.constants">Error reporting constant</link>.
-       Available since PHP 5.2.0
       </simpara>
      </listitem>
     </varlistentry>
@@ -578,7 +574,6 @@
      <listitem>
       <simpara>
        <link linkend="errorfunc.constants">Error reporting constant</link>.
-       Available since PHP 5.3.0
       </simpara>
      </listitem>
     </varlistentry>
@@ -590,7 +585,6 @@
      <listitem>
       <simpara>
        <link linkend="errorfunc.constants">Error reporting constant</link>.
-       Available since PHP 5.3.0
       </simpara>
      </listitem>
     </varlistentry>
@@ -623,7 +617,7 @@
      </term>
      <listitem>
       <simpara>
-       Available since PHP 5.1.0
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -686,7 +680,7 @@
     </varlistentry>
    </variablelist>
    <para>
-    See also: <link linkend="language.constants.predefined">Magic
+    See also: <link linkend="language.constants.magic">Magic
     constants</link>.
    </para>
  </sect2>
diff --git a/appendices/reserved.xml b/appendices/reserved.xml
index cf00441ebe..3e3347fe56 100644
--- a/appendices/reserved.xml
+++ b/appendices/reserved.xml
@@ -16,12 +16,9 @@
    <simpara>
     These words have special meaning in PHP. Some of them represent things 
     which look like functions, some look like constants, and so on - but 
-    they're not, really: they are language constructs. You cannot use any
-    of the following words as constants, class names, function or method names. 
-    Using them as variable names is generally OK, but could lead to confusion.
-   </simpara>
-   <simpara>
-    As of PHP 7.0.0 these keywords are allowed as property, constant, and
+    they're not, really: they are language constructs.
+    The following words cannot be used as constants, class names, function or method names. 
+    They are, however, allowed as property, constant, and
     method names of classes, interfaces and traits, except that
     <literal>class</literal> may not be used as constant name.
    </simpara>
@@ -52,7 +49,7 @@
         <link linkend="control-structures.break">break</link>
        </entry>
        <entry>
-        <link linkend="language.types.callable">callable</link> (as of PHP 5.4)
+        <link linkend="language.types.callable">callable</link>
        </entry>
        <entry>
         <link linkend="control-structures.switch">case</link>
@@ -137,7 +134,7 @@
         <link linkend="language.oop5.final">final</link>
        </entry>
        <entry>
-        <link linkend="language.exceptions">finally</link> (as of PHP 5.5)
+        <link linkend="language.exceptions">finally</link>
        </entry>
        <entry>
         <link linkend="functions.arrow">fn</link> (as of PHP 7.4)
@@ -157,7 +154,7 @@
         <link linkend="language.variables.scope">global</link>
        </entry>
        <entry>
-        <link linkend="control-structures.goto">goto</link> (as of PHP 5.3)
+        <link linkend="control-structures.goto">goto</link>
        </entry>
        <entry>
         <link linkend="control-structures.if">if</link>
@@ -177,7 +174,7 @@
         <link linkend="language.operators.type">instanceof</link>
        </entry>
        <entry>
-        <link linkend="language.oop5.traits.conflict">insteadof</link> (as of PHP 5.4)
+        <link linkend="language.oop5.traits.conflict">insteadof</link>
        </entry>
        <entry>
         <link linkend="language.oop5.interfaces">interface</link>
@@ -194,7 +191,7 @@
         <link linkend="control-structures.match">match</link> (as of PHP 8.0)
        </entry>
        <entry>
-        <link linkend="language.namespaces">namespace</link> (as of PHP 5.3)
+        <link linkend="language.namespaces">namespace</link>
        </entry>
        <entry>
         <link linkend="language.oop5.basic.new">new</link>
@@ -239,7 +236,7 @@
         <link linkend="language.exceptions">throw</link>
        </entry>
        <entry>
-        <link linkend="language.oop5.traits">trait</link> (as of PHP 5.4)
+        <link linkend="language.oop5.traits">trait</link>
        </entry>
        <entry>
         <link linkend="language.exceptions">try</link>
@@ -262,10 +259,10 @@
         <link linkend="language.operators.logical">xor</link>
        </entry>
        <entry>
-        <link linkend="language.generators">yield</link> (as of PHP 5.5)
+        <link linkend="language.generators">yield</link>
        </entry>
        <entry>
-        <link linkend="control-structures.yield.from">yield from</link> (as of PHP 7.0)
+        <link linkend="control-structures.yield.from">yield from</link>
        </entry>
       </row>
      </tbody>
@@ -281,7 +278,7 @@
         <link linkend="language.constants.predefined">__CLASS__</link>
        </entry>
        <entry> 
-        <link linkend="language.constants.predefined">__DIR__</link> (as of PHP 5.3)
+        <link linkend="language.constants.predefined">__DIR__</link>
        </entry>
        <entry>
         <link linkend="language.constants.predefined">__FILE__</link>
@@ -298,10 +295,10 @@
       </row>
       <row>
        <entry>
-        <link linkend="language.namespaces.nsconstants">__NAMESPACE__</link> (as of PHP 5.3)
+        <link linkend="language.namespaces.nsconstants">__NAMESPACE__</link>
        </entry>
        <entry>
-        <link linkend="language.constants.predefined">__TRAIT__</link> (as of PHP 5.4)
+        <link linkend="language.constants.predefined">__TRAIT__</link>
        </entry>
        <entry>
        </entry>
@@ -358,18 +355,6 @@
        </simpara>
       </listitem>
      </varlistentry>
-    </variablelist>
-   </sect2>
-   
-   <sect2 xml:id="reserved.classes.php5">
-    <title>Predefined classes as of PHP 5</title>
-    
-    <simpara>
-     These additional predefined classes were introduced in 
-     PHP 5.0.0.
-    </simpara>
-    
-    <variablelist>
      <varlistentry>
       <term><classname>Exception</classname></term>
       <listitem>
@@ -381,7 +366,7 @@
       <term><classname>ErrorException</classname></term>
       <listitem>
        <simpara>
-        Available since PHP 5.1.0.
+
        </simpara>
       </listitem>
      </varlistentry>
@@ -392,46 +377,26 @@
        </simpara>
       </listitem>
      </varlistentry>
-    </variablelist>
-   </sect2>
-
-   <sect2 xml:id="reserved.classes.closure">
-    <title>Closure</title>
-    
-    <simpara>
-     The predefined final class <classname>Closure</classname> was introduced
-     in PHP 5.3.0. It is used for representing <link
-     linkend="functions.anonymous">anonymous functions</link>.
-    </simpara>
-    <simpara>
-     For more information, see its <link linkend="class.closure">class
-     page</link>.
-    </simpara>
-   </sect2>
-
-   <sect2 xml:id="reserved.classes.generator">
-    <title>Generator</title>
-    
-    <simpara>
-     The predefined final class <classname>Generator</classname> was introduced
-     in PHP 5.5.0. It is used for representing <link
-     linkend="language.generators">generators</link>.
-    </simpara>
-    <simpara>
-     For more information, see its <link linkend="class.generator">class
-     page</link>.
-    </simpara>
-   </sect2>
-
-   <sect2 xml:id="reserved.classes.php7">
-    <title>Predefined interfaces and classes as of PHP 7</title>
-
-    <simpara>
-     These additional predefined interfaces and classes were introduced in
-     PHP 7.0.0.
-    </simpara>
-
-    <variablelist>
+     <varlistentry>
+      <term><classname>Closure</classname></term>
+      <listitem>
+       <simpara>
+        The predefined final class <classname>Closure</classname>
+        is used for representing <link
+        linkend="functions.anonymous">anonymous functions</link>.
+       </simpara>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><classname>Generator</classname></term>
+      <listitem>
+       <simpara>
+        The predefined final class <classname>Generator</classname>
+        is used for representing <link
+        linkend="language.generators">generators</link>.
+       </simpara>
+      </listitem>
+     </varlistentry>
      <varlistentry>
       <term><classname>ArithmeticError</classname></term>
       <listitem>
@@ -538,27 +503,27 @@
       <tbody>
        <row>
         <entry>
-         int (as of PHP 7)
+         int
         </entry>
         <entry>
-         float (as of PHP 7)
+         float
         </entry>
         <entry>
-         bool (as of PHP 7)
+         bool
         </entry>
         <entry>
-         string (as of PHP 7)
+         string
         </entry>
        </row>
        <row>
         <entry>
-         true (as of PHP 7)
+         true
         </entry>
         <entry>
-         false (as of PHP 7)
+         false
         </entry>
         <entry>
-         null (as of PHP 7)
+         null
         </entry>
         <entry>
          void (as of PHP 7.1)
@@ -589,13 +554,13 @@
       <tbody>
        <row>
         <entry>
-         resource (as of PHP 7)
+         resource
         </entry>
         <entry>
-         mixed (as of PHP 7)
+         mixed
         </entry>
         <entry>
-         numeric (as of PHP 7)
+         numeric
         </entry>
         <entry>
         </entry>
diff --git a/appendices/resources.xml b/appendices/resources.xml
index e470e0bbea..1b4098ff71 100644
--- a/appendices/resources.xml
+++ b/appendices/resources.xml
@@ -362,31 +362,6 @@
     </entry>
     <entry>Link to Dbase database</entry>
    </row>
-   <row>
-    <entry>dbx_link_object</entry>
-    <entry>
-     <function>dbx_connect</function>
-    </entry>
-    <entry>
-     <function>dbx_query</function>
-    </entry>
-    <entry>
-     <function>dbx_close</function>
-    </entry>
-    <entry>dbx connection</entry>
-   </row>
-   <row>
-    <entry>dbx_result_object</entry>
-    <entry>
-     <function>dbx_query</function>
-    </entry>
-    <entry>
-    </entry>
-    <entry>
-     None
-    </entry>
-    <entry>dbx result</entry>
-   </row>
    <row>
     <entry>enchant_broker</entry>
     <entry>
@@ -644,7 +619,6 @@
      <function>imageinterlace</function>,
      <function>imageline</function>,
      <function>imagepolygon</function>,
-     <function>imagepstext</function>,
      <function>imagerectangle</function>,
      <function>imagerotate</function>,
      <function>imagesetpixel</function>,
@@ -704,55 +678,6 @@
     </entry>
     <entry>Font for GD</entry>
    </row>
-   <row>
-    <entry>GMP integer</entry>
-    <entry>
-     <function>gmp_init</function>
-    </entry>
-    <entry>
-     <function>gmp_intval</function>,
-     <function>gmp_strval</function>,
-     <function>gmp_add</function>,
-     <function>gmp_sub</function>,
-     <function>gmp_mul</function>,
-     <function>gmp_div_q</function>,
-     <function>gmp_div_r</function>,
-     <function>gmp_div_qr</function>,
-     <function>gmp_div</function>,
-     <function>gmp_mod</function>,
-     <function>gmp_divexact</function>,
-     <function>gmp_cmp</function>,
-     <function>gmp_neg</function>,
-     <function>gmp_abs</function>,
-     <function>gmp_sign</function>,
-     <function>gmp_fact</function>,
-     <function>gmp_sqrt</function>,
-     <function>gmp_sqrtrm</function>,
-     <function>gmp_perfect_square</function>,
-     <function>gmp_pow</function>,
-     <function>gmp_powm</function>,
-     <function>gmp_prob_prime</function>,
-     <function>gmp_gcd</function>,
-     <function>gmp_gcdext</function>,
-     <function>gmp_invert</function>,
-     <function>gmp_legendre</function>,
-     <function>gmp_jacobi</function>,
-     <function>gmp_random</function>,
-     <function>gmp_and</function>,
-     <function>gmp_or</function>,
-     <function>gmp_xor</function>,
-     <function>gmp_setbit</function>,
-     <function>gmp_clrbit</function>,
-     <function>gmp_scan0</function>,
-     <function>gmp_scan1</function>,
-     <function>gmp_popcount</function>,
-     <function>gmp_hamdist</function>
-    </entry>
-    <entry>
-     None
-    </entry>
-    <entry>GMP Number</entry>
-   </row>
    <row>
     <entry>imap</entry>
     <entry>
@@ -802,60 +727,6 @@
     </entry>
     <entry>Link to IMAP, POP3 server</entry>
    </row>
-   <row>
-    <entry>ingres</entry>
-    <entry>
-     <function>ingres_connect</function>
-    </entry>
-    <entry>
-     <function>ingres_query</function>,
-     <function>ingres_num_rows</function>,
-     <function>ingres_num_fields</function>,
-     <function>ingres_field_name</function>,
-     <function>ingres_field_type</function>,
-     <function>ingres_field_nullable</function>,
-     <function>ingres_field_length</function>,
-     <function>ingres_field_precision</function>,
-     <function>ingres_field_scale</function>,
-     <function>ingres_fetch_array</function>,
-     <function>ingres_fetch_row</function>,
-     <function>ingres_fetch_object</function>,
-     <function>ingres_rollback</function>,
-     <function>ingres_commit</function>,
-     <function>ingres_autocommit</function>
-    </entry>
-    <entry>
-     <function>ingres_close</function>
-    </entry>
-    <entry>Link to ingresII base</entry>
-   </row>
-   <row>
-    <entry>ingres persistent</entry>
-    <entry>
-     <function>ingres_pconnect</function>
-    </entry>
-    <entry>
-     <function>ingres_query</function>,
-     <function>ingres_num_rows</function>,
-     <function>ingres_num_fields</function>,
-     <function>ingres_field_name</function>,
-     <function>ingres_field_type</function>,
-     <function>ingres_field_nullable</function>,
-     <function>ingres_field_length</function>,
-     <function>ingres_field_precision</function>,
-     <function>ingres_field_scale</function>,
-     <function>ingres_fetch_array</function>,
-     <function>ingres_fetch_row</function>,
-     <function>ingres_fetch_object</function>,
-     <function>ingres_rollback</function>,
-     <function>ingres_commit</function>,
-     <function>ingres_autocommit</function>
-    </entry>
-    <entry>
-     None
-    </entry>
-    <entry>Persistent link to ingresII base</entry>
-   </row>
    <row>
      <entry>interbase blob</entry>
      <entry>
@@ -1023,7 +894,6 @@
     </entry>
     <entry>
      <function>mysql_affected_rows</function>,
-     <function>mysql_change_user</function>,
      <function>mysql_create_db</function>,
      <function>mysql_data_seek</function>,
      <function>mysql_db_name</function>,
@@ -1055,7 +925,6 @@
     </entry>
     <entry>
      <function>mysql_affected_rows</function>,
-     <function>mysql_change_user</function>,
      <function>mysql_create_db</function>,
      <function>mysql_data_seek</function>,
      <function>mysql_db_name</function>,
@@ -1424,7 +1293,7 @@
      <function>pg_untrace</function>,
      <function>pg_set_client_encoding</function>,
      <function>pg_client_encoding</function>,
-     <function>pg_metadata</function>,
+     <function>pg_meta_data</function>,
      <function>pg_convert</function>,
      <function>pg_insert</function>,
      <function>pg_select</function>,
@@ -1469,7 +1338,7 @@
      <function>pg_untrace</function>,
      <function>pg_set_client_encoding</function>,
      <function>pg_client_encoding</function>,
-     <function>pg_metadata</function>,
+     <function>pg_meta_data</function>,
      <function>pg_convert</function>,
      <function>pg_insert</function>,
      <function>pg_select</function>,
diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index f22474a11d..19fffd983a 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -4,30 +4,38 @@
 <appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook">
  <title>List of Parser Tokens</title>
  <para>
-  Various parts of the PHP language are represented internally by types like
-  T_SR. PHP outputs identifiers like this one in parse errors, like
-  <literal>"Parse error: unexpected T_SR, expecting ',' or ';' in script.php on line 10."</literal>
+  Various parts of the PHP language are represented internally by tokens.
+  A code snippet that contains an invalid sequence of tokens may lead to errors like
+  <literal>Parse error: syntax error, unexpected token "==", expecting "(" in script.php on line 10."</literal>
+  where token <code>==</code> is internally represented by <constant>T_IS_EQUAL</constant>.
  </para>
+
  <para>
-  You're supposed to know what T_SR means. For everybody who doesn't
-  know that, here is a table with those identifiers, PHP-syntax and
-  references to the appropriate places in the manual.
+  The following table lists all tokens. They are also available as PHP constants.
  </para>
 
  <note>
   <title>Usage of T_* constants</title>
   <para>
-   All tokens listed below are also defined as PHP constants. Their value is
-   automatically generated based on PHP's underlying parser infrastructure.
+   T_* constants values are automatically generated based on PHP's underlying parser infrastructure.
    This means that the concrete value of a token may change between two PHP
-   versions. For example the <constant>T_FILE</constant> constant is
-   <literal>365</literal> in PHP 5.3, while the same value refers now to
-   <constant>T_TRAIT</constant> in PHP 5.4 and the value of <constant>T_FILE</constant>
-   is <literal>369</literal>. This means that your code should never rely directly
+   versions.
+   This means that your code should never rely directly
    on the original T_* values taken from PHP version X.Y.Z, to provide some compatibility
-   across multiple PHP versions. Instead your code should utilize custom values
-   (using big numbers like <literal>10000</literal>) and an appropriate strategy that
-   will work with both PHP versions and T_* values.
+   across multiple PHP versions.
+  </para>
+
+  <para>
+   To make use of T_* constants across multiple PHP versions, undefined constants
+   may be defined by the user (using big numbers like <literal>10000</literal>) with an
+   appropriate strategy that will work with both PHP versions and T_* values.
+   <programlisting role="php">
+<![CDATA[
+<?php
+// Prior to PHP 7.4.0, T_FN is not defined.
+defined('T_FN') || define('T_FN', 10001);
+]]>
+   </programlisting>
   </para>
  </note>
 
@@ -64,17 +72,22 @@
      <entry>(array)</entry>
      <entry><link linkend="language.types.typecasting">type-casting</link></entry>
     </row>
-     <row>
+    <row>
      <entry><constant>T_AS</constant></entry>
      <entry>as</entry>
      <entry>&foreach;</entry>
     </row>
+    <row>
+     <entry><constant>T_ATTRIBUTE</constant></entry>
+     <entry>#[</entry>
+     <entry><link linkend="language.attributes">attributes</link> (available as of PHP 8.0.0)</entry>
+    </row>
     <row>
      <entry><constant>T_BAD_CHARACTER</constant></entry>
      <entry></entry>
      <entry>
       anything below ASCII 32 except \t (0x09), \n (0x0a) and \r (0x0d)
-      (available since PHP 7.4.0)
+      (available as of PHP 7.4.0)
      </entry>
     </row>
     <row>
@@ -149,7 +162,7 @@
      <entry>??=</entry>
      <entry>
       <link linkend="language.operators.assignment">assignment operators</link>
-      (available since PHP 7.4.0)
+      (available as of PHP 7.4.0)
      </entry>
     </row>
     <row>
@@ -361,7 +374,7 @@
      <entry>fn</entry>
      <entry>
       <link linkend="functions.arrow">arrow functions</link>
-      (available since PHP 7.4.0)
+      (available as of PHP 7.4.0)
      </entry>
     </row>
     <row>
diff --git a/appendices/transports.xml b/appendices/transports.xml
index 8e5732a4ca..6ccc4b6a91 100644
--- a/appendices/transports.xml
+++ b/appendices/transports.xml
@@ -90,7 +90,7 @@
   <title>Unix Domain: Unix and UDG</title>
   <simpara>
    <literal>unix://</literal> and
-   <literal>udg://</literal> (udg:// since PHP 5).
+   <literal>udg://</literal>.
   </simpara>
 
   <itemizedlist>
diff --git a/faq/installation.xml b/faq/installation.xml
index c637824502..166d1fe8a8 100644
--- a/faq/installation.xml
+++ b/faq/installation.xml
@@ -464,38 +464,9 @@ cgi error:
     </question>
     <answer>
      <para>
-      There are several ways of doing this. If you are using Apache, read
-      their installation specific instructions (<link
-       linkend="install.windows.legacy.apache1">Apache 1</link>, <link
-       linkend="install.windows.legacy.apache2">Apache 2</link>), otherwise you must
-      set the <varname>PHPRC</varname> environment variable:
-     </para>
-     <para>
-      On Windows:
-      <itemizedlist>
-       <listitem><para>
-        Go to Control Panel and open the System icon (Start → Settings
-        → Control Panel → System, or just Start → Control Panel
-        → System)
-       </para></listitem>
-       <listitem><para>
-        Go to the Advanced tab
-       </para></listitem>
-       <listitem><para>
-        Click on the 'Environment Variables' button
-       </para></listitem>
-       <listitem><para>
-        Look into the 'System variables' pane
-       </para></listitem>
-       <listitem><para>
-         Click on 'New' and enter 'PHPRC' as the variable name and the
-         directory where &php.ini; is located as the variable value (e.g.
-         <literal>C:\php</literal>)
-       </para></listitem>
-       <listitem><para>
-        Press OK and restart your computer
-       </para></listitem>
-      </itemizedlist>
+      There are several ways of doing this. If you are using Apache,
+      refer to the Apache documentation, otherwise
+      you must set the <varname>PHPRC</varname> environment variable.
      </para>
     </answer>
    </qandaentry>
diff --git a/faq/using.xml b/faq/using.xml
index f2c894b9e6..c4474547bc 100644
--- a/faq/using.xml
+++ b/faq/using.xml
@@ -333,7 +333,7 @@ foreach ($headers as $name => $content) {
     <answer>
      <para>
       The available options are K (for Kilobytes), M (for Megabytes) and G (for
-      Gigabytes; available since PHP 5.1.0), and are all case-insensitive.
+      Gigabytes), and are all case-insensitive.
       Anything else assumes bytes. <literal>1M</literal> equals one Megabyte or
       <literal>1048576</literal> bytes. <literal>1K</literal> equals one
       Kilobyte or <literal>1024</literal> bytes. These shorthand notations may
diff --git a/features/commandline.xml b/features/commandline.xml
index 00db5c71f0..a00b32660b 100644
--- a/features/commandline.xml
+++ b/features/commandline.xml
@@ -56,7 +56,7 @@
   </note>
   
   <para>
-   As of PHP 5, the &cli; binary is distributed in the main folder as <filename>
+   The &cli; binary is distributed in the main folder as <filename>
    php.exe</filename> on Windows. The <acronym>CGI</acronym> version is
    distributed as <filename>php-cgi.exe</filename>. Additionally, a <filename>
    php-win.exe</filename> is distributed if PHP is configured using
@@ -686,7 +686,7 @@ array(370) {
        <entry>--process-begin</entry>
        <entry>
         <para>
-         PHP code to execute before processing stdin. Added in PHP 5.
+         PHP code to execute before processing stdin.
         </para>
        </entry>
       </row>
@@ -695,7 +695,7 @@ array(370) {
        <entry>--process-code</entry>
        <entry>
         <para>
-         PHP code to execute for every input line. Added in PHP 5.
+         PHP code to execute for every input line.
         </para>
         <para>
          There are two special variables available in this mode:
@@ -711,7 +711,7 @@ array(370) {
        <entry>--process-file</entry>
        <entry>
         <para>
-         PHP file to execute for every input line. Added in PHP 5.
+         PHP file to execute for every input line.
         </para>
        </entry>
       </row>
@@ -720,7 +720,7 @@ array(370) {
        <entry>--process-end</entry>
        <entry>
         <para>
-         PHP code to execute after processing the input. Added in PHP 5.
+         PHP code to execute after processing the input.
         </para>
         <para><example>
          <title>Using the <option>-B</option>, <option>-R</option> and
@@ -742,7 +742,7 @@ Total Lines: 37328
        <entry>
         <para>
          Starts <link linkend="features.commandline.webserver">built-in web
-         server</link>. Available as of PHP 5.4.0.
+         server</link>.
         </para>
        </entry>
       </row>
@@ -752,7 +752,6 @@ Total Lines: 37328
        <entry>
         Specifies document root for <link
         linkend="features.commandline.webserver">built-in web server</link>.
-        Available as of PHP 5.4.0.
        </entry>
       </row>
       <row>
@@ -830,8 +829,7 @@ Zend Engine v2.3.0, Copyright (c) 1998-2009 Zend Technologies
        <entry>--ini</entry>
        <entry>
         <para>
-         Show configuration file names and scanned directories. Available as
-         of PHP 5.2.3.
+         Show configuration file names and scanned directories.
          <example>
           <title><literal>--ini</literal> example</title>
           <programlisting role="shell">
@@ -853,7 +851,7 @@ Additional .ini files parsed:      (none)
        <entry>
         <para>
          Show information about the given function or class method (e.g.
-         number and name of the parameters). Available as of PHP 5.1.2.
+         number and name of the parameters).
         </para>
         <para>
          This option is only available if PHP was compiled with
@@ -884,7 +882,7 @@ Function [ <internal> public function var_dump ] {
        <entry>
         <para>
          Show information about the given class (list of constants, properties
-         and methods). Available as of PHP 5.1.2.
+         and methods).
         </para>
         <para>
          This option is only available if PHP was compiled with
@@ -933,7 +931,7 @@ Class [ <internal:standard> class Directory ] {
        <entry>
         <para>
          Show information about the given extension (list of &php.ini; options,
-         defined functions, constants and classes). Available as of PHP 5.1.2.
+         defined functions, constants and classes).
         </para>
         <para>
          This option is only available if PHP was compiled with
@@ -967,7 +965,6 @@ Extension [ <persistent> extension #19 json version 1.2.1 ] {
         <para>
          Show the configuration information for the given Zend extension (the
          same information that is returned by <function>phpinfo</function>).
-         Available as of PHP 5.4.0.
         </para>
        </entry>
       </row>
@@ -978,7 +975,7 @@ Extension [ <persistent> extension #19 json version 1.2.1 ] {
         <para>
          Show the configuration information for the given extension (the same
          information that is returned by <function>phpinfo</function>).
-         Available as of PHP 5.2.2. The core configuration information
+         The core configuration information
          is available using "main" as extension name.
         </para>
         <para>
@@ -1292,7 +1289,7 @@ This is a command line PHP script with one option.
   <para>
    On Windows, PHP can be configured to run without the need to
    supply the <filename>C:\php\php.exe</filename> or the <literal>.php</literal>
-   extension, as described in <link linkend="install.windows.legacy.commandline">Command
+   extension, as described in <link linkend="install.windows.commandline">Command
    Line PHP on Microsoft Windows</link>.
   </para>
 
@@ -1413,7 +1410,7 @@ php -r 'fwrite(STDERR, "stderr\n");'
   <title>Interactive shell</title>
 
   <para>
-   As of PHP 5.1.0, the &cli.sapi; provides an interactive shell using the
+   The &cli.sapi; provides an interactive shell using the
    <option>-a</option> option if PHP is compiled with the <option
    role="configure">--with-readline</option> option.
    As of PHP 7.1.0 the interactive shell is also available on Windows, if the
@@ -1492,7 +1489,7 @@ php > $foo[TAB]ThisIsAReallyLongVariableName
   </para>
 
   <para>
-   As of PHP 5.4.0, the &cli.sapi; provides
+   The &cli.sapi; provides
    the &php.ini; settings <parameter>cli.pager</parameter> and
    <parameter>cli.prompt</parameter>. The <parameter>cli.pager</parameter>
    setting allows an external program (such as <filename>less</filename>) to
@@ -1502,7 +1499,7 @@ php > $foo[TAB]ThisIsAReallyLongVariableName
   </para>
 
   <para>
-   In PHP 5.4.0 it was also made possible to set
+   It is also possible to set
    &php.ini; settings in the interactive shell using a shorthand notation.
   </para>
 
@@ -1614,7 +1611,7 @@ php >
   </warning>
 
   <para>
-   As of PHP 5.4.0, the &cli.sapi; provides a built-in web server.
+   The &cli.sapi; provides a built-in web server.
   </para>
 
   <para>
@@ -1907,7 +1904,7 @@ $ php -S 0.0.0.0:8000
         <entry><link linkend="ini.cli-server.color">cli_server.color</link></entry>
         <entry>"0"</entry>
         <entry>PHP_INI_ALL</entry>
-        <entry>Available since PHP 5.4.0.</entry>
+        <entry></entry>
        </row>
       </tbody>
      </tgroup>
diff --git a/features/file-upload.xml b/features/file-upload.xml
index 339264243f..0da46e3a5e 100644
--- a/features/file-upload.xml
+++ b/features/file-upload.xml
@@ -301,7 +301,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
       <term><constant>UPLOAD_ERR_NO_TMP_DIR</constant></term>
       <listitem>
        <para>
-        Value: 6; Missing a temporary folder. Introduced in PHP 5.0.3.
+        Value: 6; Missing a temporary folder.
        </para>
       </listitem>
      </varlistentry>
@@ -309,7 +309,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
       <term><constant>UPLOAD_ERR_CANT_WRITE</constant></term>
       <listitem>
        <para>
-        Value: 7; Failed to write file to disk. Introduced in PHP 5.1.0.
+        Value: 7; Failed to write file to disk.
        </para>
       </listitem>
      </varlistentry>
@@ -319,8 +319,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
          <para>
            Value: 8; A PHP extension stopped the file upload. PHP does not 
            provide a way to ascertain which extension caused the file upload to 
-           stop; examining the list of loaded extensions with <function>phpinfo</function> may help. 
-           Introduced in PHP 5.2.0.
+           stop; examining the list of loaded extensions with <function>phpinfo</function> may help.
          </para>
        </listitem>
      </varlistentry>
@@ -372,7 +371,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
     <literal>post_max_size</literal> large enough.
    </simpara>
    <simpara>
-    As of PHP 5.2.12, the
+    The
     <link linkend="ini.max-file-uploads">max_file_uploads</link> configuration
     setting controls the maximum number of files that can uploaded in one
     request. If more files are uploaded than the limit, then
@@ -456,7 +455,7 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
    </simpara>
    <warning>
     <simpara>
-     As of PHP 5.2.12, the
+     The
      <link linkend="ini.max-file-uploads">max_file_uploads</link>
      configuration setting acts as a limit on the number of files that can be
      uploaded in one request. You will need to ensure that your form does not
diff --git a/features/http-auth.xml b/features/http-auth.xml
index 6a255689ac..527f533b3d 100644
--- a/features/http-auth.xml
+++ b/features/http-auth.xml
@@ -14,7 +14,7 @@
    and <varname>AUTH_TYPE</varname> set to the user name, password and 
    authentication type respectively.  These predefined variables are found 
    in the <varname>$_SERVER</varname> array. Both "Basic" and "Digest"
-   (since PHP 5.1.0) authentication methods are supported. See the
+   authentication methods are supported. See the
    <function>header</function> function for more information.
   </simpara>
 
diff --git a/features/remote-files.xml b/features/remote-files.xml
index 70164bdc4c..2b8fdafc23 100644
--- a/features/remote-files.xml
+++ b/features/remote-files.xml
@@ -10,8 +10,8 @@
    that take a filename as a parameter.  In addition, URLs can be
    used with the <function>include</function>,
    <function>include_once</function>, <function>require</function> and
-   <function>require_once</function> statements (since PHP 5.2.0,
-   <option>allow_url_include</option> must be enabled for these).
+   <function>require_once</function> statements 
+   (<option>allow_url_include</option> must be enabled for these).
    See <xref linkend="wrappers"/> for more information about the protocols
    supported by PHP.
   </para>
diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 4af3afce93..af874112ae 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -277,7 +277,7 @@
         original PHP FastCGI (5.2.2+). Makes sense only with a tcp listening socket.
         Each address must be separated by a comma. If this value is left blank,
         connections will be accepted from any ip address. Default value: any.
-        IPv6 addresses are allowed since PHP 5.5.20 and 5.6.4.
+        IPv6 addresses are allowed.
        </para>
       </listitem>
      </varlistentry>
@@ -326,7 +326,7 @@
        <para>
         When POSIX Access Control Lists are supported you can set them using this option.
         When set, <literal>listen.owner</literal> and <literal>listen.group</literal>
-        are ignored. Value is a comma separated list of user names. Since PHP 5.6.5.
+        are ignored. Value is a comma separated list of user names.
        </para>
       </listitem>
      </varlistentry>
@@ -338,7 +338,7 @@
       <listitem>
        <para>
         See <literal>listen.acl_users</literal>.
-        Value is a comma separated list of group names. Since PHP 5.6.5.
+        Value is a comma separated list of group names.
        </para>
       </listitem>
      </varlistentry>
@@ -682,7 +682,7 @@
         Clear environment in FPM workers.
         Prevents arbitrary environment variables from reaching FPM worker processes
         by clearing the environment in workers before env vars specified in this
-        pool configuration are added. Since PHP 5.4.27, 5.5.11, and 5.6.0.
+        pool configuration are added.
         Default value: Yes.
        </para>
       </listitem>
diff --git a/install/fpm/install.xml b/install/fpm/install.xml
index 0536d870f7..0449dc29a5 100644
--- a/install/fpm/install.xml
+++ b/install/fpm/install.xml
@@ -29,7 +29,7 @@
       </listitem>
       <listitem>
        <para>
-        <literal>--with-fpm-acl</literal> - Use POSIX Access Control Lists (default - no). Since PHP 5.6.5.
+        <literal>--with-fpm-acl</literal> - Use POSIX Access Control Lists (default - no).
        </para>
       </listitem>
      </itemizedlist>
diff --git a/install/ini.xml b/install/ini.xml
index 99a92cd88f..b65f222f94 100644
--- a/install/ini.xml
+++ b/install/ini.xml
@@ -25,13 +25,12 @@
     </listitem>
     <listitem>
      <simpara>
-      The <varname>PHPRC</varname> environment variable. Before PHP 5.2.0,
-      this was checked after the registry key mentioned below.
+      The <varname>PHPRC</varname> environment variable.
      </simpara>
     </listitem>
     <listitem>
      <simpara>
-      As of PHP 5.2.0, the location of the <literal>php.ini</literal> file
+      The location of the <literal>php.ini</literal> file
       can be set for different versions of PHP. The root of the registry keys depends on 32- or 64-bitness of the installed OS and PHP.
       For 32-bit PHP on a 32-bit OS or a 64-bit PHP on a 64-bit OS use <literal>[(HKEY_LOCAL_MACHINE\SOFTWARE\PHP]</literal> for 32-bit version of PHP on a 64-bit OS use <literal>[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\PHP]</literal>] instead.
       For same bitness installation the following registry keys
@@ -138,7 +137,7 @@ include_path = ".;c:\php\lib"
    </example>
   </para>
   <para>
-   Since PHP 5.1.0, it is possible to refer to existing .ini variables from
+   It is possible to refer to existing .ini variables from
    within .ini files. Example: <literal>open_basedir = ${open_basedir}
    ":/new/dir"</literal>.
   </para>
@@ -148,8 +147,8 @@ include_path = ".;c:\php\lib"
    <para>
     It is possible to configure PHP to scan for .ini files in a directory
     after reading &php.ini;. This can be done at compile time by setting the
-    <option role="configure">--with-config-file-scan-dir</option> option. In
-    PHP 5.2.0 and later, the scan directory can then be overridden at run time
+    <option role="configure">--with-config-file-scan-dir</option> option. 
+    The scan directory can then be overridden at run time
     by setting the <varname>PHP_INI_SCAN_DIR</varname> environment variable.
    </para>
 
@@ -245,7 +244,7 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
   <title>.user.ini files</title>
   
   <simpara>
-   Since PHP 5.3.0, PHP includes support for configuration INI files on a
+   PHP includes support for configuration INI files on a
    per-directory basis. These files are processed <emphasis>only</emphasis> by
    the CGI/FastCGI SAPI. This functionality obsoletes the PECL htscanner
    extension. If you are running PHP as Apache module, use &htaccess; files for the same
@@ -322,14 +321,13 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
        <entry>
         Entry can be set in user scripts (like with <function>ini_set</function>)
         or in the <link linkend="configuration.changes.windows">Windows registry</link>.
-        Since PHP 5.3, entry can be set in &user-ini;
+        Entry can be set in &user-ini;
        </entry>
       </row>
       <row>
        <entry><literal>PHP_INI_PERDIR</literal></entry>
        <entry>
         Entry can be set in &php.ini;, &htaccess;, &httpd.conf; or &user-ini;
-        (since PHP 5.3)
        </entry>
       </row>
       <row>
diff --git a/install/macos/bundled.xml b/install/macos/bundled.xml
index 99a0849a0b..60375b64ae 100644
--- a/install/macos/bundled.xml
+++ b/install/macos/bundled.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <sect1 xml:id="install.macosx.bundled" xmlns="http://docbook.org/ns/docbook">
- <title>Using the bundled PHP</title>
+ <title>Using the bundled PHP prior to macOS Monterey</title>
  <simpara>
-  PHP has come standard with Macs since Mac OS X version 10.0.0. Enabling PHP 
-  with the default web server requires uncommenting a few lines in the 
+  PHP is bundled with macOS since macOS X (10.0.0) prior to macOS Monterey (12.0.0).
+  Enabling PHP with the default web server requires uncommenting a few lines in the 
   Apache configuration file <filename>httpd.conf</filename> whereas the 
   <acronym>CGI</acronym> and/or <acronym>CLI</acronym> are enabled by  
   default (easily accessible via the Terminal program).
diff --git a/install/macos/index.xml b/install/macos/index.xml
index a37789616b..6915026c1b 100644
--- a/install/macos/index.xml
+++ b/install/macos/index.xml
@@ -4,8 +4,8 @@
  <title>Installation on macOS</title>
  <para>
   This section contains notes and hints specific to installing PHP on macOS.
-  PHP is bundled with Macs, and compiling is similar to the
-  <link linkend="install.unix">Unix installation guide</link>.
+  PHP is bundled with macOS since macOS X (10.0.0) prior to macOS Monterey (12.0.0).
+  Compiling is similar to the <link linkend="install.unix">Unix installation guide</link>.
  </para>
  &install.macos.packages;
  &install.macos.bundled;
diff --git a/install/pecl.xml b/install/pecl.xml
index c0ef29765e..64356e58c9 100644
--- a/install/pecl.xml
+++ b/install/pecl.xml
@@ -111,16 +111,15 @@ $ svn checkout http://svn.php.net/repository/pecl/extname/trunk extname
    (see next section for the download).
   </para>
   <para>
-   To compile an extension into PHP, please refer to <link linkend="install.windows.legacy.building">
+   To compile an extension into PHP, please refer to <link linkend="install.windows.building">
    building from source</link> documentation.
   </para>
   <para>
-   To compile a standalone extension (aka a DLL file), please refer to <link linkend="install.windows.legacy.building">
+   To compile a standalone extension (aka a DLL file), please refer to <link linkend="install.windows.building">
    building from source</link> documentation. If the DLL file is available neither with your 
    PHP distribution nor in PECL, you may have to compile it before you can start using the 
    extension.
   </para>
-
   <sect2 xml:id="install.pecl.windows.find">
    <title>Where to find an extension?</title>
    <para>
diff --git a/install/unix/apache2.xml b/install/unix/apache2.xml
index 9479b6ca65..00a850b961 100644
--- a/install/unix/apache2.xml
+++ b/install/unix/apache2.xml
@@ -177,14 +177,25 @@ cp php.ini-development /usr/local/lib/php.ini
 
     <listitem>
 
- <para>
-   Edit your httpd.conf to load the PHP module.  The path on the right hand
-    side of the LoadModule statement must point to the path of the PHP
-    module on your system.  The make install from above may have already
-    added this for you, but be sure to check.
-</para>
+     <para>
+      Edit your httpd.conf to load the PHP module.  The path on the right hand
+      side of the LoadModule statement must point to the path of the PHP
+      module on your system.  The make install from above may have already
+      added this for you, but be sure to check.
+     </para>
 
-      <informalexample>
+     <informalexample>
+       <para>
+        For PHP 8:
+       </para>
+       <programlisting role="apache-conf">
+<![CDATA[
+LoadModule php_module modules/libphp.so
+]]>
+       </programlisting>
+     </informalexample>
+
+     <informalexample>
        <para>
         For PHP 7:
        </para>
@@ -195,20 +206,9 @@ LoadModule php7_module modules/libphp7.so
        </programlisting>
      </informalexample>
 
-      <informalexample>
-       <para>
-        For PHP 5:
-       </para>
-       <programlisting role="apache-conf">
-<![CDATA[
-LoadModule php5_module modules/libphp5.so
-]]>
-       </programlisting>
-      </informalexample>
+    </listitem>
 
-      </listitem>
-
-      <listitem>
+    <listitem>
 
     <para>
     Tell Apache to parse certain extensions as PHP.  For example, let's have
diff --git a/install/windows/apache2.xml b/install/windows/apache2.xml
new file mode 100644
index 0000000000..e094309870
--- /dev/null
+++ b/install/windows/apache2.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sect1 xml:id="install.windows.apache2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Apache 2.x on Microsoft Windows</title>
+ <para>
+  This section contains notes and hints specific to Apache 2.x installs
+  of PHP on Microsoft Windows systems.
+ </para>
+ <note>
+  <para>
+   Please read the <link linkend="install.windows.manual">manual
+   installation steps</link> first!
+  </para>
+ </note>
+
+ <para>
+  It is strongly recommended to consult the
+  <link xlink:href="&url.apache2.docs;">Apache Documentation</link>
+  to get have  a basic understanding of the Apache 2.x Server.
+  Also consider reading the
+  <link xlink:href="&url.apache2.windows;">Windows specific notes</link>
+  for Apache 2.x before reading on here.
+ </para>
+
+ <para>
+  Download the most recent version of
+  <link xlink:href= "&url.apachelounge.download;">Apache 2.x</link>
+  and a fitting PHP version. Follow the
+  <link linkend="install.windows.manual">Manual Installation Steps</link>
+  and come back to go on with the integration of PHP and Apache.
+ </para>
+
+ <para>
+  There are three ways to set up PHP to work with Apache 2.x on Windows.
+  PHP can be run as a handler, as a CGI, or under FastCGI.
+ </para>
+
+ &note.apache.slashes;
+
+ <sect2 xml:id="install.windows.apache2.module">
+  <title>Installing as an Apache handler</title>
+  <para>
+   To load the PHP module for Apache 2.x, the following lines in the
+   Apache &httpd.conf; configuration file must be inserted:
+   <example>
+    <title>PHP and Apache 2.x as handler</title>
+    <programlisting role="apache-conf">
+<![CDATA[
+# before PHP 8.0.0 the name of the module was php7_module
+LoadModule php_module "c:/php/php8apache2_4.dll"
+<FilesMatch \.php$>
+    SetHandler application/x-httpd-php
+</FilesMatch>
+# configure the path to php.ini
+PHPIniDir "C:/php"
+]]>
+    </programlisting>
+   </example>
+  </para>
+  <note>
+   <simpara>
+    The actual path to PHP must be substituted instead of
+    <filename>C:/php/</filename> in the above examples.
+    Make sure that the file referenced in the <literal>LoadModule</literal> directive is at
+    the specified location. Use <filename>php7apache2_4.dll</filename>
+    for PHP 7, or <filename>php8apache2_4.dll</filename> for PHP 8.
+   </simpara>
+  </note>
+ </sect2>
+
+ <sect2 xml:id="install.windows.apache2.cgi">
+  <title>Running PHP as CGI</title>
+
+  <para>
+   It is strongly recommended to consult the
+   <link xlink:href="&url.apache.cgi;">Apache CGI documentation</link>
+   for a more complete understanding of running CGI on Apache.
+  </para>
+
+  <para>
+   To run PHP as CGI, the php-cgi files will need to be placed in a
+   directory designated as a CGI directory using the ScriptAlias directive.
+  </para>
+
+  <para>
+   A <literal>#!</literal> line will need to be placed in the PHP files,
+   which point to the location of the PHP binary:
+
+   <example>
+    <title>PHP and Apache 2.x as CGI</title>
+    <programlisting>
+<![CDATA[
+#!C:/php/php.exe
+<?php
+  phpinfo();
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+  &warn.install.cgi;
+ </sect2>
+
+ <sect2 xml:id="install.windows.apache2.fastcgi">
+  <title>Running PHP under FastCGI</title>
+
+  <para>
+   Running PHP under FastCGI has a number of advantages over running it as a
+   CGI. Setting it up this way is fairly straightforward:
+  </para>
+  <para>
+   Obtain <literal>mod_fcgid</literal> from
+   <link xlink:href="&url.apachelounge.download;">&url.apachelounge;</link>.
+   Win32 binaries are available for download from that site.
+   Install the module according to the instructions that will come with it.
+  </para>
+  <para>
+   Configure your web server as shown below, taking care to adjust any paths
+   to reflect your how you have installed things on your particular system:
+
+   <example>
+    <title>Configure Apache to run PHP as FastCGI</title>
+    <programlisting>
+<![CDATA[
+LoadModule fcgid_module modules/mod_fcgid.so
+# Where is your php.ini file?
+FcgidInitialEnv PHPRC        "c:/php"
+<FilesMatch \.php$>
+    SetHandler fcgid-script
+</FilesMatch>
+FcgidWrapper "c:/php/php-cgi.exe" .php
+]]>
+    </programlisting>
+   </example>
+
+   Files with a .php extension will now be executed by the PHP FastCGI
+   wrapper.
+  </para>
+ </sect2>
+</sect1>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/install/windows/legacy/building.xml b/install/windows/building.xml
similarity index 78%
rename from install/windows/legacy/building.xml
rename to install/windows/building.xml
index 1cfeab0e3f..d8eda5b675 100644
--- a/install/windows/legacy/building.xml
+++ b/install/windows/building.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<sect2 xml:id="install.windows.legacy.building" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<sect1 xml:id="install.windows.building" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Building from source</title>
  <para>
-  This chapter teaches how to compile PHP from sources on windows, using
+  This chapter teaches how to compile PHP from sources on Windows, using
   Microsoft's tools. To compile PHP with cygwin, please refer to <xref
   linkend="install.unix"/>.
  </para>
@@ -11,8 +10,7 @@
   See the Wiki documentation at:
   <link xlink:href="&url.wiki.windows.build.howto;">&url.wiki.windows.build.howto;</link>  
  </para>
-</sect2>
-
+</sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/install/windows/commandline.xml b/install/windows/commandline.xml
new file mode 100644
index 0000000000..23828f77dc
--- /dev/null
+++ b/install/windows/commandline.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+<sect1 xml:id="install.windows.commandline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Command Line PHP on Microsoft Windows</title>
+ <para>
+  This section contains notes and hints specific to getting PHP running
+  from the command line for Windows.
+ </para>
+ <note>
+  <para>
+   You should read the <link linkend="install.windows.manual">manual
+   installation steps</link> first!
+  </para>
+ </note>
+ <para>
+  Getting PHP to run from the command line can be performed without making
+  any changes to Windows.
+  <screen>
+<![CDATA[
+C:\php\php.exe -f "C:\PHP Scripts\script.php" -- -arg1 -arg2 -arg3
+]]>     
+  </screen>
+ </para>
+
+ <para>
+  But there are some easy steps that can be followed to make this simpler.
+  Some of these steps should already have been taken, but are repeated here
+  to be able to provide a complete step-by-step sequence.
+
+  <itemizedlist>
+   <note>
+    <para>
+     Both <envar>PATH</envar> and <envar>PATHEXT</envar> are important
+     pre-existing system variables in Windows,
+     and care should be taken to not overwrite either variable,
+     only to add to them.
+    </para>
+   </note>
+
+   <listitem>
+    <para>
+     Append the location of the PHP executable (<filename>php.exe</filename>,
+     <filename>php-win.exe</filename> or <filename>php-cli.exe</filename>
+     depending upon your PHP version and display preferences) to the
+     <envar>PATH</envar> environment variable. Read more about how to
+     add your PHP directory to <envar>PATH</envar> in the <link
+     linkend="faq.installation.addtopath">corresponding FAQ entry</link>.
+    </para>
+   </listitem>
+
+   <listitem>
+    <para>
+     Append the <literal>.PHP</literal> extension to the
+     <varname>PATHEXT</varname> environment variable. This can be done
+     at the same time as amending the <envar>PATH</envar> environment
+     variable. Follow the same steps as described in the <link
+     linkend="faq.installation.addtopath">FAQ</link> but amend the
+     <varname>PATHEXT</varname> environment variable rather than the
+     <envar>PATH</envar> environment variable.
+     <note>
+      <para>
+       The position in which you place the <literal>.PHP</literal> will
+       determine which script or program is executed when there are matching
+       filenames. For example, placing <literal>.PHP</literal> before
+       <literal>.BAT</literal> will cause your script to run, rather than
+       the batch file, if there is a batch file with the same name.
+      </para>
+     </note>
+    </para>
+   </listitem>
+
+   <listitem>
+    <para>
+     Associate the <literal>.PHP</literal> extension with a file type. This
+     is done by running the following command:
+     <screen>
+<![CDATA[
+assoc .php=phpfile
+]]>     
+     </screen>
+    </para>
+   </listitem>
+
+   <listitem>
+    <para>
+     Associate the <literal>phpfile</literal> file type with the appropriate
+     PHP executable. This is done by running the following command:
+     <screen>
+<![CDATA[
+ftype phpfile="C:\php\php.exe" -f "%1" -- %~2
+]]>     
+     </screen>
+    </para>
+   </listitem>
+
+  </itemizedlist>
+ </para>
+
+ <para>
+  Following these steps will allow PHP scripts to be run from any directory
+  without the need to type the PHP executable or the <literal>.PHP</literal>
+  extension and all parameters will be supplied to the script for processing.
+ </para>
+
+ <para>
+  The example below details some of the registry changes that can be made manually.
+  <example>
+   <title>Registry changes</title>
+   <screen>
+<![CDATA[
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\.php]
+@="phpfile"
+"Content Type"="application/php"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile]
+@="PHP Script"
+"EditFlags"=dword:00000000
+"BrowserFlags"=dword:00000008
+"AlwaysShowExt"=""
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\DefaultIcon]
+@="C:\\php\\php-win.exe,0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\shell]
+@="Open"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\shell\Open]
+@="&Open"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\shell\Open\command]
+@="\"C:\\php\\php.exe\" -f \"%1\" -- %~2"
+]]>
+   </screen>
+  </example>
+ </para>
+
+ <para>
+  With these changes the same command can be written as:
+  <screen>
+<![CDATA[
+"C:\PHP Scripts\script" -arg1 -arg2 -arg3
+]]>
+  </screen>
+  or, if your <literal>"C:\PHP Scripts"</literal> path is in the
+  <envar>PATH</envar> environment variable:
+  <screen>
+<![CDATA[
+script -arg1 -arg2 -arg3
+]]>
+  </screen>
+ </para>
+
+ <note>
+  <para>
+   There is a small problem if you intend to use this technique and use your
+   PHP scripts as a command line filter, like the example below:
+   <screen>
+<![CDATA[
+dir | "C:\PHP Scripts\script" -arg1 -arg2 -arg3
+]]>
+   </screen>
+   or
+   <screen>
+<![CDATA[
+dir | script -arg1 -arg2 -arg3
+]]>
+   </screen>
+   You may find that the script simply hangs and nothing is output.
+   To get this operational, you need to make another registry change.
+   <screen>
+<![CDATA[
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\policies\Explorer]
+"InheritConsoleHandles"=dword:00000001
+]]>
+   </screen>
+   Further information regarding this issue can be found in this <link
+   xlink:href="http://support.microsoft.com/default.aspx?scid=kb;en-us;321788">Microsoft
+   Knowledgebase Article : 321788</link>.
+   As of Windows 10, this setting seems to be reversed, making the default install of
+   Windows 10 support inherited console handles automatically. This <link
+   xlink:href="https://social.msdn.microsoft.com/Forums/en-US/f19d740d-21c8-4dc2-a9ab-d5c0527e932b/nasty-file-association-regression-bug-in-windows-10-console?forum=windowssdk">
+   Microsoft forum post</link> provides the explanation.
+  </para>
+ </note>
+</sect1>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/install/windows/figures/iis6anonauth.png b/install/windows/figures/iis6anonauth.png
deleted file mode 100644
index 0a503d7af7..0000000000
Binary files a/install/windows/figures/iis6anonauth.png and /dev/null differ
diff --git a/install/windows/figures/iis6defaultdoc.png b/install/windows/figures/iis6defaultdoc.png
deleted file mode 100644
index 850b99255a..0000000000
Binary files a/install/windows/figures/iis6defaultdoc.png and /dev/null differ
diff --git a/install/windows/figures/iis7handlericon.png b/install/windows/figures/iis7handlericon.png
deleted file mode 100644
index 135943bd38..0000000000
Binary files a/install/windows/figures/iis7handlericon.png and /dev/null differ
diff --git a/install/windows/figures/iis7handlermap.png b/install/windows/figures/iis7handlermap.png
deleted file mode 100644
index 91c5ae0765..0000000000
Binary files a/install/windows/figures/iis7handlermap.png and /dev/null differ
diff --git a/install/windows/figures/iis7vistacgi.png b/install/windows/figures/iis7vistacgi.png
deleted file mode 100644
index 520486195b..0000000000
Binary files a/install/windows/figures/iis7vistacgi.png and /dev/null differ
diff --git a/install/windows/figures/iis7w2k8cgi.png b/install/windows/figures/iis7w2k8cgi.png
deleted file mode 100644
index a8b86eec76..0000000000
Binary files a/install/windows/figures/iis7w2k8cgi.png and /dev/null differ
diff --git a/install/windows/index.xml b/install/windows/index.xml
index 3bf33724ba..a9534b3fd6 100644
--- a/install/windows/index.xml
+++ b/install/windows/index.xml
@@ -1,98 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <chapter xml:id="install.windows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Installation on Windows systems</title>
-  <para>
-    Installing PHP on modern Microsoft Windows systems and recommended configuration with common web servers.
-  </para>
-  <note>
+ <title>Installation on Windows systems</title>
+ <para>
+  Installing PHP on modern Microsoft Windows systems and recommended configuration with common web servers.
+ </para>
+
+ <para>
+  The Official releases of PHP on Windows are recommended for production use.
+  However, you are welcome to build PHP from Source.
+  You will need a Visual Studio environment.
+  See <link xlink:href="&url.install.windows.stepbystep;">Step by Step Build Instructions</link>.
+ </para>
+ <para>
+  <itemizedlist spacing="compact">
+   <listitem>
     <para>
-      If you are looking for information about older systems, such as Windows XP, 2003, 98 or Apache 1.x, see the <link linkend="install.windows.legacy.index">Legacy Info</link> section.
+     <link linkend="install.windows.commandline">Using PHP on Windows Command line</link>
     </para>
-  </note>
+   </listitem>
+   <listitem>
+    <para>
+     <link linkend="install.cloud.azure">Installing PHP on Azure App Services</link>
+     (aka Microsoft Azure, Windows Azure, or (Windows) Azure Web Apps).
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
+
+ <sect1 xml:id="install.windows.requirements">
+  <title>Install Requirements</title>
 
   <para>
-    The Official releases of PHP on Windows are recommended for production use.
-    However, you are welcome to build PHP from Source. You will need a Visual Studio environment. See <link xlink:href="https://wiki.php.net/internals/windows/stepbystepbuild">Step by Step Build Instructions</link>.
+   PHP requires at least Windows 2008/Vista.
+   Either 32-Bit or 64-bit (<acronym>AKA</acronym> X86 or X64. PHP does not run on Windows RT/WOA/ARM).
+   As of PHP 7.2.0 Windows 2008 and Vista are no longer supported.
+  </para>
+
+  <para>
+   PHP requires the Visual C runtime (CRT). Many applications require that so it may already be installed.
+  </para>
+
+  <para>
+   The Microsoft Visual C++ Redistributable for Visual Studio 2019 is suitable
+   for all these PHP versions, see
+   <link xlink:href="https://visualstudio.microsoft.com/downloads/">https://visualstudio.microsoft.com/downloads/</link>.
+  </para>
+
+  <para>
+   You MUST download the x86 CRT for PHP x86 builds and the x64 CRT for PHP x64 builds.
+  </para>
+
+  <para>
+   If CRT is already installed, the installer will tell you that and not change anything.
+  </para>
+
+  <para>
+   The CRT installer supports the /quiet and /norestart command-line switches, so you can script running it.
+  </para>
+ </sect1>
+
+ <sect1 xml:id="install.windows.pecl">
+  <title>PECL</title>
+  <para>
+   PECL extensions are pre-built for Windows and available from:
+   <link xlink:href="http://windows.php.net/downloads/pecl/releases/">http://windows.php.net/downloads/pecl/releases/</link>
   </para>
   <para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <link linkend="install.windows.legacy.commandline">Using PHP on Windows Command line</link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link linkend="install.cloud.azure">Installing PHP on Azure App Services</link> (aka Microsoft Azure, Windows Azure, or (Windows) Azure Web Apps).
-        </para>
-      </listitem>
-    </itemizedlist>
+   Some extensions use features specific to some Unix systems and so are not available on Windows.
+   Otherwise, all extensions are available for Windows.
   </para>
+ </sect1>
 
-  <sect1 xml:id="install.windows.requirements">
-    <title>Install Requirements</title>
-
-    <para>
-      PHP 5.5+ require at least Windows 2008/Vista, or 2008r2, 2012, 2012r2, 2016 or 7, 8, 8.1, 10. Either 32-Bit or 64-bit (aka X86 or X64. PHP does not run on Windows RT/WOA/ARM).
-      As of PHP 7.2.0 Windows 2008 and Vista are no longer supported.
-    </para>
-
-    <para>
-      PHP requires the Visual C runtime(CRT). Many applications require that so it may already be installed.
-    </para>
-
-    <para>
-      PHP 5.5 and 5.6 require VC CRT 11 (Visual Studio 2012). See: <link xlink:href="https://www.microsoft.com/en-us/download/details.aspx?id=30679">https://www.microsoft.com/en-us/download/details.aspx?id=30679</link>
-    </para>
-
-    <para>
-      PHP 7.0 and 7.1 require VC CRT 14 (Visual Studio 2015).
-      PHP 7.2, 7.3 and 7.4 require VC CRT 15 (Visual Studio 2017).
-      The Microsoft Visual C++ Redistributable for Visual Studio 2019 is suitable
-      for all these PHP versions, see
-      <link xlink:href="https://visualstudio.microsoft.com/downloads/">https://visualstudio.microsoft.com/downloads/</link>.
-    </para>
-
-    <para>
-      You MUST download the x86 CRT for PHP x86 builds and the x64 CRT for PHP x64 builds.
-    </para>
-
-    <para>
-      If CRT is already installed, the installer will tell you that and not change anything.
-   </para>
-
-    <para>
-      The CRT installer supports the /quiet and /norestart command-line switches, so you can script running it.
-    </para>
-
-    <para>
-      VC11 CRT DLLs can be copied from your local machine to a remote machine(a `Copy Deployment` installation) instead of running the installer on the remote machine (such as a web server you have restricted access to).
-    </para>
-
-    <para>
-      VC14 CRT does not support a `Copy Deployment` installation. VC14 CRT has many more DLLs(most in files with names starting with api-*). If you can find them all and copy them, it will also work (try a tool like Resource Hacker to get a list of all the DLLs to copy).
-    </para>
-
-  </sect1>
-
-  <sect1 xml:id="install.windows.pecl">
-    <title>PECL</title>
-
-    <para>PECL extensions are pre-built for Windows and available from: <link xlink:href="http://windows.php.net/downloads/pecl/releases/">http://windows.php.net/downloads/pecl/releases/</link>
-    </para>
-
-    <para>Some extensions use features specific to some Unix systems and so are not available on Windows. Otherwise, all extensions are available for Windows.
-    </para>
-  </sect1>
-
-  <!-- Critical: ensure all pages in install/windows and that install/windows/legacy/index are referenced here!
-  otherwise you will get IDREF attribute errors for all links -->
-  &install.windows.tools;
-  &install.windows.recommended;
-  &install.windows.manual;
-  &install.windows.troubleshooting;
-  &install.windows.legacy.index;
+ &install.windows.tools;
+ &install.windows.recommended;
+ &install.windows.manual;
+ &install.windows.building;
+ &install.windows.commandline;
+ &install.windows.apache2;
+ &install.windows.troubleshooting;
 </chapter>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/install/windows/legacy/apache1.xml b/install/windows/legacy/apache1.xml
deleted file mode 100644
index d057eb90a0..0000000000
--- a/install/windows/legacy/apache1.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.apache1" xmlns="http://docbook.org/ns/docbook">
-    <title>Apache 1.3.x on Microsoft Windows</title>
-    <para>
-     This section contains notes and hints specific to Apache 1.3.x installs
-     of PHP on Microsoft Windows systems. There are also
-     <!--<link linkend="install.windows.legacy.apache2">instructions and notes
-     for Apache 2</link> on a separate page.-->
-    </para>
-    <note>
-     <para>
-      Please read the <link linkend="install.windows.legacy.manual">manual
-      installation steps</link> first!
-     </para>
-    </note>
-    
-    <simpara>
-     There are two ways to set up PHP to work with Apache 1.3.x
-     on Windows. One is to use the CGI binary (<filename>php.exe</filename>
-     for PHP 4 and <filename>php-cgi.exe</filename> for PHP 5),
-     the other is to use the Apache Module DLL. In either case
-     you need to edit your &httpd.conf; to configure Apache to
-     work with PHP, and then restart the server.
-    </simpara>
-    
-    <simpara>
-     It is worth noting here that now the SAPI module has been 
-     made more stable under Windows, we recommend it's use above
-     the CGI binary, since it is more transparent and secure.
-    </simpara>
-    
-    <simpara>
-     Although there can be a few variations of configuring PHP
-     under Apache, these are simple enough to be used by the
-     newcomer. Please consult the Apache Documentation for further
-     configuration directives.
-    </simpara>
-  
-    <simpara>
-     After changing the configuration file, remember to restart the server, for
-     example, <command>NET STOP APACHE</command> followed by
-     <command>NET START APACHE</command>, if you run Apache as a Windows
-     Service, or use your regular shortcuts.
-    </simpara>
-    
-    &note.apache.slashes;
-
-    <sect3 xml:id="install.windows.legacy.apache1.module">
-     <title>Installing as an Apache module</title>
-     <para>
-      You should add the following lines to your Apache &httpd.conf; file:
-     </para>
-     <para>
-      <example>
-       <title>PHP as an Apache 1.3.x module</title>
-        <para>
-         This assumes PHP is installed to <filename>c:\php</filename>. Adjust the
-         path if this is not the case.
-        </para>
-        <para>
-         For PHP 4:
-        </para>
-        <programlisting role="apache-conf">
-<![CDATA[
-# Add to the end of the LoadModule section
-# Don't forget to copy this file from the sapi directory!
-LoadModule php4_module "C:/php/php4apache.dll"
-
-# Add to the end of the AddModule section
-AddModule mod_php4.c
-]]>
-       </programlisting>
-       <para>
-        For PHP 5:
-       </para>
-       <programlisting role="apache-conf">
-<![CDATA[
-# Add to the end of the LoadModule section
-LoadModule php5_module "C:/php/php5apache.dll"
-
-# Add to the end of the AddModule section
-AddModule mod_php5.c
-]]>
-       </programlisting>
-       <para>
-        For both:
-       </para>
-       <programlisting role="apache-conf">
-<![CDATA[
-# Add this line inside the <IfModule mod_mime.c> conditional brace
-AddType application/x-httpd-php .php
-
-# For syntax highlighted .phps files, also add
-AddType application/x-httpd-php-source .phps
-]]>
-       </programlisting>
-      </example>
-     </para>
-    </sect3>
-
-    <sect3 xml:id="install.windows.legacy.apache1.cgi">
-     <title>Installing as a CGI binary</title>
-    
-     <para>
-      If you unzipped the PHP package to <filename>C:\php\</filename> as described
-      in the <link linkend="install.windows.legacy.manual">Manual
-      Installation Steps</link> section, you need to insert
-      these lines to your Apache configuration file to set
-      up the CGI binary:
-      <example>
-       <title>PHP and Apache 1.3.x as CGI</title>
-        <programlisting role="apache-conf">
-<![CDATA[
-ScriptAlias /php/ "c:/php/"
-AddType application/x-httpd-php .php
-
-# For PHP 4
-Action application/x-httpd-php "/php/php.exe"
-
-# For PHP 5
-Action application/x-httpd-php "/php/php-cgi.exe"
-
-# specify the directory where php.ini is
-SetEnv PHPRC C:/php
-]]>
-       </programlisting>
-      </example>
-      Note that the second line in the list above can be found
-      in the actual versions of &httpd.conf;, but it is commented out. Remember
-      also to substitute the <filename>c:/php/</filename> for your actual path to
-      PHP.
-     </para>
-     &warn.install.cgi;
-     <simpara>
-      If you would like to present PHP source files syntax highlighted, there
-      is no such convenient option as with the module version of PHP.
-      If you chose to configure Apache to use PHP as a CGI binary, you
-      will need to use the <function>highlight_file</function> function. To
-      do this simply create a PHP script file and add this code: 
-      <literal>&lt;?php highlight_file('some_php_script.php'); ?&gt;</literal>.
-     </simpara>
-    </sect3>
-
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/apache2.xml b/install/windows/legacy/apache2.xml
deleted file mode 100644
index cb4fd98613..0000000000
--- a/install/windows/legacy/apache2.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.apache2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Apache 2.x on Microsoft Windows</title>
-    <para>
-     This section contains notes and hints specific to Apache 2.x installs
-     of PHP on Microsoft Windows systems. We also
-     <!--have <link linkend="install.windows.legacy.apache1">instructions and notes
-     for Apache 1.3.x users on a separate page</link>.-->
-    </para>
-    <note>
-     <para>
-      You should read the <link linkend="install.windows.legacy.manual">manual
-       installation steps</link> first!
-     </para>
-    </note>
-    <note>
-     <title>Apache 2.2 Support</title>
-     <para>
-      Users of Apache 2.2 should note that the DLL file for Apache 2.2 is
-      named <filename>php5apache2_2.dll</filename> rather than <filename>php5apache2.dll</filename>
-      and is available only for PHP 5.2.0 and later.
-     </para>
-    </note>
-    
-    <para>
-     You are strongly encouraged to consult the
-     <link xlink:href="&url.apache2.docs;">Apache Documentation</link> to get
-     a basic understanding of the Apache 2.x Server. Also consider
-     reading the <link xlink:href="&url.apache2.windows;">Windows specific
-     notes</link> for Apache 2.x before reading on here.
-    </para>
-    
-     <para>
-      Apache 2.x is designed to run on the Windows version designated as
-      server platforms, such as Windows NT 4.0, Windows 2000,
-      Windows XP, or Windows 7. While Apache 2.x works tolerably well on Windows 9x,
-      support on these platforms is incomplete, and some things will not work
-      correctly. There is no plan to remedy this situation.
-     </para>
-
-    <para>
-     Download the most recent version of <link xlink:href= "&url.apache;">
-     Apache 2.x</link> and a fitting PHP version.
-     Follow the <link linkend="install.windows.legacy.manual">Manual Installation
-     Steps</link> and come back to go on with the integration of PHP and Apache.
-    </para>
-
-    <para>
-     There are three ways to set up PHP to work with Apache 2.x on Windows.
-     You can run PHP as a handler, as a CGI, or under FastCGI.
-    </para>
-    
-    &note.apache.slashes;
-    
-    <sect3 xml:id="install.windows.apache2.legacy.module">
-     <title>Installing as an Apache handler</title>
-     <para>
-      You need to insert the following lines into your
-      Apache &httpd.conf; configuration file to load the
-      PHP module for Apache 2.x:
-      <example>
-       <title>PHP and Apache 2.x as handler</title>
-        <programlisting role="apache-conf">
-<![CDATA[
-# 
-LoadModule php5_module "c:/php/php5apache2.dll"
-AddHandler application/x-httpd-php .php
-
-# configure the path to php.ini
-PHPIniDir "C:/php"
-]]>
-       </programlisting>
-      </example>
-     </para>
-     <note>
-      <simpara>
-       Remember to substitute your actual path to PHP for the
-       <filename>C:/php/</filename> in the above examples. Take care to use
-       either <filename>php5apache2.dll</filename> or 
-       <filename>php5apache2_2.dll</filename> in your LoadModule directive and
-       verify that the referenced file is in fact located at the file path
-       that you point to in this directive.
-      </simpara>
-     </note>
-      <para>
-      The above configuration will enable PHP handling of any file that has a
-      .php extension, even if there are other file extensions. For example, a
-      file named <filename>example.php.txt</filename> will be executed by the
-      PHP handler. To ensure that only files that <emphasis>end in</emphasis>
-      <filename>.php</filename> are executed, use the following configuration
-      instead:
-      </para>
-
-      <example>
-        <programlisting role="apache-conf">
-<![CDATA[
- <FilesMatch \.php$>
-      SetHandler application/x-httpd-php
- </FilesMatch>
-]]>
-       </programlisting>
-      </example>
-    </sect3>
-
-    <sect3 xml:id="install.windows.apache2.legacy.cgi">
-     <title>Running PHP as CGI</title>
-
-     <para>
-      You should consult the <link xlink:href="&url.apache.cgi;">Apache CGI
-      documentation</link> for a more complete understanding of running CGI
-      on Apache.
-     </para>
-   
-     <para>
-      To run PHP as CGI, you'll need to place your php-cgi files in a
-      directory designated as a CGI directory using the ScriptAlias directive.
-     </para>
-
-     <para>
-      You will then need to insert a #! line in the PHP files, pointing to the
-      location of your PHP binary:
-
-      <example>
-       <title>PHP and Apache 2.x as CGI</title>
-        <programlisting>
-<![CDATA[
-#!C:/php/php.exe
-<?php
-  phpinfo();
-?>
-]]>
-       </programlisting>
-      </example>
-     </para>
-     &warn.install.cgi;
-    </sect3>
-
-    <sect3 xml:id="install.windows.apache2.legacy.fastcgi">
-     <title>Running PHP under FastCGI</title>
-
-     <para>
-     Running PHP under FastCGI has a number of advantages over running it as a
-     CGI. Setting it up this way is fairly straightforward:
-     </para>
-     <para>
-     Obtain mod_fcgid from 
-     <link xlink:href="&url.apache.fcgid;">&url.apache.fcgid;</link>. Win32
-     binaries are available for download from that site. Install the module
-     according to the instructions that will come with it.
-     </para>
-     <para>
-     Configure your web server as shown below, taking care to adjust any paths
-     to reflect your how you have installed things on your particular system:
-
-     <example>
-     <title>Configure Apache to run PHP as FastCGI</title>
-     <programlisting>
-<![CDATA[
-LoadModule fcgid_module modules/mod_fcgid.so  
-
-# Where is your php.ini file?
-FcgidInitialEnv PHPRC        "c:/php" 
-
-AddHandler fcgid-script .php  
-FcgidWrapper "c:/php/php-cgi.exe" .php  
-]]>
-     </programlisting>
-     </example>
-
-     Files with a .php extension will now be executed by the PHP FastCGI
-     wrapper.
-     </para>
-
-    </sect3>
-
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/commandline.xml b/install/windows/legacy/commandline.xml
deleted file mode 100644
index 7d6a295437..0000000000
--- a/install/windows/legacy/commandline.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.commandline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Command Line PHP on Microsoft Windows</title>
-    <para>
-     This section contains notes and hints specific to getting PHP running
-     from the command line for Windows.
-    </para>
-    <note>
-     <para>
-      You should read the <link linkend="install.windows.legacy.manual">manual
-      installation steps</link> first!
-     </para>
-    </note>
-    <para>
-     Getting PHP to run from the command line can be performed without making
-     any changes to Windows.
-     <screen>
-<![CDATA[
-C:\PHP5\php.exe -f "C:\PHP Scripts\script.php" -- -arg1 -arg2 -arg3
-]]>     
-     </screen>
-    </para>
-
-    <para>
-     But there are some easy steps that can be followed to make this simpler.
-     Some of these steps should already have been taken, but are repeated here
-     to be able to provide a complete step-by-step sequence.
-      
-     
-     <itemizedlist>
-      
-      <note>
-       <para>
-        Both <envar>PATH</envar> and <envar>PATHEXT</envar> are important pre-existing system variables in Windows, and care should be taken to not overwrite either variable, only to add to them.
-       </para>
-      </note>
-
-      <listitem>
-       <para>
-        Append the location of the PHP executable (<filename>php.exe</filename>,
-        <filename>php-win.exe</filename> or <filename>php-cli.exe</filename>
-        depending upon your PHP version and display preferences) to the
-        <envar>PATH</envar> environment variable. Read more about how to
-        add your PHP directory to <envar>PATH</envar> in the <link
-        linkend="faq.installation.addtopath">corresponding FAQ entry</link>.
-       </para>
-      </listitem>
-
-      <listitem>
-       <para>
-        Append the <literal>.PHP</literal> extension to the
-        <varname>PATHEXT</varname> environment variable. This can be done
-        at the same time as amending the <envar>PATH</envar> environment
-        variable. Follow the same steps as described in the <link
-        linkend="faq.installation.addtopath">FAQ</link> but amend the
-        <varname>PATHEXT</varname> environment variable rather than the
-        <envar>PATH</envar> environment variable.
-        <note>
-         <para>
-          The position in which you place the <literal>.PHP</literal> will
-          determine which script or program is executed when there are matching
-          filenames. For example, placing <literal>.PHP</literal> before
-          <literal>.BAT</literal> will cause your script to run, rather than
-          the batch file, if there is a batch file with the same name.
-         </para>
-        </note>
-       </para>
-      </listitem>
-
-      <listitem>
-       <para>
-        Associate the <literal>.PHP</literal> extension with a file type. This
-        is done by running the following command:
-        <screen>
-<![CDATA[
-assoc .php=phpfile
-]]>     
-        </screen>
-       </para>
-      </listitem>
-
-      <listitem>
-       <para>
-        Associate the <literal>phpfile</literal> file type with the appropriate
-        PHP executable. This is done by running the following command:
-        <screen>
-<![CDATA[
-ftype phpfile="C:\PHP5\php.exe" -f "%1" -- %~2
-]]>     
-        </screen>
-       </para>
-      </listitem>
-
-     </itemizedlist>
-    </para>
-
-    <para>
-     Following these steps will allow PHP scripts to be run from any directory
-     without the need to type the PHP executable or the <literal>.PHP</literal>
-     extension and all parameters will be supplied to the script for processing.
-    </para>
-
-    <para>
-     The example below details some of the registry changes that can be made manually.
-     <example>
-      <title>Registry changes</title>
-      <screen>
-<![CDATA[
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\.php]
-@="phpfile"
-"Content Type"="application/php"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile]
-@="PHP Script"
-"EditFlags"=dword:00000000
-"BrowserFlags"=dword:00000008
-"AlwaysShowExt"=""
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\DefaultIcon]
-@="C:\\PHP5\\php-win.exe,0"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\shell]
-@="Open"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\shell\Open]
-@="&Open"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\phpfile\shell\Open\command]
-@="\"C:\\PHP5\\php.exe\" -f \"%1\" -- %~2"
-]]>
-      </screen>
-     </example>
-    </para>
-
-    <para>
-     With these changes the same command can be written as:
-     <screen>
-<![CDATA[
-"C:\PHP Scripts\script" -arg1 -arg2 -arg3
-]]>
-     </screen>
-     or, if your <literal>"C:\PHP Scripts"</literal> path is in the
-     <envar>PATH</envar> environment variable:
-     <screen>
-<![CDATA[
-script -arg1 -arg2 -arg3
-]]>
-     </screen>
-    </para>
-
-    <note>
-     <para>
-      There is a small problem if you intend to use this technique and use your
-      PHP scripts as a command line filter, like the example below:
-      <screen>
-<![CDATA[
-dir | "C:\PHP Scripts\script" -arg1 -arg2 -arg3
-]]>
-      </screen>
-      or
-      <screen>
-<![CDATA[
-dir | script -arg1 -arg2 -arg3
-]]>
-      </screen>
-      You may find that the script simply hangs and nothing is output.
-      To get this operational, you need to make another registry change.
-      <screen>
-<![CDATA[
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\policies\Explorer]
-"InheritConsoleHandles"=dword:00000001
-]]>
-      </screen>
-      Further information regarding this issue can be found in this <link
-      xlink:href="http://support.microsoft.com/default.aspx?scid=kb;en-us;321788">Microsoft
-      Knowledgebase Article : 321788</link>.
-      As of Windows 10, this setting seems to be reversed, making the default install of
-      Windows 10 support inherited console handles automatically. This <link
-      xlink:href="https://social.msdn.microsoft.com/Forums/en-US/f19d740d-21c8-4dc2-a9ab-d5c0527e932b/nasty-file-association-regression-bug-in-windows-10-console?forum=windowssdk">
-      Microsoft forum post</link> provides the explanation.
-     </para>
-    </note>
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/extensions.xml b/install/windows/legacy/extensions.xml
deleted file mode 100644
index e46f1c9168..0000000000
--- a/install/windows/legacy/extensions.xml
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.extensions" xmlns="http://docbook.org/ns/docbook">
-    <title>Installation of extensions on Windows</title>
-    <para>
-     After installing PHP and a web server on Windows, you will probably want to
-     install some extensions for added functionality. You can choose which
-     extensions you would like to load when PHP starts by modifying your
-     &php.ini;. You can also load a module dynamically in your script using
-     <function>dl</function>.
-    </para>
-    <para>
-     The DLLs for PHP extensions are prefixed with <literal>php_</literal>.
-    </para>
-    <para>
-     Many extensions are <emphasis>built into</emphasis> the Windows version
-     of PHP. This means additional DLL files, and the 
-     <link linkend="ini.extension">extension</link> directive, are  
-     <emphasis>not</emphasis> used to load these extensions. The Windows 
-     <link linkend ="install.windows.legacy.extensions.overview">PHP Extensions</link>
-     table lists extensions that require, or used to require, additional PHP 
-     DLL files. Here's a list of built in extensions (updated PHP 5.0.4):
-     <link linkend="book.bc">BCMath</link>,
-     <link linkend="book.calendar">Calendar</link>,
-     <link linkend="book.com">COM</link>,
-     <link linkend="book.ctype">Ctype</link>,
-     <link linkend="book.dom">DOM</link>,
-     <link linkend="book.ftp">FTP</link>,
-     <link linkend="book.libxml">LibXML</link>,
-     <link linkend="book.iconv">Iconv</link>,
-     <link linkend="book.uodbc">ODBC</link>,
-     <link linkend="book.pcre">PCRE</link>,
-     <link linkend="book.session">Session</link>,
-     <link linkend="book.simplexml">SimpleXML</link>,
-     <link linkend="book.spl">SPL</link>,
-     <link linkend="book.wddx">WDDX</link>,
-     <link linkend="book.xml">XML</link>&listendand;
-     <link linkend="book.zlib">Zlib</link>.
-    </para>
-    <para>
-     The default location PHP searches for extensions is
-     <filename class="directory">C:\php5</filename>. To change this
-     setting to reflect your setup of PHP edit your &php.ini; file:
-     <itemizedlist>
-      <listitem>
-       <para>
-        You will need to change the
-        <link linkend ="ini.extension-dir">extension_dir</link> setting to
-        point to the directory where your extensions lives, or where you have
-        placed your <filename>php_*.dll</filename> files. For example:
-        <informalexample>
-         <programlisting role="ini">
-<![CDATA[
-extension_dir = C:\php\extensions
-]]>
-         </programlisting>
-        </informalexample>
-       </para>
-      </listitem>
-     <listitem>
-      <para>
-       Enable the extension(s) in &php.ini; you want to use by uncommenting the
-       <literal>extension=php_*.dll</literal> lines in &php.ini;. This is done
-       by deleting the leading ; from the extension you want to load. 
-       <example>
-        <title>Enable <link linkend="book.bzip2">Bzip2</link> extension for PHP-Windows</title>
-         <programlisting role="ini">
-<![CDATA[
-// change the following line from ...
-;extension=php_bz2.dll
-
-// ... to
-extension=php_bz2.dll
-]]>
-         </programlisting>
-        </example>      
-       </para>
-     </listitem>
-      <listitem>
-       <para>
-        Some of the extensions need extra DLLs to work. Couple of them can be
-        found in the distribution package, in the main folder, but some, for example Oracle
-        (<filename>php_oci8.dll</filename>) require DLLs which are not bundled
-        with the distribution package. Don't forget to include <filename
-         class="directory">C:\php</filename> in the system
-        <envar>PATH</envar> (this process is explained in a separate <link
-         linkend="faq.installation.addtopath">FAQ entry</link>).
-       </para>
-     </listitem>
-     <listitem>
-      <para>
-       Some of these DLLs are not bundled with the PHP distribution. See each
-       extensions documentation page for details. Also, read the manual 
-       section titled <link linkend="install.pecl">Installation of PECL 
-       extensions</link> for details on <acronym>PECL</acronym>. An 
-       increasingly large number of PHP extensions are found in 
-       <acronym>PECL</acronym>, and these extensions require a
-       <link linkend="install.pecl.downloads">separate download</link>.
-      </para>
-     </listitem>
-    </itemizedlist>
-   <note>
-    <simpara>
-     If you are running a server module version of PHP
-     remember to restart your web server to reflect your changes to &php.ini;.
-    </simpara>
-   </note>
-   </para>
-
-   <para>
-    The following table describes some of the extensions available and required
-    additional dlls.   
-    <table xml:id="install.windows.legacy.extensions.overview">
-     <title>PHP Extensions</title>
-     <tgroup cols="3">
-      <thead>
-       <row>
-        <entry>Extension</entry>
-        <entry>Description</entry>
-        <entry>Notes</entry>
-       </row>
-      </thead>
-      <tbody>
-  <row>
-   <entry>php_bz2.dll</entry>
-   <entry><link linkend="book.bzip2">bzip2</link> compression functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_calendar.dll</entry>
-   <entry><link linkend="book.calendar">Calendar</link> conversion functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_ctype.dll</entry>
-   <entry><link linkend="book.ctype">ctype</link> family functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_curl.dll</entry>
-   <entry><link linkend="book.curl">CURL</link>, Client URL library functions</entry>
-   <entry>Requires: <filename>libeay32.dll</filename>, 
-   <filename>ssleay32.dll</filename> (bundled), or, as of OpenSSL 1.1
-   <filename>libcrypto-*.dll</filename> and <filename>libssl-*.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_dba.dll</entry>
-   <entry><link linkend="book.dba">DBA</link>: DataBase (dbm-style) 
-   Abstraction layer functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_dbase.dll</entry>
-   <entry><link linkend="book.dbase">dBase</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_exif.dll</entry>
-   <entry><link linkend="book.exif">EXIF</link> functions</entry>
-   <entry>
-    <link linkend="book.mbstring">php_mbstring.dll</link>. And, 
-    <filename>php_exif.dll</filename> must be loaded <literal>after</literal> 
-    <filename>php_mbstring.dll</filename> in &php.ini;.
-   </entry>
-  </row>
-  <row>
-   <entry>php_fbsql.dll</entry>
-   <entry><link linkend="book.fbsql">FrontBase</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_fdf.dll</entry>
-   <entry><link linkend="book.fdf">FDF</link>: Forms Data Format functions.</entry>
-   <entry>Requires: <filename>fdftk.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_filepro.dll</entry>
-   <entry><link linkend="book.filepro">filePro</link> functions</entry>
-   <entry>Read-only access</entry>
-  </row>
-  <row>
-   <entry>php_ftp.dll</entry>
-   <entry><link linkend="book.ftp">FTP</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_gd2.dll</entry>
-   <entry><link linkend="book.image">GD</link> library image functions</entry>
-   <entry>GD2</entry>
-  </row>
-  <row>
-   <entry>php_gettext.dll</entry>
-   <entry><link linkend="book.gettext">Gettext</link> functions</entry>
-   <entry>
-    PHP &lt;= 4.2.0 requires <filename>gnu_gettext.dll</filename> (bundled), 
-    PHP &gt;= 4.2.3 requires <filename>libintl-1.dll</filename>,
-    <filename>iconv.dll</filename> (bundled).
-   </entry>
-  </row>
-  <row>
-   <entry>php_hyperwave.dll</entry>
-   <entry>HyperWave functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_iconv.dll</entry>
-   <entry><link linkend="book.iconv">ICONV</link> characterset conversion</entry>
-   <entry>
-    Requires: <filename>iconv-1.3.dll</filename> (bundled), <filename>iconv.dll</filename>
-   </entry>
-  </row>
-  <row>
-   <entry>php_iisfunc.dll</entry>
-   <entry>IIS management functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_imap.dll</entry>
-   <entry><link linkend="book.imap">IMAP</link> POP3 and NNTP functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_ingres.dll</entry>
-   <entry><link linkend="book.ingres">Ingres</link> functions</entry>
-   <entry>Requires: Ingres libraries</entry>
-  </row>
-  <row>
-   <entry>php_interbase.dll</entry>
-   <entry><link linkend="book.ibase">InterBase</link> functions</entry>
-   <entry>Requires: <filename>gds32.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_ldap.dll</entry>
-   <entry><link linkend="book.ldap">LDAP</link> functions</entry>
-   <entry>
-    Requires <filename>libeay32.dll</filename>, 
-    <filename>ssleay32.dll</filename> (bundled), or, as of OpenSSL 1.1
-    <filename>libcrypto-*.dll</filename> and <filename>libssl-*.dll</filename> (bundled)
-   </entry>
-  </row>
-  <row>
-   <entry>php_mbstring.dll</entry>
-   <entry><link linkend="book.mbstring">Multi-Byte String</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_mcrypt.dll</entry>
-   <entry><link linkend="book.mcrypt">Mcrypt Encryption</link> functions</entry>
-   <entry>Requires: <filename>libmcrypt.dll</filename></entry>
-  </row>
-  <row>
-   <entry>php_mhash.dll</entry>
-   <entry><link linkend="book.mhash">Mhash</link> functions</entry>
-   <entry>Requires: <filename>libmhash.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_mysql.dll</entry>
-   <entry><link linkend="book.mysql">MySQL</link> functions</entry>
-   <entry>Requires <filename>libmysql.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_mysqli.dll</entry>
-   <entry><link linkend="book.mysqli">MySQLi</link> functions</entry>
-   <entry>Requires <filename>libmysql.dll</filename>
-    (<filename>libmysqli.dll</filename> in PHP &lt;= 5.0.2) (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_oci8.dll</entry>
-   <entry><link linkend="book.oci8">Oracle 8</link> functions</entry>
-   <entry>Requires: Oracle 8.1+ client libraries</entry>
-  </row>
-  <row>
-   <entry>php_openssl.dll</entry>
-   <entry><link linkend="book.openssl">OpenSSL</link> functions</entry>
-   <entry>Requires: <filename>libeay32.dll</filename> (bundled),
-   or, as of OpenSSL 1.1, <filename>liblibcrypto-*.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_pgsql.dll</entry>
-   <entry><link linkend="book.pgsql">PostgreSQL</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_shmop.dll</entry>
-   <entry><link linkend="book.shmop">Shared Memory</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_snmp.dll</entry>
-   <entry><link linkend="book.snmp">SNMP</link> get and walk functions</entry>
-   <entry>NT only!</entry>
-  </row>
-  <row>
-   <entry>php_soap.dll</entry>
-   <entry><link linkend="book.soap">SOAP</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_sockets.dll</entry>
-   <entry><link linkend="book.sockets">Socket</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_tidy.dll</entry>
-   <entry><link linkend="book.tidy">Tidy</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_tokenizer.dll</entry>
-   <entry><link linkend="book.tokenizer">Tokenizer</link> functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_w32api.dll</entry>
-   <entry>W32api functions</entry>
-   <entry>None</entry>
-  </row>
-  <row>
-   <entry>php_xmlrpc.dll</entry>
-   <entry><link linkend="book.xmlrpc">XML-RPC</link> functions</entry>
-   <entry>Requires: <filename>iconv.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_xslt.dll</entry>
-   <entry>XSLT functions</entry>
-   <entry>
-    Requires <filename>sablot.dll</filename>, <filename>expat.dll</filename>,
-    <filename>iconv.dll</filename> (bundled).
-   </entry>
-  </row>
-  <row>
-   <entry>php_yaz.dll</entry>
-   <entry><link linkend="book.yaz">YAZ</link> functions</entry>
-   <entry>Requires: <filename>yaz.dll</filename> (bundled)</entry>
-  </row>
-  <row>
-   <entry>php_zip.dll</entry>
-   <entry><link linkend="book.zip">Zip File</link> functions</entry>
-   <entry>Read only access</entry>
-  </row>
-  <row>
-   <entry>php_zlib.dll</entry>
-   <entry><link linkend="book.zlib">ZLib</link> compression functions</entry>
-   <entry>None</entry>
-  </row>
-       </tbody>
-      </tgroup>
-     </table>
-    </para>
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/iis.xml b/install/windows/legacy/iis.xml
deleted file mode 100644
index 2ce4c7943a..0000000000
--- a/install/windows/legacy/iis.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<sect2 xml:id="install.windows.legacy.iis" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Microsoft IIS</title>
- <para>
-  This section contains PHP installation instructions specific to Microsoft Internet Information Services (IIS).
- </para>
- <itemizedlist>
-  <listitem>
-   <simpara>
-    <link linkend="install.windows.legacy.iis6">Manually installing PHP on Microsoft IIS 5.1 and IIS 6.0</link>
-   </simpara>
-  </listitem>
-  <listitem>
-   <simpara>
-    <link linkend="install.windows.legacy.iis7">Manually installing PHP on Microsoft IIS 7.0 and later</link>
-   </simpara>
-  </listitem>
- </itemizedlist>
-</sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/iis6.xml b/install/windows/legacy/iis6.xml
deleted file mode 100644
index 83b49b4c96..0000000000
--- a/install/windows/legacy/iis6.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<sect2 xml:id="install.windows.legacy.iis6" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Microsoft IIS 5.1 and IIS 6.0</title>
- <para>
-  This section contains instructions for manually setting up Internet Information 
-  Services (IIS) 5.1 and IIS 6.0 to work with PHP on Microsoft Windows XP and Windows 
-  Server 2003. For instructions on setting up IIS 7.0 and later versions on Windows 
-  Vista, Windows Server 2008, Windows 7 and Windows Server 2008 R2 refer to 
-  <link linkend="install.windows.legacy.iis7">Microsoft IIS 7.0 and later</link>.
- </para>
- <sect3 xml:id="install.windows.legacy.iis6.fastcgi">
-  <title>Configuring IIS to process PHP requests</title>
-  <para>
-   Download and install PHP in accordance to the instructions described in 
-    <link linkend="install.windows.legacy.manual">manual installation steps</link>
-    <note>
-     <para>
-      Non-thread-safe build of PHP is recommended when using IIS. The non-thread-safe 
-      builds are available at <link xlink:href="&url.php.win.downloads;">PHP for Windows: 
-      Binaries and Sources Releases.</link>
-     </para>
-    </note>
-  </para>
-  <para>
-   Configure the CGI- and FastCGI-specific settings in <filename>php.ini</filename> file as shown below:
-   <example>
-    <title>CGI and FastCGI settings in <filename>php.ini</filename></title>
-    <programlisting role="ini">
-<![CDATA[
-fastcgi.impersonate = 1
-fastcgi.logging = 0
-cgi.fix_pathinfo=1
-cgi.force_redirect = 0
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Download and install the <link xlink:href="&url.iis.fastcgi.downloads;">Microsoft FastCGI Extension for IIS 5.1 and 6.0</link>. 
-   The extension is available for 32-bit and 64-bit platforms - select the right download package for your platform.
-  </para>
-  <para>Configure the FastCGI extension to handle PHP-specific requests by running the command shown below. 
-   Replace the value of the &quot;-path&quot; parameter with the absolute file path to the 
-   <filename>php-cgi.exe</filename> file.
-   <example>
-    <title>Configuring FastCGI extension to handle PHP requests</title>
-    <programlisting>
-<![CDATA[
-cscript %windir%\system32\inetsrv\fcgiconfig.js -add -section:"PHP" ^
--extension:php -path:"C:\PHP\php-cgi.exe"
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   This command will create an IIS script mapping for *.php file extension, which will result in all URLs 
-   that end with .php being handled by FastCGI extension. Also, it will configure FastCGI extension to 
-   use the executable <filename>php-cgi.exe</filename> to process the PHP requests.
-   <note>
-     <para>
-      At this point the required installation and configuration steps are completed. The remaining 
-      instructions below are optional but highly recommended for achieving optimal functionality 
-      and performance of PHP on IIS.
-     </para>
-   </note>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis6.impersonation">
-  <title>Impersonation and file system access</title>
-  <para>
-   It is recommended to enable FastCGI impersonation in PHP when using IIS. This 
-   is controlled by the <varname>fastcgi.impersonate</varname> directive in <filename>php.ini</filename> file. When 
-   impersonation is enabled, PHP will perform all the file system operations on 
-   behalf of the user account that has been determined by IIS authentication. This 
-   ensures that even if the same PHP process is shared across different IIS web 
-   sites, the PHP scripts in those web sites will not be able to access each 
-   others&#39; files as long as different user accounts are used for IIS authentication 
-   on each web site.
-  </para>
-  <para>
-   For example IIS 5.1 and IIS 6.0, in its default configuration, has anonymous authentication enabled 
-   with built-in user account IUSR_&lt;MACHINE_NAME&gt; used as a default identity. This means that in 
-   order for IIS to execute PHP scripts, it is necessary to grant IUSR_&lt;MACHINE_NAME&gt; account 
-   read permission on those scripts. If PHP applications need to perform write operations on certain 
-   files or write files into some folders then IUSR_&lt;MACHINE_NAME&gt; account should have write permission to those.
-  </para>
-  <para>
-   To determine which user account is used by IIS anonymous authentication, follow these steps:
-   <procedure>
-    <step>
-     <simpara>In the Windows Start Menu choose &quot;Run:&quot;, type &quot;inetmgr&quot; and click &quot;Ok&quot;;</simpara>
-    </step>
-    <step>
-     <simpara>Expand the list of web sites under the &quot;Web Sites&quot; node in the tree view, right-click on a web 
-      site that is being used and select &quot;Properties&quot;;
-     </simpara>    
-    </step>
-    <step>
-     <simpara>Click the &quot;Directory Security&quot; tab;</simpara>    
-    </step>
-    <step>
-     <simpara>Take note of a &quot;User name:&quot; field in the &quot;Authentication Methods&quot; dialog</simpara>
-    </step>
-   </procedure>
-   <mediaobject>
-    <alt>Anonymous authenication for IIS 5.1 and IIS 6.0</alt>
-    <imageobject>
-     <imagedata fileref="en/install/windows/figures/iis6anonauth.png" width="654" depth="461" />
-    </imageobject>
-   </mediaobject>
-  </para>
-  <para>
-   To modify the permissions settings on files and folders, use the Windows Explorer user interface 
-   or <varname>icacls</varname> command.
-   <example>
-    <title>Configuring file access permissions</title>
-    <programlisting>
-<![CDATA[
-icacls C:\inetpub\wwwroot\upload /grant IUSR:(OI)(CI)(M)
-]]>     
-    </programlisting>
-   </example>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis6.defaultdoc">
-  <title>Set <filename>index.php</filename> as a default document in IIS</title>
-  <para>
-   The IIS default documents are used for HTTP requests that do not specify a document name. With PHP applications, 
-   <filename>index.php</filename> usually acts as a default document. To add <filename>index.php</filename> to the list of 
-   IIS default documents, follow these steps:
-   <procedure>
-    <step>
-     <simpara>In the Windows Start Menu choose &quot;Run:&quot;, type &quot;inetmgr&quot; and click &quot;Ok&quot;;</simpara>
-    </step>
-    <step>
-     <simpara>Right-click on the &quot;Web Sites&quot; node in the tree view and select &quot;Properties&quot;;</simpara>
-    </step>
-    <step>
-     <simpara>Click the &quot;Documents&quot; tab;</simpara>
-    </step>
-    <step>
-     <simpara>Click the &quot;Add...&quot; button and enter &quot;index.php&quot; for the &quot;Default content page:&quot;.</simpara>
-    </step>
-   </procedure>
-   <mediaobject>
-    <alt>Setting index.php as default document for IIS</alt>
-    <imageobject>
-     <imagedata fileref="en/install/windows/figures/iis6defaultdoc.png" width="659" depth="465" />
-    </imageobject>
-   </mediaobject>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis6.recycling">
-  <title>FastCGI and PHP Recycling configuration</title>
-  <para>
-   Configure IIS FastCGI extension settings for recycling of PHP processes by using the commands shown below. 
-   The FastCGI setting <varname>instanceMaxRequests</varname> controls how many requests will be processed by a single 
-   <filename>php-cgi.exe</filename> process before FastCGI extension shuts it down. The PHP environment variable 
-   <varname>PHP_FCGI_MAX_REQUESTS</varname> controls how many requests a single <filename>php-cgi.exe</filename> process 
-   will handle before it recycles itself. Make sure that the value specified for FastCGI <varname>InstanceMaxRequests</varname>
-   setting is less than or equal to the value specified for <varname>PHP_FCGI_MAX_REQUESTS</varname>.
-   <example>
-    <title>Configuring FastCGI and PHP recycling</title>
-    <programlisting>
-<![CDATA[
-cscript %windir%\system32\inetsrv\fcgiconfig.js -set -section:"PHP" ^
--InstanceMaxRequests:10000
-
-cscript %windir%\system32\inetsrv\fcgiconfig.js -set -section:"PHP" ^
--EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000
-]]>     
-    </programlisting>
-   </example>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis6.timeouts">
-  <title>Configuring FastCGI timeout settings</title>
-  <para>
-   Increase the timeout settings for FastCGI extension if there are applications that have long running PHP scripts. 
-   The two settings that control timeouts are <varname>ActivityTimeout</varname> and <varname>RequestTimeout</varname>. 
-   Refer to <link xlink:href="&url.iis.fastcgi.settings;">Configuring FastCGI Extension for IIS 6.0</link> for more 
-   information about those settings.
-   <example>
-    <title>Configuring FastCGI timeout settings</title>
-    <programlisting>
-<![CDATA[
-cscript %windir%\system32\inetsrv\fcgiconfig.js -set -section:"PHP" ^
--ActivityTimeout:90
-
-cscript %windir%\system32\inetsrv\fcgiconfig.js -set -section:"PHP" ^
--RequestTimeout:90
-]]>     
-    </programlisting>
-   </example>
-   </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis6.phpinilocation">
-  <title>Changing the Location of <filename>php.ini</filename> file</title>
-  <para>
-   PHP searches for <filename>php.ini</filename> file in 
-   <link linkend="configuration.file">several locations</link> and it is 
-   possible to change the default locations of <filename>php.ini</filename> 
-   file by using <varname>PHPRC</varname> environment variable. To instruct PHP 
-   to load the configuration file from a custom location run the command shown below. 
-   The absolute path to the directory with <filename>php.ini</filename> file should be 
-   specified as a value of <varname>PHPRC</varname> environment variable.
-   <example>
-    <title>Changing the location of <filename>php.ini</filename> file</title>
-    <programlisting>
-<![CDATA[
-cscript %windir%\system32\inetsrv\fcgiconfig.js -set -section:"PHP" ^
--EnvironmentVars:PHPRC:"C:\Some\Directory\"
-]]>         
-    </programlisting>
-   </example>
-  </para>
- </sect3>
-</sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/iis7.xml b/install/windows/legacy/iis7.xml
deleted file mode 100644
index 410133e607..0000000000
--- a/install/windows/legacy/iis7.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<sect2 xml:id="install.windows.legacy.iis7" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Microsoft IIS 7.0 and later</title>
- <para>
-  This section contains instructions for manually setting up Internet Information 
-  Services (IIS) 7.0 and later to work with PHP on Microsoft Windows Vista SP1, 
-  Windows 7, Windows Server 2008 and Windows Server 2008 R2. For instructions 
-  on setting up IIS 5.1 and IIS 6.0 on Windows XP and Windows Server 2003 refer to 
-  <link linkend="install.windows.legacy.iis6">Microsoft IIS 5.1 and IIS 6.0</link>.
- </para>
- <sect3 xml:id="install.windows.legacy.iis7.fastcgi.enable">
-  <title>Enabling FastCGI support in IIS</title>
-  <para>
-   FastCGI module is disabled in default installation of IIS. The steps to enable it differ 
-   based on the version of Windows being used.
-  </para>
-  <para>
-   To enable FastCGI support on Windows Vista SP1 and Windows 7:
-   <procedure>
-    <step>
-     <simpara>
-      In the Windows Start Menu choose &quot;Run:&quot;, type &quot;optionalfeatures.exe&quot; 
-      and click &quot;Ok&quot;;
-     </simpara>
-    </step>
-    <step>
-     <simpara>
-      In the &quot;Windows Features&quot; dialog expand &quot;Internet Information 
-      Services&quot;, &quot;World Wide Web Services&quot;, &quot;Application Development 
-      Features&quot; and then enable the &quot;CGI&quot; checkbox;
-     </simpara>
-    </step>
-    <step>
-     <simpara>
-      Click OK and wait until the installation is complete.
-     </simpara>
-    </step>
-   </procedure>
-   <mediaobject>
-    <alt>Enabling FastCGI support for IIS7 on Windows Vista SP1 and Windows 7</alt>
-    <imageobject>
-     <imagedata fileref="en/install/windows/figures/iis7vistacgi.png" />
-    </imageobject>
-   </mediaobject>
-  </para>
-  <para>
-   To enable FastCGI support on Windows Server 2008 and Windows Server 2008 R2:
-   <procedure>
-    <step>
-     <simpara>
-      In the Windows Start Menu choose &quot;Run:&quot;, type &quot;CompMgmtLauncher&quot; 
-      and click &quot;Ok&quot;;
-     </simpara>
-    </step>
-    <step>
-     <simpara>
-      If the &quot;Web Server (IIS)&quot; role is not present under the &quot;Roles&quot; 
-      node, then add it by clicking &quot;Add Roles&quot;;
-     </simpara>
-    </step>
-    <step>
-     <simpara>
-      If the &quot;Web Server (IIS)&quot; role is present, then click &quot;Add Role Services&quot; 
-      and then enable the &quot;CGI&quot; checkbox under &quot;Application Development&quot; group;
-     </simpara>
-    </step>
-    <step>
-     <simpara>
-      Click &quot;Next&quot; and then &quot;Install&quot; and wait for the installation to complete.
-     </simpara>
-    </step>
-   </procedure>
-   <mediaobject>
-    <alt>Enabling FastCGI support on Windows Server 2008 and Windows Server 2008 R2</alt>
-    <imageobject>
-     <imagedata fileref="en/install/windows/figures/iis7w2k8cgi.png" />
-    </imageobject>
-   </mediaobject>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis7.fastcgi.conf">
-  <title>Configuring IIS to process PHP requests</title>
-  <para>
-   Download and install PHP in accordance to the instructions described in 
-    <link linkend="install.windows.legacy.manual">manual installation steps</link>
-    <note>
-     <para>
-      Non-thread-safe build of PHP is recommended when using IIS. The non-thread-safe 
-      builds are available at <link xlink:href="&url.php.win.downloads;">PHP for Windows: 
-      Binaries and Sources Releases.</link>
-     </para>
-    </note>
-  </para>
-  <para>
-   Configure the CGI- and FastCGI-specific settings in <filename>php.ini</filename> file as shown below:
-   <example>
-    <title>CGI and FastCGI settings in <filename>php.ini</filename></title>
-    <programlisting role="ini">
-<![CDATA[
-fastcgi.impersonate = 1
-fastcgi.logging = 0
-cgi.fix_pathinfo=1
-cgi.force_redirect = 0
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Configure IIS handler mapping for PHP by using either IIS Manager user interface or a command line tool.
-  </para>
-  <sect4 xml:id="install.windows.legacy.iis7.fastcgi.conf.ui">
-   <title>Using IIS Manager user interface to create a handler mapping for PHP</title>
-    <para>
-     Follow these steps to create an IIS handler mapping for PHP in IIS Manager user interface:
-     <procedure>
-      <step>
-       <simpara>In the Windows Start Menu choose &quot;Run:&quot;, type &quot;inetmgr&quot; and click &quot;Ok&quot;;</simpara>
-      </step>
-      <step>
-       <simpara>In the IIS Manager user interface select the server node in the &quot;Connections&quot; tree view;</simpara>
-      </step>
-      <step>
-       <para>
-        In the &quot;Features View&quot; page open the &quot;Handler Mappings&quot; feature;
-        <mediaobject>
-         <alt>Create IIS handler mapping for PHP : Locate Handler Mappings</alt>
-         <imageobject>
-          <imagedata fileref="en/install/windows/figures/iis7handlericon.png" />
-         </imageobject>
-        </mediaobject>
-       </para>
-      </step>
-      <step>
-       <simpara>In the &quot;Actions&quot; pane click &quot;Add Module Mapping...&quot;;</simpara>
-      </step>
-      <step>
-       <para>
-        In the &quot;Add Module Mapping&quot; dialog enter the following:
-        <itemizedlist spacing="compact">
-         <listitem>
-          <simpara>Request path: *.php</simpara>
-         </listitem>
-         <listitem>
-          <simpara>Module: FastCgiModule</simpara>
-         </listitem>
-         <listitem>
-          <simpara>Executable: C:\[Path to PHP installation]\php-cgi.exe</simpara>
-         </listitem>
-         <listitem>
-          <simpara>Name: PHP_via_FastCGI</simpara>
-         </listitem>
-        </itemizedlist>
-       </para>
-      </step>
-      <step>
-       <simpara>
-        Click &quot;Request Restrictions&quot; button and then configure the mapping to invoke handler 
-        only if request is mapped to a file or a folder;
-        </simpara>
-      </step>
-      <step>
-       <simpara>Click OK on all the dialogs to save the configuration.</simpara>
-      </step>
-     </procedure>
-     <mediaobject>
-      <alt>Create IIS handler mapping for PHP : Add Handler Mapping</alt>
-      <imageobject>
-       <imagedata fileref="en/install/windows/figures/iis7handlermap.png" />
-      </imageobject>
-     </mediaobject>
-    </para>
-  </sect4>
-  <sect4 xml:id="install.windows.legacy.iis7.fastcgi.conf.cmd">
-   <title>Using command line tool to create a handler mapping for PHP</title>
-   <para>
-    Use the command shown below to create an IIS FastCGI process pool which will use <filename>php-cgi.exe</filename> 
-    executable for processing PHP requests. Replace the value of the <varname>fullPath</varname> parameter with the 
-    absolute file path to the <filename>php-cgi.exe</filename> file.
-    <example>
-     <title>Creating IIS FastCGI process pool</title>
-     <programlisting>
-<![CDATA[
-%windir%\system32\inetsrv\appcmd set config /section:system.webServer/fastCGI ^
-/+[fullPath='c:\PHP\php-cgi.exe']
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <para>
-    Configure IIS to handle PHP specific requests by running the command shown below. Replace the value of the 
-    <varname>scriptProcessor</varname> parameter with the absolute file path to the <filename>php-cgi.exe</filename> file.
-    <example>
-     <title>Creating handler mapping for PHP requests</title>
-     <programlisting>
-<![CDATA[
-%windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers ^
-/+[name='PHP_via_FastCGI', path='*.php',verb='*',modules='FastCgiModule',^
-scriptProcessor='c:\PHP\php-cgi.exe',resourceType='Either']
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <para>
-    This command creates an IIS handler mapping for *.php file extension, which will result in all URLs that 
-    end with .php being handled by FastCGI module.
-    <note>
-     <para>
-      At this point the required installation and configuration steps are completed. The remaining 
-      instructions below are optional but highly recommended for achieving optimal functionality 
-      and performance of PHP on IIS.
-     </para>
-    </note>
-   </para>
-  </sect4>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis7.impersonation">
-  <title>Impersonation and file system access</title>
-  <para>
-   It is recommended to enable FastCGI impersonation in PHP when using IIS. This 
-   is controlled by the <varname>fastcgi.impersonate</varname> directive in <filename>php.ini</filename> 
-   file. When impersonation is enabled, PHP will perform all the file system operations on behalf of 
-   the user account that has been determined by IIS authentication. This ensures that even if the 
-   same PHP process is shared across different IIS web sites, the PHP scripts in those web sites 
-   will not be able to access each other&#39;s files as long as different user accounts are used 
-   for IIS authentication on each web site.
-  </para>
-  <para>
-   For example IIS 7, in its default configuration, has anonymous authentication enabled with 
-   built-in user account IUSR used as a default identity. This means that in order for IIS to 
-   execute PHP scripts, it is necessary to grant IUSR account read permission on those scripts. 
-   If PHP applications need to perform write operations on certain files or write files into some 
-   folders then IUSR account should have write permission to those.
-  </para>
-  <para>
-   To determine what user account is used as an anonymous identity in IIS 7 use the following command. 
-   Replace the &quot;Default Web Site&quot; with the name of IIS web site that you use. In the output 
-   XML configuration element look for the <varname>userName</varname> attribute.
-   <example>
-    <title>Determining the account used as IIS anonymous identity</title>
-    <programlisting>
-<![CDATA[
-%windir%\system32\inetsrv\appcmd.exe list config "Default Web Site" ^
-/section:anonymousAuthentication
-
-<system.webServer>
-  <security>
-    <authentication>
-      <anonymousAuthentication enabled="true" userName="IUSR" />
-    </authentication>
-   </security>
-</system.webServer>
-]]>
-    </programlisting>
-   </example>
-   <note>
-    <para>
-     If <varname>userName</varname> attribute is not present in the <varname>anonymousAuthentication</varname> element, 
-     or is set to an empty string, then it means that the application pool identity is used as an 
-     anonymous identity for that web site.
-    </para>
-   </note>
-  </para>
-  <para>
-   To modify the permissions settings on files and folders, use the Windows Explorer 
-   user interface or <varname>icacls</varname> command.
-   <example>
-    <title>Configuring file access permissions</title>
-    <programlisting>
-<![CDATA[
-icacls C:\inetpub\wwwroot\upload /grant IUSR:(OI)(CI)(M)
-]]>
-    </programlisting>
-   </example>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis7.defaultdoc">
-  <title>Set <filename>index.php</filename> as a default document in IIS</title>
-  <para>
-   The IIS default documents are used for HTTP requests that do not specify a 
-   document name. With PHP applications, <filename>index.php</filename> usually 
-   acts as a default document. To add <filename>index.php</filename> to the list 
-   of IIS default documents, use this command:
-   <example>
-    <title>Set <filename>index.php</filename> as a default document in IIS</title>
-    <programlisting>
-<![CDATA[
-%windir%\system32\inetsrv\appcmd.exe set config ^
--section:system.webServer/defaultDocument /+"files.[value='index.php']" ^
-/commit:apphost
-]]>
-    </programlisting>
-   </example>   
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis7.recycling">
-  <title>FastCGI and PHP Recycling configuration</title>
-  <para>
-   Configure IIS FastCGI settings for recycling of PHP processes by using the commands shown below. 
-   The FastCGI setting <varname>instanceMaxRequests</varname> controls how many requests will be 
-   processed by a single <filename>php-cgi.exe</filename> process before IIS shuts it down. 
-   The PHP environment variable <varname>PHP_FCGI_MAX_REQUESTS</varname> controls how many 
-   requests a single <filename>php-cgi.exe</filename> process will handle before it recycles 
-   itself. Make sure that the value specified for FastCGI <varname>InstanceMaxRequests</varname> 
-   setting is less than or equal to the value specified for <varname>PHP_FCGI_MAX_REQUESTS</varname>.
-   <example>
-    <title>Configuring FastCGI and PHP recycling</title>
-    <programlisting>
-<![CDATA[
-%windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi ^
-/[fullPath='c:\php\php-cgi.exe'].instanceMaxRequests:10000
-
-%windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi ^
-/+"[fullPath='C:\{php_folder}\php-cgi.exe'].environmentVariables.^
-[name='PHP_FCGI_MAX_REQUESTS',value='10000']"
-]]>
-    </programlisting>
-   </example>
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis7.timeouts">
-  <title>FastCGI timeout settings</title>
-  <para>
-   Increase the timeout settings for FastCGI if it is expected to have long running PHP scripts.
-   The two settings that control timeouts are <varname>activityTimeout</varname> and 
-   <varname>requestTimeout</varname>. Use the commands below to change the timeout settings. 
-   Make sure to replace the value in the <varname>fullPath</varname> parameter to 
-   contain the absolute path to the <filename>php-cgi.exe</filename> file.
-   <example>
-    <title>Configuring FastCGI timeout settings</title>
-    <programlisting>
-<![CDATA[
-%windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi ^
-/[fullPath='C:\php\php-cgi.exe',arguments=''].activityTimeout:"90"  /commit:apphost
-
-%windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi ^
-/[fullPath='C:\php\php-cgi.exe',arguments=''].requestTimeout:"90"  /commit:apphost
-]]>
-    </programlisting>
-   </example>   
-  </para>
- </sect3>
- <sect3 xml:id="install.windows.legacy.iis7.phpinilocation">
-  <title>Changing the Location of <filename>php.ini</filename> file</title>
-  <para>
-   PHP searches for <filename>php.ini</filename> file in 
-   <link linkend="configuration.file">several locations</link> and it is 
-   possible to change the default locations of <filename>php.ini</filename> 
-   file by using <varname>PHPRC</varname> environment variable. To instruct PHP 
-   to load the configuration file from a custom location run the command shown below. 
-   The absolute path to the directory with <filename>php.ini</filename> file should be 
-   specified as a value of <varname>PHPRC</varname> environment variable.
-   <example>
-    <title>Changing the location of <filename>php.ini</filename> file</title>
-    <programlisting>
-<![CDATA[
-appcmd.exe set config  -section:system.webServer/fastCgi ^
-/+"[fullPath='C:\php\php.exe',arguments=''].environmentVariables.^
-[name='PHPRC',value='C:\Some\Directory\']" /commit:apphost
-]]>         
-    </programlisting>
-   </example>   
-  </para>
- </sect3>
-</sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/index.xml b/install/windows/legacy/index.xml
deleted file mode 100644
index 29fb77336d..0000000000
--- a/install/windows/legacy/index.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-  <sect1 xml:id="install.windows.legacy.index" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Installation on old Windows systems</title>
-   <para>
-    This section applies to Windows 98/Me and Windows NT/2000/XP/2003. PHP 
-    will not work on 16 bit platforms such as Windows 3.1 and sometimes 
-    we refer to the supported Windows platforms as Win32.
-   </para>
-   <note>
-    <para>
-     Windows XP/2003 are no longer supported as of PHP 5.5.0.
-    </para>
-   </note>
-   <note>
-    <para>
-     Windows 98/Me/NT4/2000 are no longer supported as of PHP 5.3.0.
-    </para>
-   </note>
-   <note>
-    <para>
-     Windows 95 is no longer supported as of PHP 4.3.0.
-    </para>
-   </note>
-   <para>
-    If you have a development environment such as Microsoft Visual Studio, you can also 
-    <!--<link linkend="install.windows.legacy.building">build</link>-->
-    build PHP from the original source code.
-   </para>
-   <para>
-    Once you have PHP installed on your Windows system, you may also
-    want to <link linkend="install.windows.legacy.extensions">load various extensions</link>
-    for added functionality.
-   </para>
-   
-   &install.windows.legacy.manual;
-   &install.windows.legacy.iis;
-   &install.windows.legacy.iis6;
-   &install.windows.legacy.iis7;   
-   &install.windows.legacy.apache1;
-   &install.windows.legacy.apache2;
-   &install.windows.legacy.sambar;
-   &install.windows.legacy.xitami;
-   &install.windows.legacy.building;
-   &install.windows.legacy.extensions;
-   &install.windows.legacy.commandline;
-  </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/manual.xml b/install/windows/legacy/manual.xml
deleted file mode 100644
index a29b936cea..0000000000
--- a/install/windows/legacy/manual.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.manual" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Manual Installation Steps</title>
-    <para>
-     This section contains instructions for manually installing and configuring 
-     PHP on Microsoft Windows. 
-    </para>
-    <sect3 xml:id="install.windows.legacy.manual.download">
-     <title>Selecting and downloading the PHP distribution package</title>
-     <para>
-      Download the PHP zip binary distribution from 
-      <link xlink:href="&url.php.win.downloads;">PHP for Windows: Binaries and Sources</link>. 
-      There are several different versions of the zip package - to choose the right version for you,
-      follow the detailed guide on the <link xlink:href="&url.php.win.downloads;">download page</link>.
-     </para>
-    </sect3>
-    <sect3 xml:id="install.windows.legacy.manual.package">
-     <title>The PHP package structure and content</title>
-     <para>
-      Unpack the content of the zip archive into a directory of your choice, for 
-      example C:\PHP\. The directory and file structure extracted from the zip will 
-      look as below:
-      <example>
-       <title>PHP 5 package structure</title>
-        <programlisting>
-<![CDATA[
-
-c:\php
-   |
-   +--dev
-   |  |
-   |  |-php5ts.lib                 -- php5.lib in non thread safe version
-   |
-   +--ext                          -- extension DLLs for PHP
-   |  |
-   |  |-php_bz2.dll
-   |  |
-   |  |-php_cpdf.dll
-   |  |
-   |  |-...
-   |
-   +--extras                       -- empty 
-   |
-   +--pear                         -- initial copy of PEAR
-   |
-   |
-   |-go-pear.bat                   -- PEAR setup script
-   |
-   |-...
-   |
-   |-php-cgi.exe                   -- CGI executable
-   |
-   |-php-win.exe                   -- executes scripts without an opened command prompt
-   |
-   |-php.exe                       -- Command line PHP executable (CLI)
-   |
-   |-...
-   |
-   |-php.ini-development           -- default php.ini settings
-   |
-   |-php.ini-production            -- recommended php.ini settings
-   |
-   |-php5apache2_2.dll             -- does not exist in non thread safe version
-   |
-   |-php5apache2_2_filter.dll      -- does not exist in non thread safe version
-   |
-   |-...
-   |
-   |-php5ts.dll                    -- core PHP DLL ( php5.dll in non thread safe version)
-   | 
-   |-...
-
-]]>
-       </programlisting>
-      </example>
-     </para>
-     <para>
-      Below is the list of the modules and executables included in the PHP zip 
-      distribution:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <para>
-         <filename>go-pear.bat</filename> - the PEAR setup script. Refer to <link xlink:href="&url.pear.installation;">Installation (PEAR)</link> 
-         for more details.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <filename>php-cgi.exe</filename> - CGI executable that can be used when running PHP on IIS via CGI or FastCGI.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <filename>php-win.exe</filename> - the PHP executable for executing PHP scripts without using a command line window 
-         (for example PHP applications that use Windows GUI).
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <filename>php.exe</filename> - the PHP executable for executing PHP scripts within a command line interface (CLI).
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <filename>php5apache2_2.dll</filename> - Apache 2.2.X module.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <filename>php5apache2_2_filter.dll</filename> - Apache 2.2.X filter.
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </sect3>
-    <sect3 xml:id="install.windows.legacy.manual.phpini">
-     <title>Changing the <filename>php.ini</filename> file</title>
-     <para>
-     After the php package content has been extracted, copy the <filename>php.ini-production</filename> into <filename>php.ini</filename>
-     in the same folder. If necessary, it is also possible to place the <filename>php.ini</filename> into any other location of your choice 
-     but that will require additional configuration steps as described in <link linkend="configuration.file">PHP Configuration</link>.
-     </para>
-     <para>
-      The <filename>php.ini</filename> file tells PHP how to configure itself, and how to work with the 
-      environment that it runs in. Here are a number of settings for the <filename>php.ini</filename> file 
-      that help PHP work better with Windows. Some of these are optional. There are 
-      many other directives that may be relevant to your environment - refer to the 
-      <link linkend="ini.list">list of php.ini directives</link> for more information.
-     </para>
-     <para>
-      Required directives:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <para>
-         <varname>extension_dir</varname> = <literal>&lt;path to extension directory&gt;</literal> - The <varname>extension_dir</varname> needs 
-         to point to the directory where PHP extensions files are stored. The path can be absolute 
-         (i.e. &quot;C:\PHP\ext&quot;) or relative (i.e. &quot;.\ext&quot;). Extensions that are listed lower in the <filename>php.ini</filename> file need 
-         to be located in the <varname>extension_dir</varname>.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>extension</varname> = <literal>xxxxx.dll</literal> - For each extension you wish to enable, you need a corresponding &quot;extension=&quot; 
-         directive that tells PHP which extensions in the <varname>extension_dir</varname> to load at startup time.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>log_errors</varname> = <literal>On</literal> - PHP has an error logging facility that can be used to send errors to a file, 
-         or to a service (i.e. syslog) and works in conjunction with the <varname>error_log</varname> directive below. When running under IIS, 
-         the <varname>log_errors</varname> should be enabled, with a valid <varname>error_log</varname>.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>error_log</varname> = <literal>&lt;path to the error log file&gt;</literal> - The error_log needs to specify the absolute, 
-         or relative path to the file where PHP errors should be logged. This file needs to be writable for the web server. 
-         The most common places for this file are in various TEMP directories, for example &quot;C:\inetpub\temp\php-errors.log&quot;.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>cgi.force_redirect</varname> = <literal>0</literal> - This directive is required for running under IIS. 
-         It is a directory security facility required by many other web servers. However, enabling it under IIS will 
-         cause the PHP engine to fail on Windows. 
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>cgi.fix_pathinfo</varname> = <literal>1</literal> - This lets PHP access real path info following the CGI Spec. 
-         The IIS FastCGI implementation needs this set.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>fastcgi.impersonate</varname> = <literal>1</literal> - FastCGI under IIS supports the ability to impersonate 
-         security tokens of the calling client. This allows IIS to define the security context that the request runs under.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>fastcgi.logging</varname> = <literal>0</literal> - FastCGI logging should be disabled on IIS. If it is left enabled, 
-         then any messages of any class are treated by FastCGI as error conditions which will cause IIS to generate an HTTP 500 exception.
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-     <para>
-      Optional directives
-      <itemizedlist spacing="compact">
-       <listitem>
-        <para>
-         <varname>max_execution_time</varname> = <literal>##</literal> - This directive tells PHP the maximum amount of time that it can spend 
-         executing any given script. The default for this is 30 seconds. Increase the value of this directive if PHP application take long time to execute.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>memory_limit</varname> = <literal>###M</literal> - The amount of memory available for the PHP process, in Megabytes. 
-         The default is 128, which is fine for most PHP applications. Some of the more complex ones might need more.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>display_errors</varname> = <literal>Off</literal> - This directive tells PHP whether to include any error messages in the 
-         stream that it returns to the Web server. If this is set to &quot;On&quot;, then PHP will send whichever classes of errors 
-         that you define with the <varname>error_reporting</varname> directive back to web server as part of the error stream. 
-         For security reasons it is recommended to set it to &quot;Off&quot; on production servers in order not to reveal any 
-         security sensitive information that is often included in the error messages.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <varname>open_basedir</varname> = <literal>&lt;paths to directories, separated by semicolon&gt;</literal>, e.g. 
-         openbasedir=&quot;C:\inetpub\wwwroot;C:\inetpub\temp&quot;. This directive specified the directory paths where PHP 
-         is allowed to perform file system operations. Any file operation outside of the specified paths will result in an error. 
-         This directive is especially useful for locking down the PHP installation in shared hosting environments to prevent 
-         PHP scripts from accessing any files outside of the web site's root directory.
-        </para>
-       </listitem>
-       <listitem>
-         <para>
-          <varname>upload_max_filesize</varname> = <literal>###M</literal> and <varname>post_max_size</varname> = <literal>###M</literal> - 
-          The maximum allowed size of an uploaded file and post data respectively. The values of these directives should be 
-          increased if PHP applications need to perform large uploads, such as for example photos or video files.
-         </para>
-        </listitem>
-      </itemizedlist>
-     </para>
-    <para>
-     PHP is now setup on your system.  The next step is to choose a web
-     server, and enable it to run PHP.  Choose a web server from the table of 
-     contents.
-    </para>
-    <para>
-     In addition to running PHP via a web server, PHP can run from the command
-     line just like a <literal>.BAT</literal> script. See
-     <!--<link linkend="install.windows.legacy.commandline">Command Line PHP on Microsoft
-     Windows</link> for further details.-->
-    </para>
-    </sect3>
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/sambar.xml b/install/windows/legacy/sambar.xml
deleted file mode 100644
index cc4325d98e..0000000000
--- a/install/windows/legacy/sambar.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.sambar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Sambar Server on Microsoft Windows</title>
-    <para>
-     This section contains notes and hints specific to the
-     <link xlink:href="&url.sambar;">Sambar Server</link> for Windows.
-    </para>
-    <note>
-     <para>
-      You should read the <link linkend="install.windows.legacy.manual">manual
-       installation steps</link> first!
-     </para>
-    </note>
-    <simpara>
-     This list describes how to set up the ISAPI module to
-     work with the Sambar server on Windows.
-    </simpara>
-
-    <para>
-     <itemizedlist>
-      <listitem>
-       <para>
-        Find the file called <filename>mappings.ini</filename> (in the config
-        directory) in the Sambar install directory.
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Open <filename>mappings.ini</filename> and add the following line
-        under <literal>[ISAPI]</literal>:
-      <example>
-       <title>ISAPI configuration of Sambar</title>
-       <programlisting>
-<![CDATA[
-#for PHP 4
-*.php = c:\php\php4isapi.dll
-
-#for PHP 5
-*.php = c:\php\php5isapi.dll
-]]>
-       </programlisting>
-      </example>
-        (This line assumes that PHP was installed in
-        <filename>c:\php</filename>.)
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Now restart the Sambar server for the changes to take effect.
-       </para>
-      </listitem>
-     </itemizedlist>
-    </para>
-
-    <note>
-     <para>
-      If you intend to use PHP to communicate with resources which are held on
-      a different computer on your network, then you will need to alter the
-      account used by the Sambar Server Service. The default account used for
-      the Sambar Server Service is LocalSystem which will not have access to
-      remote resources. The account can be amended by using the Services
-      option from within the Windows Control Panel Administration Tools.
-     </para>
-    </note>
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/legacy/xitami.xml b/install/windows/legacy/xitami.xml
deleted file mode 100644
index de4683529c..0000000000
--- a/install/windows/legacy/xitami.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-   <sect2 xml:id="install.windows.legacy.xitami" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Xitami on Microsoft Windows</title>
-    <para>
-     This section contains notes and hints specific to
-     <link xlink:href="&url.xitami;">Xitami</link> on Windows.
-    </para>
-    <note>
-     <para>
-      You should read the <link linkend="install.windows.legacy.manual">manual
-       installation steps</link> first!
-     </para>
-    </note>
-    <simpara>
-     This list describes how to set up the PHP CGI binary
-     to work with Xitami on Windows.
-    </simpara>
-    
-    <note>
-     <title>Important for CGI users</title>
-     <para>
-      Read the <link linkend="faq.installation.forceredirect">faq
-      on cgi.force_redirect</link> for important details.  This
-      directive needs to be set to <literal>0</literal>.
-      If you want to use <literal>$_SERVER['PHP_SELF']</literal> you have to
-      enable the <link linkend="ini.cgi.fix-pathinfo">cgi.fix_pathinfo</link>
-      directive.
-     </para>
-    </note>
-    &warn.install.cgi;
-    <para>
-     <itemizedlist>
-      <listitem>
-       <para>
-        Make sure the web server is running, and point
-        your browser to xitamis admin console
-        (usually <literal>http://127.0.0.1/admin</literal>),
-        and click on Configuration.
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Navigate to the Filters, and put the
-        extension which PHP should parse (i.e. .php)
-        into the field File extensions (.xxx).
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        In Filter command or script put the path and name
-        of your PHP CGI executable i.e. <filename>C:\php\php.exe</filename>
-        for PHP 4, or <filename>C:\php\php-cgi.exe</filename> for PHP 5.
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Press the 'Save' icon.
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Restart the server to reflect changes.
-       </para>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </sect2>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/install/windows/manual.xml b/install/windows/manual.xml
index 9c3174a4bc..d50d9545b1 100644
--- a/install/windows/manual.xml
+++ b/install/windows/manual.xml
@@ -42,8 +42,6 @@ REM Configure FastCGI Variables
 ]]>
      </programlisting>
     </example>
-
-    See also the <link linkend="install.windows.legacy.iis7">old IIS installation instructions</link>.
    </para>
   </sect3>
 
@@ -54,7 +52,6 @@ REM Configure FastCGI Variables
     The Apache builds of ApacheLounge are recommended, but other options include XAMPP, WampServer and BitNami, which provide automatic installer tools.
     PHP can be used on Apache through mod_php or mod_fastcgi.
     mod_php requires a TS build of Apache built with same version of Visual C and same CPU (x86 or x64).
-    See also the <link linkend="install.windows.legacy.apache2">old Apache installation instructions</link>.
    </para>
   </sect3>
  </sect2>
@@ -75,10 +72,10 @@ REM Configure FastCGI Variables
      <para>Non-Thread-Safe(NTS) - for IIS and other FastCGI web servers (Apache with mod_fastcgi) and recommended for command-line scripts</para>
     </listitem>
     <listitem>
-     <para>x86 - production use of PHP 5.5 and up.</para>
+     <para>x86 - for 32-bits systems.</para>
     </listitem>
     <listitem>
-     <para>x64 - production use of PHP 7 (unless its a 32-bit only version of Windows). PHP 5.5 and 5.6 x64 builds are experimental.</para>
+     <para>x64 - for 64-bits systems.</para>
     </listitem>
    </itemizedlist>
   </para>
@@ -103,4 +100,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/install/windows/recommended.xml b/install/windows/recommended.xml
index 0413b6ec57..600f0e501b 100644
--- a/install/windows/recommended.xml
+++ b/install/windows/recommended.xml
@@ -1,87 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <sect1 xml:id="install.windows.recommended" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-<title>Recommended Configuration on Windows systems</title>
-    
-<sect2>
+ <title>Recommended Configuration on Windows systems</title>
+ <sect2>
   <title>OpCache</title>
-    
-<para>
-Highly Recommended that you enable OpCache. This extension is included with PHP for Windows. It compiles and optimizes PHP scripts and caches them in memory so that they aren't compiled every time the page is loaded.
-</para>
-<para>
-In your php.ini, set 
-<example>
-      <title>Recommended OpCache configuration</title>
-      <screen>
+  <para>
+   It is highly recommended to enable OpCache.
+   This extension is included with PHP for Windows.
+   It compiles and optimizes PHP scripts and caches them in memory so that
+   they aren't compiled every time the page is loaded.
+  </para>
+  <para>
+   Set the &php.ini; to:
+   <example>
+    <title>Recommended OpCache configuration</title>
+    <screen>
 <![CDATA[
-zend_extension=php_opcache.dll
 opcache.enable=On
 opcache.enable_cli=On
 ]]>
-      </screen>
-    </example>
-    
-And restart your web server.
+    </screen>
+   </example>
+   And restart the web server.
 
-For more info, see: <link linkend="opcache.configuration">OpCache Configuration</link>
-</para>
-
-</sect2>
-<sect2>
+   For more info, see: <link linkend="opcache.configuration">OpCache Configuration</link>
+  </para>
+ </sect2>
+ <sect2>
   <title>WinCache</title>
+  <para>
+   It is recommended to use WinCache if using IIS, especially if in a shared
+   web hosting environment or using networked file storage (NAS).
+   Note that WinCache is no longer supported as of PHP 8.0.0.
 
-<para>
-Recommended that you use WinCache if using IIS, especially if in a shared web hosting environment or using networked file storage (NAS).
+   All PHP Applications automatically benefit from WinCache's file cache feature. File system operations are cached in memory.
 
-All PHP Applications automatically benefit from WinCache's file cache feature. File system operations are cached in memory.
+   WinCache also can cache user objects in memory and share them between <varname>php.exe</varname> or <varname>php-cgi.exe</varname> processes (share objects between requests).
 
-WinCache also can cache user objects in memory and share them between <varname>php.exe</varname> or <varname>php-cgi.exe</varname> processes (share objects between requests).
+   Many major web applications have a plugin or extension or configuration option to make use of the WinCache user object cache.
 
-Many major web applications have a plugin or extension or configuration option to make use of the WinCache user object cache.
+   If you need high performance, you should use the object cache in your applications.
 
-If you need high performance, you should use the object cache in your applications.
+   See: <link xlink:href="http://pecl.php.net/package/WinCache">http://pecl.php.net/package/WinCache</link> to download a WinCache DLL (or tgz) to your PHP extensions directory (extensions_dir in your php.ini).
 
-See: <link xlink:href="http://pecl.php.net/package/WinCache">http://pecl.php.net/package/WinCache</link> to download a WinCache DLL (or tgz) to your PHP extensions directory (extensions_dir in your php.ini).
-
-In your php.ini, set 
-<example>
-      <title>Recommended WinCache configuration</title>
-      <screen>
+   Set the &php.ini; to:
+   <example>
+    <title>Recommended WinCache configuration</title>
+    <screen>
 <![CDATA[
-
 extension=php_wincache.dll
 wincache.fcenabled=1
 wincache.ocenabled=1 ; removed as of wincache 2.0.0.0
-
 ]]>
-      </screen>
-    </example>
+    </screen>
+   </example>
+   For more info, see:
+   <link linkend="wincache.configuration">WinCache Configuration</link>
+  </para>
+ </sect2>
 
-For more info, see: <link xlink:href="http://php.net/manual/en/wincache.configuration.php">http://php.net/manual/en/wincache.configuration.php</link>
-</para>
-
-</sect2>
-  <sect2>
-    <title>IIS Configuration</title>
-
-    <para>In IIS Manager, Install FastCGI module and add a handler mapping for <varname>`.php`</varname> to the path to <varname>PHP-CGI.exe</varname> (not <varname>PHP.exe</varname>)</para>
+ <sect2>
+  <title>IIS Configuration</title>
 
   <para>
-
-  You may use the APPCMD command line tool to script IIS configuration.
+   In IIS Manager, Install FastCGI module and add a handler mapping for
+   <varname>`.php`</varname> to the path to <varname>PHP-CGI.exe</varname>
+   (not <varname>PHP.exe</varname>)
   </para>
-</sect2>
 
-<sect2>
+  <para>
+   You may use the APPCMD command line tool to script IIS configuration.
+  </para>
+ </sect2>
+
+ <sect2>
   <title>Database</title>
+  <para>
+   You'll probably need a Database Server.
+   Popular databases provide PHP extensions to use them.
+   If your web site doesn't get a lot of traffic,
+   you can run your database server on the same server as your web server.
+   Many popular database servers run on Windows.
+  </para>
 
-    <para>You'll probably need a Database Server. Popular databases provide PHP extensions to use them. If your web site doesn't get a lot of traffic, you can run your database server on the same server as your web server. Many popular database servers run on Windows.</para>
-
-    <para>PHP includes mysqli and pdo_mysql extensions. PHP 5.5 and 5.6 include mysql extension (deprecated in 7.0).</para>
-
-    <para>See <link xlink:href="https://dev.mysql.com/downloads/windows/">https://dev.mysql.com/downloads/windows/</link></para>
-    </sect2>
+  <para>PHP includes mysqli and pdo_mysql extensions.</para>
+  <para>
+   See <link xlink:href="https://dev.mysql.com/downloads/windows/">https://dev.mysql.com/downloads/windows/</link>
+  </para>
+ </sect2>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -102,4 +108,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/install/windows/tools.xml b/install/windows/tools.xml
index 7a8b18431d..f69e13ab27 100644
--- a/install/windows/tools.xml
+++ b/install/windows/tools.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <sect1 xml:id="install.windows.tools" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-<title>PHP Installer Tools on Windows</title>
-
-<sect2>
+ <title>PHP Installer Tools on Windows</title>
+ <sect2>
   <title>PHP Install Tools</title>
-<para>
- If you want to setup PHP and are using IIS, the easiest way is to use <link xlink:href="https://www.microsoft.com/web/downloads/platform.aspx">Microsoft's Web Platform Installer (WebPI)</link>.
-</para>
+  <para>
+   If you want to setup PHP and are using IIS,
+   the easiest way is to use <link xlink:href="https://www.microsoft.com/web/downloads/platform.aspx">Microsoft's Web Platform Installer (WebPI)</link>.
+  </para>
 
- <para><link xlink:href="https://www.apachefriends.org/index.html">XAMPP</link>, WampServer and BitNami will setup PHP applications for use with Apache on Windows.</para>
- 
- <para>Setting up and configuring Nginx on Windows requires a bit more configuration. See the <link xlink:href="https://www.nginx.com/resources/wiki/start/topics/examples/phpfastcgionwindows/">Nginx documentation</link> for additional setup help.</para>
-</sect2>
+  <para>
+   <link xlink:href="https://www.apachefriends.org/index.html">XAMPP</link>,
+   WampServer and BitNami will setup PHP applications for use with Apache on Windows.
+  </para>
 
+  <para>
+   Setting up and configuring Nginx on Windows requires a bit more configuration.
+   See the <link xlink:href="https://www.nginx.com/resources/wiki/start/topics/examples/phpfastcgionwindows/">Nginx documentation</link>
+   for additional setup help.
+  </para>
+ </sect2>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -35,4 +39,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/install/windows/troubleshooting.xml b/install/windows/troubleshooting.xml
index 60c7a00218..07285d3904 100644
--- a/install/windows/troubleshooting.xml
+++ b/install/windows/troubleshooting.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <sect1 xml:id="install.windows.troubleshooting" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-<title>Troubleshooting PHP on Windows</title>
-
-<sect2>
+ <title>Troubleshooting PHP on Windows</title>
+ <sect2>
   <title>Check Temp Directory Permissions</title>
 
   <procedure>
-    <step>
-      <para>Right-click temp directory in File Explorer to get the permissions.
-      </para>
-    </step>
-    <step>
-      <para>For IIS, check that user IIS_User has MODIFY permission. You can get the temporary directory from the configuration or php info.
-      </para>
-    </step>
+   <step>
+    <para>
+     Right-click temp directory in File Explorer to get the permissions.
+    </para>
+   </step>
+   <step>
+    <para>
+     For IIS, check that user IIS_User has MODIFY permission.
+     You can get the temporary directory from the configuration or php info.
+    </para>
+   </step>
   </procedure>
-  
-</sect2>
-
+ </sect2>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -40,4 +38,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/language-snippets.ent b/language-snippets.ent
index 360b095ca7..2eb0afcad3 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -370,12 +370,6 @@ to several possible vulnerabilities. Please read our
 <link linkend="security.cgi-bin">CGI security section</link> to learn how to
 defend yourself from such attacks.</para></warning>'>
 
-<!ENTITY note.magicquotes.gpc '<note xmlns="http://docbook.org/ns/docbook"><title>directive note: magic_quotes_gpc
-</title><para>The <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>
-directive defaults to <literal>on</literal>. It essentially runs
-<function>addslashes</function> on all GET, POST, and COOKIE data.
-<function>stripslashes</function> may be used to remove them.</para></note>'>
-
 <!ENTITY warn.passwordhashing '
 <warning xmlns="http://docbook.org/ns/docbook">
  <para>
@@ -521,6 +515,8 @@ currently not documented; only its argument list is available.
 
 <!ENTITY example.outputs.71 '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 7.1:</para>'>
 
+<!ENTITY example.outputs.72 '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 7.2:</para>'>
+
 <!ENTITY example.outputs.73 '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 7.3:</para>'>
 
 <!ENTITY example.outputs.8 '<para xmlns="http://docbook.org/ns/docbook">Output of the above example in PHP 8:</para>'>
@@ -707,7 +703,7 @@ PHP is compiled with freetype support (<option role="configure">--with-freetype-
 <!ENTITY note.gd.interpolation '<note xmlns="http://docbook.org/ns/docbook"><para>This function is affected by the interpolation method set by <function>imagesetinterpolation</function>.</para></note>'>
 
 <!ENTITY gd.image.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
-image</parameter></term><listitem><para>An image resource, returned by one of the image creation functions,
+image</parameter></term><listitem><para>A <classname>GdImage</classname> object, returned by one of the image creation functions,
 such as <function>imagecreatetruecolor</function>.</para></listitem></varlistentry>'>
 
 <!ENTITY gd.font.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
@@ -716,10 +712,6 @@ fonts in latin2 encoding (where higher numbers corresponding to larger fonts) or
 own font identifiers registered with <function>imageloadfont</function>.
 </para></listitem></varlistentry>'>
 
-<!ENTITY gd.psfont.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
-font_index</parameter></term><listitem><para>A font resource, returned by <function>imagepsloadfont</function>.
-</para></listitem></varlistentry>'>
-
 <!ENTITY gd.ttf.fontfile "
     <varlistentry xmlns='http://docbook.org/ns/docbook'>
      <term><parameter>fontfile</parameter></term>
@@ -766,7 +758,7 @@ $font = 'SomeFont';
     </varlistentry>
 ">
 
-<!ENTITY gd.return.identifier 'Returns an image resource identifier on success, &false; on errors.'>
+<!ENTITY gd.return.identifier 'Returns an image object on success, &false; on errors.'>
 
 <!ENTITY gd.return.trueonerror '<caution xmlns="http://docbook.org/ns/docbook"><simpara>However, if libgd fails to output the image, this function returns &true;.</simpara></caution>'>
 
@@ -852,6 +844,14 @@ and GD2 image formats are proprietary image formats of libgd. They have to be re
 <emphasis>obsolete</emphasis>, and should only be used for development and testing
 purposes.</simpara></warning>'>
 
+<!ENTITY gd.changelog.image-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+  <parameter>image</parameter> expects a <classname>GdImage</classname>
+  instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
 <!-- DBM notes -->
 
 <!ENTITY dbm.dbm-identifier.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
@@ -1013,6 +1013,10 @@ Passing untrusted data to this parameter is <emphasis>insecure</emphasis>, unles
 
 <!-- LDAP notes -->
 
+<!ENTITY ldap.parameter.ldap 'An LDAP resource, returned by <function xmlns="http://docbook.org/ns/docbook">ldap_connect</function>.'>
+
+<!ENTITY ldap.parameter.result 'An LDAP result resource, returned by <function xmlns="http://docbook.org/ns/docbook">ldap_list</function> or <function xmlns="http://docbook.org/ns/docbook">ldap_search</function>.'>
+
 <!ENTITY ldap.warn.control-paged '<warning xmlns="http://docbook.org/ns/docbook">
  <simpara>
   This function has been <emphasis>DEPRECATED</emphasis> as of PHP 7.4.0, and <emphasis>REMOVED</emphasis> as of PHP 8.0.0.
@@ -1141,6 +1145,7 @@ installed via PECL's <link xlink:href='&url.pecl.package.get;timezonedb' xmlns:x
 
 <!ENTITY date.timezone.bc '<simpara xmlns="http://docbook.org/ns/docbook">Please do not use any of the timezones
 listed here (besides UTC), they only exist for backward compatible reasons, and may expose erroneous behavior.
+Furthermore, these timezones may be removed from the IANA timezone database at any time.
 </simpara>'>
 
 <!ENTITY date.timezone.posix-signs '<simpara xmlns="http://docbook.org/ns/docbook">
@@ -1348,7 +1353,7 @@ To use the Easy Connect naming method, PHP must be linked with Oracle
 <emphasis>[//]host_name[:port][/service_name]</emphasis>. From Oracle
 11<emphasis>g</emphasis>, the syntax is:
 <emphasis>[//]host_name[:port][/service_name][:server_type][/instance_name]</emphasis>.
-Futher options were introduced with Oracle 19c, including timeout and keep-alive
+Further options were introduced with Oracle 19c, including timeout and keep-alive
 settings.  Refer to Oracle documentation.  Service names can be found by running
 the Oracle utility <literal>lsnrctl status</literal> on the database server
 machine.
@@ -1587,7 +1592,7 @@ this extension is still available within <acronym xmlns="http://docbook.org/ns/d
 
 <!ENTITY pecl.windows.download 'A <acronym xmlns="http://docbook.org/ns/docbook">DLL</acronym> for this
 <acronym xmlns="http://docbook.org/ns/docbook">PECL</acronym> extension is currently unavailable. See also the
-<link xmlns="http://docbook.org/ns/docbook" linkend="install.windows.legacy.building">building on Windows</link>
+<link xmlns="http://docbook.org/ns/docbook" linkend="install.windows.building">building on Windows</link>
 section.'>
 
 <!ENTITY pecl.windows.download.avail 'Windows binaries (<acronym xmlns="http://docbook.org/ns/docbook">DLL</acronym> files) 
@@ -1655,15 +1660,15 @@ returned by <function>fbsql_query</function> or
 
 <!-- MySQLi Notes -->
 <!ENTITY mysqli.result.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
-result</parameter></term><listitem><para>Procedural style only: A result set
-identifier returned by <function>mysqli_query</function>, <function>mysqli_store_result</function>
-or <function>mysqli_use_result</function>.</para></listitem></varlistentry>'>
+result</parameter></term><listitem><para>Procedural style only: A <classname>mysqli_result</classname>
+object returned by <function>mysqli_query</function>, <function>mysqli_store_result</function>,
+<function>mysqli_use_result</function> or <function>mysqli_stmt_get_result</function>.</para></listitem></varlistentry>'>
 <!ENTITY mysqli.link.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
-link</parameter></term><listitem><para>Procedural style only: A link identifier
+mysql</parameter></term><listitem><para>Procedural style only: A <classname>mysqli</classname> object
 returned by <function>mysqli_connect</function> or <function>mysqli_init</function>
 </para></listitem></varlistentry>'>
 <!ENTITY mysqli.stmt.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
-stmt</parameter></term><listitem><para>Procedural style only: A statement identifier
+statement</parameter></term><listitem><para>Procedural style only: A <classname>mysqli_stmt</classname> object
 returned by <function>mysqli_stmt_init</function>.</para></listitem></varlistentry>'>
 <!ENTITY mysqli.available.mysqlnd 'Available only with <link xmlns="http://docbook.org/ns/docbook"
 linkend="book.mysqlnd">mysqlnd</link>.'>
@@ -1672,6 +1677,13 @@ linkend="book.mysqlnd">mysqlnd</link>.'>
 hand-shake/authentication, which mysqlnd will use.</para><para>Libmysqlclient uses the default charset set in the
 <filename>my.cnf</filename> or by an explicit call to <function>mysqli_options</function> prior to
 calling <function>mysqli_real_connect</function>, but after <function>mysqli_init</function>.</para></note>'>
+<!ENTITY mysqli.sqlinjection.warning '<warning xmlns="http://docbook.org/ns/docbook">
+<title>Security warning: SQL injection</title><para>If the query contains any variable
+input then <link linkend="mysqli.quickstart.prepared-statements">parameterized
+prepared statements</link> should be used instead. Alternatively, the
+data must be properly formatted and all strings must be escaped using 
+the <function>mysqli_real_escape_string</function>
+function.</para></warning>'>
 
 <!-- Notes for SAPI/Apache -->
 <!ENTITY apache.req.module '<simpara xmlns="http://docbook.org/ns/docbook">This function is supported when PHP
@@ -2441,10 +2453,10 @@ used.</para>'>
           <entry><type>array</type></entry>
           <entry>
            <para>
-            A document containing the configuration for one or more KMS providers, which are used to encrypt data keys. Currently <literal>aws</literal> or <literal>local</literal> are supported and at least one must be specified.
+            A document containing the configuration for one or more KMS providers, which are used to encrypt data keys. Currently <literal>"aws"</literal>, <literal>"azure"</literal>, <literal>"gcp"</literal>, and <literal>"local"</literal> are supported and at least one must be specified.
            </para>
            <para>
-            The format for <literal>aws</literal> is as follows:
+            The format for <literal>"aws"</literal> is as follows:
            </para>
            <programlisting role="javascript">
 <![CDATA[
@@ -2455,13 +2467,40 @@ aws: {
 ]]>
            </programlisting>
            <para>
-            The format for <literal>local</literal> is as follows:
+            The format for <literal>"azure"</literal> is as follows:
+           </para>
+           <programlisting role="javascript">
+<![CDATA[
+azure: {
+    tenantId: <string>,
+    clientId: <string>,
+    clientSecret: <string>,
+    identityPlatformEndpoint: <optional string> // Defaults to "login.microsoftonline.com"
+
+}
+]]>
+           </programlisting>
+           <para>
+            The format for <literal>"gcp"</literal> is as follows:
+           </para>
+           <programlisting role="javascript">
+<![CDATA[
+aws: {
+    email: <string>,
+    privateKey: <base64 string>|<MongoDB\BSON\Binary>,
+    endpoint: <optional string> // Defaults to "oauth2.googleapis.com"
+
+}
+]]>
+           </programlisting>
+           <para>
+            The format for <literal>"local"</literal> is as follows:
            </para>
            <programlisting role="javascript">
 <![CDATA[
 local: {
-    // The master key used to encrypt/decrypt data keys
-    key: <96-byte MongoDB\BSON\Binary with subtype 0>
+    // 96-byte master key used to encrypt/decrypt data keys
+    key: <base64 string>|<MongoDB\BSON\Binary>
 }
 ]]>
            </programlisting>
@@ -2856,7 +2895,8 @@ local: {
      </listitem>
      <listitem>
       <simpara>
-       For <literal>g</literal> and <literal>G</literal>
+       For <literal>g</literal>, <literal>G</literal>,
+       <literal>h</literal> and <literal>H</literal>
        specifiers: this is the maximum number of significant
        digits to be printed.
       </simpara>
@@ -2926,9 +2966,6 @@ local: {
        <entry><literal>e</literal></entry>
        <entry>
         The argument is treated as scientific notation (e.g. 1.2e+2).
-        The precision specifier stands for the number of digits after the
-        decimal point since PHP 5.2.1. In earlier versions, it was taken as
-        number of significant digits (one less).
        </entry>
       </row>
       <row>
@@ -2950,7 +2987,6 @@ local: {
        <entry>
         The argument is treated as a float and presented
         as a floating-point number (non-locale aware).
-        Available as of PHP 5.0.3.
        </entry>
       </row>
       <row>
@@ -3055,11 +3091,11 @@ local: {
      </thead>
      <tbody>
       <row>
-       <entry><literal>string</literal></entry>
+       <entry><type>string</type></entry>
        <entry><literal>s</literal></entry>
       </row>
       <row>
-       <entry><literal>integer</literal></entry>
+       <entry><type>int</type></entry>
        <entry>
         <literal>d</literal>,
         <literal>u</literal>,
@@ -3071,14 +3107,16 @@ local: {
        </entry>
       </row>
       <row>
-       <entry><literal>double</literal></entry>
+       <entry><type>float</type></entry>
        <entry>
-        <literal>g</literal>,
-        <literal>G</literal>,
         <literal>e</literal>,
         <literal>E</literal>,
         <literal>f</literal>,
-        <literal>F</literal>
+        <literal>F</literal>,
+        <literal>g</literal>,
+        <literal>G</literal>,
+        <literal>h</literal>,
+        <literal>H</literal>
        </entry>
       </row>
      </tbody>
diff --git a/language/attributes.xml b/language/attributes.xml
index ec9aaf9a68..bd699a171d 100644
--- a/language/attributes.xml
+++ b/language/attributes.xml
@@ -68,7 +68,11 @@ class CopyFile implements ActionHandler
     #[SetUp]
     public function targetDirectoryExists()
     {
-        mkdir($this->targetDirectory);
+        if (!file_exists($this->targetDirectory)) {
+            mkdir($this->targetDirectory);
+        } elseif (!is_dir($this->targetDirectory)) {
+            throw new RuntimeException("Target directory $this->targetDirectory is not a directory");
+        }
     }
 
     public function execute()
@@ -189,7 +193,7 @@ class AnotherThing
    <para>
     This separation of reflected attribute representation from actual instance increases control of the programmer
     to handle errors regarding missing attribute classes, mistyped or missing arguments. Only after
-    calling <function>newInstance</function>, objects of the attribute class are instantiated and the correct matching of arguments
+    calling <function>ReflectionAttribute::newInstance</function>, objects of the attribute class are instantiated and the correct matching of arguments
     is validated, not earlier.
    </para>
 
diff --git a/language/constants.xml b/language/constants.xml
index 2db075b422..a87f837b56 100644
--- a/language/constants.xml
+++ b/language/constants.xml
@@ -6,7 +6,7 @@
   <simpara>
    A constant is an identifier (name) for a simple value. As the name
    suggests, that value cannot change during the execution of the
-   script (except for <link linkend="language.constants.predefined">
+   script (except for <link linkend="language.constants.magic">
    magic constants</link>, which aren't actually constants).
    Constants are case-sensitive. By convention, constant
    identifiers are always uppercase.
@@ -76,7 +76,7 @@ define("__FOO__", "something");
    <simpara>
     As of PHP 7.1.0, class constant may declare a visibility of protected
     or private, making them only available in the hierarchical scope of the
-    class in which it is is defined.
+    class in which it is defined.
    </simpara>
   </note>
 
diff --git a/language/context.xml b/language/context.xml
index 91be147467..dca7a61101 100644
--- a/language/context.xml
+++ b/language/context.xml
@@ -20,7 +20,6 @@
  &language.context.ssl;
  &language.context.curl;
  &language.context.phar;
- &language.context.mongodb;
  &language.context.parameters;
  &language.context.zip;
  
diff --git a/language/context/mongodb.xml b/language/context/mongodb.xml
deleted file mode 100644
index 559bf3d4ba..0000000000
--- a/language/context/mongodb.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="context.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
- <refnamediv>
-  <refname>MongoDB context options</refname>
-  <refpurpose>MongoDB context option listing</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   Context options for <literal>mongodb://</literal> transports.
-  </para>
- </refsect1>
-
- <refsect1 role="options"><!-- {{{ -->
-  &reftitle.options;
-  <para>
-   <variablelist>
-    <varlistentry xml:id="context.mongodb.log-cmd-insert">
-     <term>
-      <parameter>log_cmd_insert</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called when inserting a document, see <function>log_cmd_insert</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="context.mongodb.log-cmd-delete">
-     <term>
-      <parameter>log_cmd_delete</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called when deleting a document, see <function>log_cmd_delete</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="context.mongodb.log-cmd-update">
-     <term>
-      <parameter>log_cmd_update</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called when updating a document, see <function>log_cmd_update</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="context.mongodb.log-write-batch">
-     <term>
-      <parameter>log_write_batch</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called when executing a Write Batch, see <function>log_write_batch</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="context.mongodb.log-reply">
-     <term>
-      <parameter>log_reply</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called when reading a reply from MongoDB, see <function>log_reply</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="context.mongodb.log-getmore">
-     <term>
-      <parameter>log_getmore</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called when retrieving more results from a MongoDB cursor, see <function>log_getmore</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="context.mongodb.log-killcursor">
-     <term>
-      <parameter>log_killcursor</parameter>
-      <type>callable</type>
-     </term>
-     <listitem>
-      <para>
-       A callback function called executing a killcursor opcode, see <function>log_killcursor</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1><!-- }}} -->
- 
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>pecl/mongo 1.5.0</entry>
-       <entry>
-        Added Write API Context options
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="context.socket" /></member>
-    <member><xref linkend="context.ssl" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
- 
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/language/control-structures/foreach.xml b/language/control-structures/foreach.xml
index ea1b121fe2..30a1f6f20e 100644
--- a/language/control-structures/foreach.xml
+++ b/language/control-structures/foreach.xml
@@ -30,6 +30,11 @@ foreach (iterable_expression as $key => $value)
   The second form will additionally assign the current element's key to
   the <literal>$key</literal> variable on each iteration.
  </simpara>
+ <simpara>
+  Note that <literal>foreach</literal> does not modify the internal array
+  pointer, which is used by functions such as <function>current</function>
+  and <function>key</function>.
+ </simpara>
  <simpara>
   It is possible to
   <link linkend="language.oop5.iterations">customize object iteration</link>.
diff --git a/language/control-structures/match.xml b/language/control-structures/match.xml
index 06ccc25ce7..3c439f5b56 100644
--- a/language/control-structures/match.xml
+++ b/language/control-structures/match.xml
@@ -60,7 +60,7 @@ $return_value = match (subject_expression) {
    </listitem>
    <listitem>
     <simpara>
-     <literal>Match</literal> arms do not fall-through to later cases the way
+     <literal>match</literal> arms do not fall-through to later cases the way
      <literal>switch</literal> statements do.
     </simpara>
    </listitem>
@@ -87,7 +87,7 @@ $return_value = match (subject_expression) {
 <?php
 $result = match ($x) {
     foo() => ...,
-    $this->bar() => ..., // bar() isn't called if foo() === $x
+    $this->bar() => ..., // $this->bar() isn't called if foo() === $x
     $this->baz => beep(), // beep() isn't called unless $x === $this->baz
     // etc.
 };
diff --git a/language/exceptions.xml b/language/exceptions.xml
index 391205d7e9..2b40756f39 100644
--- a/language/exceptions.xml
+++ b/language/exceptions.xml
@@ -15,7 +15,7 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-class Exception extends Throwable
+class Exception implements Throwable
 {
     protected $message = 'Unknown exception';   // exception message
     private   $string;                          // __toString cache
@@ -25,7 +25,7 @@ class Exception extends Throwable
     private   $trace;                           // backtrace
     private   $previous;                        // previous exception if nested exception
 
-    public function __construct($message = null, $code = 0, Throwable $previous = null);
+    public function __construct($message = '', $code = 0, Throwable $previous = null);
 
     final private function __clone();           // Inhibits cloning of exceptions.
 
diff --git a/language/generators.xml b/language/generators.xml
index 8741e29dd8..470a270461 100644
--- a/language/generators.xml
+++ b/language/generators.xml
@@ -593,6 +593,16 @@ class LineIterator implements Iterator {
    means that the same generator can't be iterated over multiple times: the
    generator will need to be rebuilt by calling the generator function again.
   </para>
+
+  <simplesect role="seealso">
+   &reftitle.seealso;
+   <para>
+    <simplelist>
+     <member><link linkend="language.oop5.iterations">Object Iteration</link></member>
+    </simplelist>
+   </para>
+  </simplesect>
+
  </sect1>
 </chapter>
  
diff --git a/language/oop5/final.xml b/language/oop5/final.xml
index f1b00762f5..e18231a236 100644
--- a/language/oop5/final.xml
+++ b/language/oop5/final.xml
@@ -64,6 +64,9 @@ class ChildClass extends BaseClass {
     Properties and constants cannot be declared final, only classes and methods 
     may be declared as final.
    </simpara>
+   <simpara>
+    As of PHP 8.0.0, private methods may not be declared final except for the constructor.
+   </simpara>
   </note>
  </sect1>
 <!-- Keep this comment at the end of the file
diff --git a/language/oop5/inheritance.xml b/language/oop5/inheritance.xml
index ccc06e0174..7997763bdf 100644
--- a/language/oop5/inheritance.xml
+++ b/language/oop5/inheritance.xml
@@ -18,6 +18,14 @@
    implementation of additional functionality in similar objects without the
    need to reimplement all of the shared functionality.
   </para>
+  <para>
+   Private methods of a parent class are not accessible to a child class. As a result,
+   child classes may reimplement a private method themselves without regard for normal
+   inheritance rules.  Prior to PHP 8.0.0, however, <literal>final</literal> and <literal>static</literal>
+   restrictions were applied to private methods.  As of PHP 8.0.0, the only private method
+   restriction that is enforced is <literal>private final</literal> constructors, as that
+   is a common way to "disable" the constructor when using static factory methods instead.
+  </para>
  <para>
   The <link linkend="language.oop5.visibility">visibility</link>
   of methods, properties and constants can be relaxed, e.g. a
diff --git a/language/oop5/interfaces.xml b/language/oop5/interfaces.xml
index c38e0cab78..8376d7329a 100644
--- a/language/oop5/interfaces.xml
+++ b/language/oop5/interfaces.xml
@@ -5,7 +5,8 @@
   <para>
    Object interfaces allow you to create code which specifies which methods a
    class must implement, without having to define how these methods are
-   implemented.
+   implemented.  Interfaces share a namespace with classes and traits, so they may
+   not use the same name.
   </para>
   <para>
    Interfaces are defined in the same way as a class, but with the <literal>interface</literal>
@@ -16,14 +17,34 @@
    All methods declared in an interface must be public; this is the nature of an
    interface.
   </para>
-
+  <para>
+   In practice, interfaces serve two complementary purposes:
+  </para>
+  <simplelist>
+   <member>
+    To allow developers to create objects of different classes that may be used interchangeably
+    because they implement the same interface or interfaces.  A common example is multiple database access services,
+    multiple payment gateways, or different caching strategies.  Different implementations may
+    be swapped out without requiring any changes to the code that uses them.
+   </member>
+   <member>
+    To allow a function or method to accept and operate on a parameter that conforms to an
+    interface, while not caring what else the object may do or how it is implemented. These interfaces
+    are often named like <literal>Iterable</literal>, <literal>Cacheable</literal>, <literal>Renderable</literal>,
+    or so on to describe the significance of the behavior.
+   </member>
+  </simplelist>
+  <para>
+   Interfaces may define
+   <link linkend="language.oop5.magic">magic methods</link> to require implementing classes to
+   implement those methods.
+  </para>
   <note>
    <para>
-    It is possible to declare
-    <link linkend="language.oop5.magic">magic methods</link> such as the
-    <link linkend="language.oop5.decon.constructor">constructor</link>
-    in an interface, which can be useful in some contexts,
-    e.g. for use by factories.
+    Although they are supported, including <link linkend="language.oop5.decon.constructor">constructors</link>
+    in interfaces is strongly discouraged. Doing so significantly reduces the flexibility of the object implementing the
+    interface.  Additionally, constructors are not enforced by inheritance rules, which can cause inconsistent
+    and unexpected behavior.
    </para>
   </note>
 
@@ -41,6 +62,14 @@
      same name, only if the method declaration in both interfaces is identical.
     </para>
    </warning>
+   <warning>
+    <para>
+     A class that implements an interface may use a different name for its parameters than
+     the interface.  However, as of PHP 8.0 the language supports <link linkend="functions.named-arguments">named arguments</link>, which means
+     callers may rely on the parameter name in the interface.  For that reason, it is strongly
+     recommended that developers use the same parameter names as the interface being implemented.
+    </para>
+   </warning>
    <note>
     <para>
      Interfaces can be extended like classes using the <link linkend="language.oop5.inheritance">extends</link> 
@@ -49,8 +78,8 @@
    </note>
    <note>
     <para>
-     The class implementing the interface must declare a method which has a
-     <link linkend="language.oop.lsp">compatible signature</link>.
+     The class implementing the interface must declare all methods in the interface
+     with a <link linkend="language.oop.lsp">compatible signature</link>.
     </para>
    </note>
   </sect2>
@@ -71,8 +100,8 @@
 <![CDATA[
 <?php
 
-// Declare the interface 'iTemplate'
-interface iTemplate
+// Declare the interface 'Template'
+interface Template
 {
     public function setVariable($name, $var);
     public function getHtml($template);
@@ -80,9 +109,9 @@ interface iTemplate
 
 // Implement the interface
 // This will work
-class Template implements iTemplate
+class WorkingTemplate implements Template
 {
-    private $vars = array();
+    private $vars = [];
   
     public function setVariable($name, $var)
     {
@@ -101,10 +130,10 @@ class Template implements iTemplate
 
 // This will not work
 // Fatal error: Class BadTemplate contains 1 abstract methods
-// and must therefore be declared abstract (iTemplate::getHtml)
-class BadTemplate implements iTemplate
+// and must therefore be declared abstract (Template::getHtml)
+class BadTemplate implements Template
 {
-    private $vars = array();
+    private $vars = [];
   
     public function setVariable($name, $var)
     {
@@ -120,18 +149,18 @@ class BadTemplate implements iTemplate
      <programlisting role="php">
 <![CDATA[
 <?php
-interface a
+interface A
 {
     public function foo();
 }
 
-interface b extends a
+interface B extends A
 {
     public function baz(Baz $baz);
 }
 
 // This will work
-class c implements b
+class C implements B
 {
     public function foo()
     {
@@ -143,7 +172,7 @@ class c implements b
 }
 
 // This will not work and result in a fatal error
-class d implements b
+class D implements B
 {
     public function foo()
     {
@@ -162,22 +191,22 @@ class d implements b
      <programlisting role="php">
 <![CDATA[
 <?php
-interface a
+interface A
 {
     public function foo();
 }
 
-interface b
+interface B
 {
     public function bar();
 }
 
-interface c extends a, b
+interface C extends A, B
 {
     public function baz();
 }
 
-class d implements c
+class D implements C
 {
     public function foo()
     {
@@ -200,20 +229,83 @@ class d implements c
      <programlisting role="php">
 <![CDATA[
 <?php
-interface a
+interface A
 {
-    const b = 'Interface constant';
+    const B = 'Interface constant';
 }
 
 // Prints: Interface constant
-echo a::b;
+echo A::B;
 
 
 // This will however not work because it's not allowed to 
 // override constants.
-class b implements a
+class B implements A
 {
-    const b = 'Class constant';
+    const B = 'Class constant';
+}
+?>
+]]>
+     </programlisting>
+   </example>
+   <example xml:id="language.oop5.interfaces.examples.ex5">
+    <title>Interfaces with abstract classes</title>
+     <programlisting role="php">
+<![CDATA[
+<?php
+interface A
+{
+    public function foo(string $s): string;
+
+    public function bar(int $i): int;
+}
+
+// An abstract class may implement only a portion of an interface.
+// Classes that extend the abstract class must implement the rest.
+abstract class B implements A
+{
+    public function foo(string $s): string
+    {
+        return $s . PHP_EOL;
+    }
+}
+
+class C extends B
+{
+    public function bar(int $i): int
+    {
+        return $i * 2;
+    }
+}
+?>
+]]>
+     </programlisting>
+   </example>
+   <example xml:id="language.oop5.interfaces.examples.ex6">
+    <title>Extending and implementing simultaneously</title>
+     <programlisting role="php">
+<![CDATA[
+<?php
+
+class One
+{
+    /* ... */
+}
+
+interface Usable
+{
+    /* ... */
+}
+
+interface Updatable
+{
+    /* ... */
+}
+
+// The keyword order here is important. 'extends' must come first.
+class Two extends One implements Usable, Updatable
+{
+    /* ... */
 }
 ?>
 ]]>
diff --git a/language/oop5/iterations.xml b/language/oop5/iterations.xml
index ae32600308..7266838fb1 100644
--- a/language/oop5/iterations.xml
+++ b/language/oop5/iterations.xml
@@ -69,187 +69,18 @@ private => private var
   <link linkend="language.oop5.visibility">visible</link> properties that could be
   accessed.
  </para>
- <para>
-  To take it a step further, the <interfacename>Iterator</interfacename>
-  <link linkend="language.oop5.interfaces">interface</link> may be implemented.
-  This allows the object to dictate how it will be iterated and what values will
-  be available on each iteration.
- </para>
-
-  <example>
-   <title>Object Iteration implementing Iterator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyIterator implements Iterator
-{
-    private $var = array();
-
-    public function __construct($array)
-    {
-        if (is_array($array)) {
-            $this->var = $array;
-        }
-    }
-
-    public function rewind()
-    {
-        echo "rewinding\n";
-        reset($this->var);
-    }
-  
-    public function current()
-    {
-        $var = current($this->var);
-        echo "current: $var\n";
-        return $var;
-    }
-  
-    public function key() 
-    {
-        $var = key($this->var);
-        echo "key: $var\n";
-        return $var;
-    }
-  
-    public function next() 
-    {
-        $var = next($this->var);
-        echo "next: $var\n";
-        return $var;
-    }
-  
-    public function valid()
-    {
-        $key = key($this->var);
-        $var = ($key !== NULL && $key !== FALSE);
-        echo "valid: $var\n";
-        return $var;
-    }
-
-}
-
-$values = array(1,2,3);
-$it = new MyIterator($values);
-
-foreach ($it as $a => $b) {
-    print "$a: $b\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen role="php">
-<![CDATA[
-rewinding
-valid: 1
-current: 1
-key: 0
-0: 1
-next: 2
-valid: 1
-current: 2
-key: 1
-1: 2
-next: 3
-valid: 1
-current: 3
-key: 2
-2: 3
-next:
-valid: 
-]]>
-   </screen>
-
-  </example>
 
+ <simplesect role="seealso">
+  &reftitle.seealso;
   <para>
-   The <interfacename>IteratorAggregate</interfacename>
-   <link linkend="language.oop5.interfaces">interface</link>
-   can be used as an alternative to implementing all of the
-   <interfacename>Iterator</interfacename> methods.
-   <interfacename>IteratorAggregate</interfacename> only requires the
-   implementation of a single method,
-   <methodname>IteratorAggregate::getIterator</methodname>, which should return
-   an instance of a class implementing <interfacename>Iterator</interfacename>.
+   <simplelist>
+    <member><link linkend="language.generators">Generators</link></member>
+    <member><interfacename>Iterator</interfacename></member>
+    <member><interfacename>IteratorAggregate</interfacename> </member>
+    <member><link linkend="spl.iterators">SPL Iterators</link></member>
+   </simplelist>
   </para>
-
-  <example>
-   <title>Object Iteration implementing IteratorAggregate</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyCollection implements IteratorAggregate
-{
-    private $items = array();
-    private $count = 0;
-
-    // Required definition of interface IteratorAggregate
-    public function getIterator() {
-        return new MyIterator($this->items);
-    }
-
-    public function add($value) {
-        $this->items[$this->count++] = $value;
-    }
-}
-
-$coll = new MyCollection();
-$coll->add('value 1');
-$coll->add('value 2');
-$coll->add('value 3');
-
-foreach ($coll as $key => $val) {
-    echo "key/value: [$key -> $val]\n\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;  
-   <screen role="php">
-<![CDATA[
-rewinding
-current: value 1
-valid: 1
-current: value 1
-key: 0
-key/value: [0 -> value 1]
-
-next: value 2
-current: value 2
-valid: 1
-current: value 2
-key: 1
-key/value: [1 -> value 2]
-
-next: value 3
-current: value 3
-valid: 1
-current: value 3
-key: 2
-key/value: [2 -> value 3]
-
-next:
-current:
-valid:
-]]>
-   </screen>
-
-  </example>
-
-  <note>
-   <para>
-    For more examples of iterators, see the
-    <link linkend="spl.iterators">SPL Extension</link>.
-   </para>
-  </note> 
-
-  <note>
-   <para>
-    <link linkend="language.generators">Generators</link> provide an
-    alternative way of defining iterators.
-   </para>
-  </note> 
+ </simplesect>
 
  </sect1>
 <!-- Keep this comment at the end of the file
diff --git a/language/oop5/magic.xml b/language/oop5/magic.xml
index cc90e5a54e..72f65d2afd 100644
--- a/language/oop5/magic.xml
+++ b/language/oop5/magic.xml
@@ -267,6 +267,12 @@ class Connection
      <link linkend="language.types.declarations.strict">strict typing</link>
      is disabled.
     </para>
+    <para>
+     As of PHP 8.0.0, any class that contains a <link linkend="object.tostring">__toString()</link>
+     method will also implicitly implement the <interfacename>Stringable</interfacename> interface, and will
+     thus pass type checks for that interface.  Explicitly implementing the interface anyway is
+     recommended.
+    </para>
     <para>
      In PHP 7.4, the returned value <emphasis>must</emphasis> be a
      <type>string</type>, otherwise an <classname>Error</classname> is thrown.
diff --git a/language/oop5/traits.xml b/language/oop5/traits.xml
index 804b35853d..b3cdff7626 100644
--- a/language/oop5/traits.xml
+++ b/language/oop5/traits.xml
@@ -127,7 +127,7 @@ Hello Universe!
   <sect2 xml:id="language.oop5.traits.multiple">
    <title>Multiple Traits</title>
    <para>
-    Multiple Traits can be inserted into a class by listing them in the use
+    Multiple Traits can be inserted into a class by listing them in the <literal>use</literal>
     statement, separated by commas.
    </para>
    <example xml:id="language.oop5.traits.multiple.ex1">
@@ -326,7 +326,7 @@ Hello World!
    <para>
     Traits support the use of abstract methods in order to impose requirements
     upon the exhibiting class. Public, protected, and private methods are supported.
-    Prior to PHP 8.0.0, only protected and private abstract methods were supported.
+    Prior to PHP 8.0.0, only public and protected abstract methods were supported.
    </para>
    <caution>
     <simpara>
@@ -365,7 +365,7 @@ class MyHelloWorld {
   <sect2 xml:id="language.oop5.traits.static">
    <title>Static Trait Members</title>
    <para>
-    Traits can define both static members and static methods.
+    Traits can define static variables, static methods and static properties.
    </para>
    <example xml:id="language.oop5.traits.static.ex1">
     <title>Static Variables</title>
@@ -411,6 +411,24 @@ class Example {
 
 Example::doSomething();
 ?>
+]]>
+    </programlisting>
+   </example>
+   <example xml:id="language.oop5.traits.static.ex3">
+    <title>Static Properties</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+trait StaticExample {
+    public static $static = 'foo';
+}
+
+class Example {
+    use StaticExample;
+}
+
+echo Example::$static;
+?>
 ]]>
     </programlisting>
    </example>
diff --git a/language/oop5/variance.xml b/language/oop5/variance.xml
index 1e6e0f2534..7df570cc82 100644
--- a/language/oop5/variance.xml
+++ b/language/oop5/variance.xml
@@ -18,7 +18,7 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     A type is removed from a union type
+     A type is removed from a <link linkend="language.types.declarations.union">union type</link>
     </simpara>
    </listitem>
    <listitem>
@@ -31,6 +31,11 @@
      <type>float</type> is changed to <type>int</type>
     </simpara>
    </listitem>
+   <listitem>
+    <simpara>
+     <type>iterable</type> is changed to <type>array</type> or <classname>Traversable</classname>
+    </simpara>
+   </listitem>
   </itemizedlist>
 
   A type class is considered less specific if the opposite is true.
diff --git a/language/operators.xml b/language/operators.xml
index 40c5d9a5f1..6e1fae3326 100644
--- a/language/operators.xml
+++ b/language/operators.xml
@@ -54,9 +54,14 @@
     Operators of equal precedence that are non-associative cannot be used
     next to each other, for example <literal>1 &lt; 2 &gt; 1</literal> is
     illegal in PHP. The expression <literal>1 &lt;= 1 == 1</literal> on the
-    other hand is legal, because the <literal>==</literal> operator has lesser
+    other hand is legal, because the <literal>==</literal> operator has a lower
     precedence than the <literal>&lt;=</literal> operator.
    </para>
+   <para>
+    Associativity is only meaningful for binary (and ternary) operators.
+    Unary operators are either prefix or postfix so this notion is not applicable.
+    For example <literal>!!$a</literal> can only be grouped as <literal>!(!$a)</literal>.
+   </para>
    <para>
     Use of parentheses, even when not strictly necessary, can often increase
     readability of the code by making grouping explicit rather than relying
@@ -93,6 +98,8 @@
        <row>
         <entry>(n/a)</entry>
         <entry>
+         <literal>+</literal> 
+         <literal>-</literal> 
          <literal>++</literal> 
          <literal>--</literal> 
          <literal>~</literal> 
@@ -105,14 +112,18 @@
          <literal>@</literal>
         </entry>
         <entry>
-         <link linkend="language.types">types</link> and <link linkend="language.operators.increment">increment/decrement</link>
+         <link linkend="language.operators.arithmetic">arithmetic</link> (unary <literal>+</literal> and <literal>-</literal>),
+         <link linkend="language.operators.increment">increment/decrement</link>,
+         <link linkend="language.operators.bitwise">bitwise</link>,
+         <link linkend="language.types.typecasting">type casting</link>&listendand;
+         <link linkend="language.operators.errorcontrol">error control</link>
         </entry>
        </row>
        <row>
         <entry>left</entry>
         <entry><literal>instanceof</literal></entry>
         <entry>
-         <link linkend="language.types">types</link>
+         <link linkend="language.operators.type">type</link>
         </entry>
        </row>
        <row>
@@ -141,8 +152,10 @@
          <literal>.</literal>
         </entry>
         <entry>
-         <link linkend="language.operators.arithmetic">arithmetic</link>&listendand;
-         <link linkend="language.operators.string">string</link></entry>
+         <link linkend="language.operators.arithmetic">arithmetic</link> (binary <literal>+</literal> and <literal>-</literal>),
+         <link linkend="language.operators.array">array</link>&listendand;
+         <link linkend="language.operators.string">string</link> (<literal>.</literal> prior to PHP 8.0.0)
+        </entry>
        </row>
        <row>
         <entry>left</entry>
@@ -154,6 +167,13 @@
          <link linkend="language.operators.bitwise">bitwise</link>
         </entry>
        </row>
+       <row>
+        <entry>left</entry>
+        <entry><literal>.</literal></entry>
+        <entry>
+         <link linkend="language.operators.string">string</link> (as of PHP 8.0.0)
+        </entry>
+       </row>
        <row>
         <entry>non-associative</entry>
         <entry>
@@ -223,10 +243,11 @@
         </entry>
        </row>
        <row>
-        <entry>(n/a)</entry>
+        <entry>non-associative</entry>
         <entry><literal>? :</literal></entry>
         <entry>
          <link linkend="language.operators.comparison.ternary">ternary</link>
+         (left-associative prior to PHP 8.0.0)
         </entry>
        </row>
        <row>
@@ -303,7 +324,7 @@
 <?php
 $a = 3 * 3 % 5; // (3 * 3) % 5 = 4
 // ternary operator associativity differs from C/C++
-$a = true ? 0 : true ? 1 : 2; // (true ? 0 : true) ? 1 : 2 = 2
+$a = true ? 0 : true ? 1 : 2; // (true ? 0 : true) ? 1 : 2 = 2 (prior to PHP 8.0.0)
 
 $a = 1;
 $b = 2;
@@ -335,14 +356,14 @@ $array[$i] = $i++; // may set either index 1 or 2
      </programlisting>
     </example>
     <example>
-     <title><literal>+</literal>, <literal>-</literal> and <literal>.</literal> have the same precedence</title>
+     <title><literal>+</literal>, <literal>-</literal> and <literal>.</literal> have the same precedence (prior to PHP 8.0.0)</title>
      <programlisting role="php">
 <![CDATA[
 <?php
 $x = 4;
 // this line might result in unexpected output:
 echo "x minus one equals " . $x-1 . ", or so I hope\n";
-// because it is evaluated like this line:
+// because it is evaluated like this line (prior to PHP 8.0.0):
 echo (("x minus one equals " . $x) - 1) . ", or so I hope\n";
 // the desired precedence can be enforced by using parentheses:
 echo "x minus one equals " . ($x-1) . ", or so I hope\n";
@@ -379,6 +400,16 @@ x minus one equals 3, or so I hope
        </row>
       </thead>
       <tbody>
+       <row>
+        <entry>8.0.0</entry>
+        <entry>
+         String concatenation (<literal>.</literal>) now has a lower precedence than
+         arithmetic addition/subtraction (<literal>+</literal> and <literal>-</literal>) and
+         bitwise shift left/right (<literal>&lt;&lt;</literal> and <literal>&gt;&gt;</literal>);
+         previously it had the same precedence as <literal>+</literal> and <literal>-</literal>
+         and a higher precedence than <literal>&lt;&lt;</literal> and <literal>&gt;&gt;</literal>.
+        </entry>
+       </row>
        <row>
         <entry>8.0.0</entry>
         <entry>
@@ -386,6 +417,15 @@ x minus one equals 3, or so I hope
          previously it was left-associative.
         </entry>
        </row>
+       <row>
+        <entry>7.4.0</entry>
+        <entry>
+         Relying on the precedence of string concatenation (<literal>.</literal>) relative to
+         arithmetic addition/subtraction (<literal>+</literal> or <literal>-</literal>) or
+         bitwise shift left/right (<literal>&lt;&lt;</literal> or <literal>&gt;&gt;</literal>),
+         i.e. using them together in an unparenthesized expression, is deprecated.
+        </entry>
+       </row>
        <row>
         <entry>7.4.0</entry>
         <entry>
@@ -469,8 +509,8 @@ x minus one equals 3, or so I hope
     integer division, see <function>intdiv</function>.
    </simpara>
    <simpara>
-    Operands of modulo are converted to integers (by stripping the decimal
-    part) before processing. For floating-point modulo, see
+    Operands of modulo are converted to <type>int</type>
+    before processing. For floating-point modulo, see
     <function>fmod</function>.
    </simpara>
    <para>
@@ -1521,22 +1561,42 @@ Expression: 0 = -4 << 62
       <programlisting role="php">
 <![CDATA[
 <?php
-var_dump(0 == "a"); // 0 == 0 -> true
-var_dump("1" == "01"); // 1 == 1 -> true
-var_dump("10" == "1e1"); // 10 == 10 -> true
-var_dump(100 == "1e2"); // 100 == 100 -> true
+var_dump(0 == "a");
+var_dump("1" == "01");
+var_dump("10" == "1e1");
+var_dump(100 == "1e2");
 
 switch ("a") {
 case 0:
     echo "0";
     break;
-case "a": // never reached because "a" is already matched with 0
+case "a":
     echo "a";
     break;
 }
 ?>
 ]]>
       </programlisting>
+      &example.outputs.7;
+      <screen>
+<![CDATA[
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+0
+]]>
+      </screen>
+      &example.outputs.8;
+      <screen>
+<![CDATA[
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+a
+]]>
+      </screen>      
      </informalexample>
     </para>
    </warning>
diff --git a/language/predefined/arrayaccess.xml b/language/predefined/arrayaccess.xml
index 72623ff2e1..4177082b21 100644
--- a/language/predefined/arrayaccess.xml
+++ b/language/predefined/arrayaccess.xml
@@ -26,9 +26,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>ArrayAccess</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>ArrayAccess</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/language/predefined/arrayaccess/offsetexists.xml b/language/predefined/arrayaccess/offsetexists.xml
index 44d3530867..d3140dfee2 100644
--- a/language/predefined/arrayaccess/offsetexists.xml
+++ b/language/predefined/arrayaccess/offsetexists.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>ArrayAccess::offsetExists</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ArrayAccess::offsetExists</methodname>
    <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/language/predefined/arrayaccess/offsetget.xml b/language/predefined/arrayaccess/offsetget.xml
index 76c4c03119..799fcc4d0f 100644
--- a/language/predefined/arrayaccess/offsetget.xml
+++ b/language/predefined/arrayaccess/offsetget.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>ArrayAccess::offsetGet</methodname>
+   <modifier>public</modifier> <type>mixed</type><methodname>ArrayAccess::offsetGet</methodname>
    <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -37,7 +37,14 @@
   </para>
 
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Can return all value types.
+  </para>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
@@ -67,13 +74,6 @@
   </note>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Can return all value types.
-  </para>
- </refsect1>
-
 <!--
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/language/predefined/arrayaccess/offsetset.xml b/language/predefined/arrayaccess/offsetset.xml
index 56d02882f0..22f193a0c5 100644
--- a/language/predefined/arrayaccess/offsetset.xml
+++ b/language/predefined/arrayaccess/offsetset.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>ArrayAccess::offsetSet</methodname>
+   <modifier>public</modifier> <type>void</type><methodname>ArrayAccess::offsetSet</methodname>
    <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
@@ -80,7 +80,7 @@ Array
     </informalexample>
    </para>
   </note>
-  
+
   <note>
     <para>
       This function is not called in assignments by reference and otherwise
diff --git a/language/predefined/arrayaccess/offsetunset.xml b/language/predefined/arrayaccess/offsetunset.xml
index 9b4f2209d3..da4d0f5c0d 100644
--- a/language/predefined/arrayaccess/offsetunset.xml
+++ b/language/predefined/arrayaccess/offsetunset.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>ArrayAccess::offsetUnset</methodname>
+   <modifier>public</modifier> <type>void</type><methodname>ArrayAccess::offsetUnset</methodname>
    <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/language/predefined/closure.xml b/language/predefined/closure.xml
index 7fbe15b189..8f2f48fed6 100644
--- a/language/predefined/closure.xml
+++ b/language/predefined/closure.xml
@@ -48,7 +48,10 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.closure')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.closure')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.closure')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/language/predefined/closure/bind.xml b/language/predefined/closure/bind.xml
index a644712e51..7988170d8d 100644
--- a/language/predefined/closure/bind.xml
+++ b/language/predefined/closure/bind.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="closure.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Closure::bind</refname>
@@ -12,11 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>Closure</type><type>false</type></type><methodname>Closure::bind</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>Closure</type><type>null</type></type><methodname>Closure::bind</methodname>
    <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
-   <methodparam><type>object</type><parameter>newthis</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>newscope</parameter>
-   <initializer>"static"</initializer></methodparam>
+   <methodparam><type class="union"><type>object</type><type>null</type></type><parameter>newThis</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>object</type><type>string</type><type>null</type></type><parameter>newScope</parameter><initializer>"static"</initializer></methodparam>
   </methodsynopsis>
   <para>
    This method is a static version of <methodname>Closure::bindTo</methodname>.
@@ -37,7 +35,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>newthis</parameter></term>
+    <term><parameter>newThis</parameter></term>
     <listitem>
      <para>
       The object to which the given anonymous function should be bound, or
@@ -46,7 +44,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>newscope</parameter></term>
+    <term><parameter>newScope</parameter></term>
     <listitem>
      <para>
       The class scope to which the closure is to be associated, or
@@ -63,7 +61,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a new <classname>Closure</classname> object &return.falseforfailure;
+   Returns a new <classname>Closure</classname> object, or &null; on failure.
   </para>
  </refsect1>
 
@@ -112,7 +110,6 @@ echo $bcl2(), "\n";
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/closure/bindto.xml b/language/predefined/closure/bindto.xml
index a33c3044bf..19279e0638 100644
--- a/language/predefined/closure/bindto.xml
+++ b/language/predefined/closure/bindto.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="closure.bindto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Closure::bindTo</refname>
@@ -13,9 +12,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>Closure</type><type>null</type></type><methodname>Closure::bindTo</methodname>
-   <methodparam><type>object</type><parameter>newthis</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>newscope</parameter>
-   <initializer>"static"</initializer></methodparam>
+   <methodparam><type class="union"><type>object</type><type>null</type></type><parameter>newThis</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>object</type><type>string</type><type>null</type></type><parameter>newScope</parameter><initializer>"static"</initializer></methodparam>
   </methodsynopsis>
   <para>
    Create and return a new <link linkend="functions.anonymous">anonymous
@@ -29,13 +27,13 @@
    which determines which private and protected members the anonymous
    function will be able to access. Namely, the members that will be
    visible are the same as if the anonymous function were a method of
-   the class given as value of the <parameter>newscope</parameter>
+   the class given as value of the <parameter>newScope</parameter>
    parameter.
   </para>
 
   <para>
    Static closures cannot have any bound object (the value of the parameter
-   <parameter>newthis</parameter> should be &null;), but this function can
+   <parameter>newThis</parameter> should be &null;), but this function can
    nevertheless be used to change their class scope.
   </para>
 
@@ -60,7 +58,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>newthis</parameter></term>
+    <term><parameter>newThis</parameter></term>
     <listitem>
      <para>
       The object to which the given anonymous function should be bound, or
@@ -69,7 +67,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>newscope</parameter></term>
+    <term><parameter>newScope</parameter></term>
     <listitem>
      <para>
       The class scope to which the closure is to be associated, or
@@ -139,7 +137,6 @@ echo $cl(), "\n";
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/closure/call.xml b/language/predefined/closure/call.xml
index 99b0755421..b75412b2eb 100644
--- a/language/predefined/closure/call.xml
+++ b/language/predefined/closure/call.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="closure.call" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Closure::call</refname>
@@ -10,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>mixed</type><methodname>Closure::call</methodname>
-   <methodparam><type>object</type><parameter>newthis</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
+   <methodparam><type>object</type><parameter>newThis</parameter></methodparam>
+   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Temporarily binds the closure to <parameter>newthis</parameter>, and calls
+   Temporarily binds the closure to <parameter>newThis</parameter>, and calls
    it with any given parameters.
   </para>
  </refsect1><!-- }}} -->
@@ -22,7 +21,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>newthis</parameter></term>
+    <term><parameter>newThis</parameter></term>
     <listitem>
      <para>
       The <type>object</type> to bind the closure to for the duration of the
@@ -31,7 +30,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>values</parameter></term>
+    <term><parameter>args</parameter></term>
     <listitem>
      <para>
       Zero or more parameters, which will be given as parameters to the
@@ -85,7 +84,6 @@ int(8)
   </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/closure/construct.xml b/language/predefined/closure/construct.xml
index 6ee725db2c..a1b431fdaa 100644
--- a/language/predefined/closure/construct.xml
+++ b/language/predefined/closure/construct.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="closure.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Closure::__construct</refname>
@@ -9,10 +8,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>private</modifier> <methodname>Closure::__construct</methodname>
-   <void />
-  </methodsynopsis>
+   <void/>
+  </constructorsynopsis>
   <para>
     This method exists only to disallow instantiation of the
     <classname>Closure</classname> class. Objects of this class are created
@@ -37,7 +36,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/closure/fromcallable.xml b/language/predefined/closure/fromcallable.xml
index 64ab12aa5a..f2b8a30866 100644
--- a/language/predefined/closure/fromcallable.xml
+++ b/language/predefined/closure/fromcallable.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="closure.fromcallable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Closure::fromCallable</refname>
@@ -11,12 +10,12 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>Closure</type><methodname>Closure::fromCallable</methodname>
-   <methodparam><type>callable</type><parameter>callable</parameter></methodparam>
+   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
   </methodsynopsis>
   <para>
    Create and return a new <link linkend="functions.anonymous">anonymous
-   function</link> from given <parameter>callable</parameter> using the
-   current scope. This method checks if the <parameter>callable</parameter> is
+   function</link> from given <parameter>callback</parameter> using the
+   current scope. This method checks if the <parameter>callback</parameter> is
    callable in the current scope and throws a <classname>TypeError</classname>
    if it is not.
   </para>
@@ -26,7 +25,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>callable</parameter></term>
+    <term><parameter>callback</parameter></term>
     <listitem>
      <para>
       The callable to convert.
@@ -40,12 +39,11 @@
   &reftitle.returnvalues;
   <para>
    Returns the newly created <classname>Closure</classname> or throws a
-   <classname>TypeError</classname> if the <parameter>callable</parameter> is
+   <classname>TypeError</classname> if the <parameter>callback</parameter> is
    not callable in the current scope.
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -66,4 +64,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/error/construct.xml b/language/predefined/error/construct.xml
index 106c6e7da7..da14a3e453 100644
--- a/language/predefined/error/construct.xml
+++ b/language/predefined/error/construct.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="error.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Error::__construct</refname>
@@ -13,7 +12,7 @@
    <modifier>public</modifier> <methodname>Error::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>Throwable</type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>Throwable</type><type>null</type></type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Constructs the Error.
@@ -63,7 +62,6 @@
  </refsect1>
  
 </refentry>
- 
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -84,4 +82,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/error/getcode.xml b/language/predefined/error/getcode.xml
index 44e8a88633..28324b5ae9 100644
--- a/language/predefined/error/getcode.xml
+++ b/language/predefined/error/getcode.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="error.getcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Error::getCode</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Error::getCode</methodname>
-   <void />
+   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>Error::getCode</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Returns the error code.
@@ -65,7 +64,6 @@ The Error code is: 30
   </para>
  </refsect1>
 </refentry>
- 
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -86,4 +84,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/errorexception/construct.xml b/language/predefined/errorexception/construct.xml
index b639067647..8577031605 100644
--- a/language/predefined/errorexception/construct.xml
+++ b/language/predefined/errorexception/construct.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="errorexception.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ErrorException::__construct</refname>
@@ -13,10 +12,10 @@
    <modifier>public</modifier> <methodname>ErrorException::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>severity</parameter><initializer>E_ERROR</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter><initializer>__FILE__</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>lineno</parameter><initializer>__LINE__</initializer></methodparam>
-   <methodparam choice="opt"><type>Exception</type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>severity</parameter><initializer><constant>E_ERROR</constant></initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>filename</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>line</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>Throwable</type><type>null</type></type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Constructs the Exception.
@@ -66,7 +65,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>lineno</parameter></term>
+     <term><parameter>line</parameter></term>
      <listitem>
       <para>
        The line number where the exception is thrown.
@@ -85,8 +84,31 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>filename</parameter> and <parameter>line</parameter> are nullable now.
+       Previously, their defaults were <constant>__FILE__</constant> and
+       <constant>__LINE__</constant>, respectively.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
 </refentry>
- 
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -107,4 +129,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/exception/construct.xml b/language/predefined/exception/construct.xml
index 64ed0a56cc..14c5d5225c 100644
--- a/language/predefined/exception/construct.xml
+++ b/language/predefined/exception/construct.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="exception.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Exception::__construct</refname>
@@ -13,7 +12,7 @@
    <modifier>public</modifier> <methodname>Exception::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>Throwable</type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>Throwable</type><type>null</type></type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Constructs the Exception.
@@ -69,7 +68,6 @@
  </refsect1>
  
 </refentry>
- 
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -90,4 +88,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/exception/getcode.xml b/language/predefined/exception/getcode.xml
index 1c1f20c126..0697e415fe 100644
--- a/language/predefined/exception/getcode.xml
+++ b/language/predefined/exception/getcode.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="exception.getcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Exception::getCode</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Exception::getCode</methodname>
-   <void />
+   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>Exception::getCode</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Returns the Exception code.
@@ -68,7 +67,6 @@ The exception code is: 30
   </para>
  </refsect1>
 </refentry>
- 
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -89,4 +87,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/exception/getprevious.xml b/language/predefined/exception/getprevious.xml
index a27bf479c1..5b9bf04701 100644
--- a/language/predefined/exception/getprevious.xml
+++ b/language/predefined/exception/getprevious.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier><type class="union"><type>Throwable</type><type>null</type></type><methodname>Exception::getPrevious</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>Throwable</type><type>null</type></type> <methodname>Exception::getPrevious</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/language/predefined/generator.xml b/language/predefined/generator.xml
index c9ab409405..c1d0cb0aa9 100644
--- a/language/predefined/generator.xml
+++ b/language/predefined/generator.xml
@@ -52,6 +52,11 @@
 
   </section>
 
+  <section xml:id="generator.seealso">
+   &reftitle.seealso;
+   <para>See also <link linkend="language.oop5.iterations">object iteration</link>.</para>
+  </section>
+
  </partintro>
 
  &language.predefined.generator.current;
diff --git a/language/predefined/interfaces.xml b/language/predefined/interfaces.xml
index 1a47536fdd..46ac6fde1d 100644
--- a/language/predefined/interfaces.xml
+++ b/language/predefined/interfaces.xml
@@ -20,6 +20,8 @@
  &language.predefined.closure;
  &language.predefined.generator;
  &language.predefined.weakreference;
+ &language.predefined.weakmap;
+ &language.predefined.stringable;
 
 </part>
 
diff --git a/language/predefined/iterator.xml b/language/predefined/iterator.xml
index 5f5f552d25..b9244b18dc 100644
--- a/language/predefined/iterator.xml
+++ b/language/predefined/iterator.xml
@@ -27,9 +27,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>Iterator</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>Iterator</interfacename>
+     </oointerface>
      
      <ooclass>
       <modifier>extends</modifier>
@@ -142,6 +142,10 @@ string(17) "myIterator::valid"
    </example><!-- }}} -->
   </section>
 
+  <section xml:id="iterator.seealso">
+  &reftitle.seealso;
+   <para>See also <link linkend="language.oop5.iterations">object iteration</link>.</para>
+  </section>
 
  </partintro>
 
diff --git a/language/predefined/iterator/key.xml b/language/predefined/iterator/key.xml
index 69d1efc190..bcbc4f9e7d 100644
--- a/language/predefined/iterator/key.xml
+++ b/language/predefined/iterator/key.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="iterator.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Iterator::key</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>scalar</type><methodname>Iterator::key</methodname>
-   <void />
+   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Iterator::key</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Returns the key of the current element.
@@ -38,7 +37,6 @@
  </refsect1><!-- }}} -->
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -59,4 +57,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/language/predefined/serializable.xml b/language/predefined/serializable.xml
index 8234bb33cb..6ef2b2dcc9 100644
--- a/language/predefined/serializable.xml
+++ b/language/predefined/serializable.xml
@@ -37,9 +37,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>Serializable</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>Serializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/language/predefined/serializable/unserialize.xml b/language/predefined/serializable/unserialize.xml
index ff89786e36..6249f2e547 100644
--- a/language/predefined/serializable/unserialize.xml
+++ b/language/predefined/serializable/unserialize.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="serializable.unserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Serializable::unserialize</refname>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Serializable::unserialize</methodname>
-   <methodparam><type>string</type><parameter>serialized</parameter></methodparam>
+   <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
    Called during unserialization of the object.
@@ -31,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>serialized</parameter></term>
+     <term><parameter>data</parameter></term>
      <listitem>
       <para>
        The string representation of the object.
@@ -61,7 +60,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/stringable.xml b/language/predefined/stringable.xml
new file mode 100644
index 0000000000..6c9bd2ca99
--- /dev/null
+++ b/language/predefined/stringable.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<phpdoc:classref xml:id="class.stringable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <title>The Stringable interface</title>
+ <titleabbrev>Stringable</titleabbrev>
+
+ <partintro>
+
+<!-- {{{ Stringable intro -->
+  <section xml:id="stringable.intro">
+   &reftitle.intro;
+   <para>
+    The <interfacename>Stringable</interfacename> interface denotes a class as
+    having a <function>__toString</function> method.  Unlike most interfaces,
+    <interfacename>Stringable</interfacename> is implicitly present on any class that
+    has the magic <function>__toString</function> method defined, although it
+    can and should be declared explicitly.
+   </para>
+   <para>
+    Its primary value is to allow functions to type check against the union
+    type <literal>string|Stringable</literal> to accept either a string primitive
+    or an object that can be cast to a string.
+   </para>
+  </section>
+<!-- }}} -->
+
+  <section xml:id="stringable.synopsis">
+   &reftitle.interfacesynopsis;
+
+<!-- {{{ Synopsis -->
+   <classsynopsis>
+    <ooclass><classname>Stringable</classname></ooclass>
+
+<!-- {{{ Class synopsis -->
+    <classsynopsisinfo>
+     <oointerface>
+      <interfacename>Stringable</interfacename>
+     </oointerface>
+    </classsynopsisinfo>
+<!-- }}} -->
+
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+<!-- Bring back if we add the toString method as its own page later. For now,
+     just link to the existing description in magic.xml.
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stringable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
+-->
+   </classsynopsis>
+<!-- }}} -->
+
+  </section>
+
+  <section xml:id="stringable.examples">
+   <title>Stringable Examples</title>
+   <para>
+    <example xml:id="stringable.basic-example">
+     <title>Basic Stringable Usage</title>
+     <programlisting role="php">
+<![CDATA[
+<?php
+class IPv4Address implements Stringable {
+    private string $oct1;
+    private string $oct2;
+    private string $oct3;
+    private string $oct4;
+
+    public function __construct(string $oct1, string $oct2, string $oct3, string $oct4) {
+        $this->oct1 = $oct1;
+        $this->oct2 = $oct2;
+        $this->oct3 = $oct3;
+        $this->oct4 = $oct4;
+    }
+
+    public function __toString(): string {
+        return "$this->oct1.$this->oct2.$this->oct3.$this->oct4";
+    }
+}
+
+function showStuff(string|Stringable $value) {
+    // A Stringable will get converted to a string here by calling
+    // __toString.
+    print $value;
+}
+
+$ip = new IPv4Address('123', '234', '42', '9');
+
+showStuff($ip);
+?>
+]]>
+     </programlisting>
+     &example.outputs.similar;
+     <screen>
+<![CDATA[
+123.234.42.9
+]]>
+     </screen>
+    </example>
+   </para>
+  </section>
+
+ </partintro>
+
+</phpdoc:classref>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/language/predefined/throwable.xml b/language/predefined/throwable.xml
index 019357bd1d..261b1d4e70 100644
--- a/language/predefined/throwable.xml
+++ b/language/predefined/throwable.xml
@@ -35,9 +35,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>Throwable</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>Throwable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/language/predefined/traversable.xml b/language/predefined/traversable.xml
index 39224a7eaa..cfc48acffd 100644
--- a/language/predefined/traversable.xml
+++ b/language/predefined/traversable.xml
@@ -50,9 +50,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>Traversable</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>Traversable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
 
diff --git a/language/predefined/typeerror.xml b/language/predefined/typeerror.xml
index 1f83b571ad..51d3509ce1 100644
--- a/language/predefined/typeerror.xml
+++ b/language/predefined/typeerror.xml
@@ -16,12 +16,21 @@
    &reftitle.intro;
    <para>
     There are three scenarios where a
-    <ooclass><classname>TypeError</classname></ooclass> may be thrown. The
-    first is where the argument type being passed to a function does not match
-    its corresponding declared parameter type. The second is where a value
-    being returned from a function does not match the declared function return
-    type. The third is where an invalid number of arguments are passed to a
-    built-in PHP function (strict mode only).
+    <ooclass><classname>TypeError</classname></ooclass> may be thrown:
+    <simplelist>
+     <member>
+      The argument type being passed to a function does not match
+      its corresponding declared parameter type.
+     </member>
+     <member>  
+      A value being returned from a function does not match the
+      declared function return type.
+     </member>
+     <member> 
+      An invalid number of arguments are passed
+      to a built-in PHP function (strict mode only).
+     </member>
+    </simplelist>  
   </para>
   </section>
 <!-- }}} -->
diff --git a/language/predefined/versions.xml b/language/predefined/versions.xml
index 54704bf83b..66beb46532 100644
--- a/language/predefined/versions.xml
+++ b/language/predefined/versions.xml
@@ -98,10 +98,20 @@
  <function name="throwable::getprevious" from="PHP 7, PHP 8"/>
  <function name="throwable::__toString" from="PHP 7, PHP 8"/>
 
- <function name="WeakReference" from="PHP 7 &gt;= 7.4.0"/>
- <function name="WeakReference::__construct" from="PHP 7 &gt;= 7.4.0"/>
- <function name="WeakReference::create" from="PHP 7 &gt;= 7.4.0"/>
- <function name="WeakReference::get" from="PHP 7 &gt;= 7.4.0"/>
+ <function name="WeakReference" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="WeakReference::__construct" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="WeakReference::create" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="WeakReference::get" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="WeakMap" from="PHP 8"/>
+ <function name="WeakMap::__construct" from="PHP 8"/>
+ <function name="WeakMap::count" from="PHP 8"/>
+ <function name="WeakMap::getIterator" from="PHP 8"/>
+ <function name="WeakMap::offsetExists" from="PHP 8"/>
+ <function name="WeakMap::offsetGet" from="PHP 8"/>
+ <function name="WeakMap::offsetSet" from="PHP 8"/>
+ <function name="WeakMap::offsetUnset" from="PHP 8"/>
+
+ <function name="Stringable" from="PHP 8" />
 
  <function name="_COOKIE" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
  <function name="_ENV" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
diff --git a/language/predefined/weakmap.xml b/language/predefined/weakmap.xml
new file mode 100644
index 0000000000..69e3950da7
--- /dev/null
+++ b/language/predefined/weakmap.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<phpdoc:classref xml:id="class.weakmap" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <title>The WeakMap class</title>
+ <titleabbrev>WeakMap</titleabbrev>
+
+ <partintro>
+
+  <!-- {{{ WeakMap intro -->
+  <section xml:id="weakmap.intro">
+   &reftitle.intro;
+   <para>
+    A <classname>WeakMap</classname> is map (or dictionary) that accepts objects as keys.  However, unlike the
+    otherwise similar <classname>SplObjectStorage</classname>, an object in a key of <classname>WeakMap</classname>
+    does not contribute toward the object's reference count.  That is, if at any point the only remaining reference
+    to an object is the key of a <classname>WeakMap</classname>, the object will be garbage collected and removed
+    from the <classname>WeakMap</classname>.  Its primary use case is for building caches of data derived from
+    an object that do not need to live longer than the object.
+   </para>
+   <para>
+    <classname>WeakMap</classname> implements <interfacename>ArrayAccess</interfacename>,
+    <interfacename>Iterator</interfacename>, and <interfacename>Countable</interfacename>,
+    so in most cases it can be used in the same fashion as an associative array.
+   </para>
+  </section>
+  <!-- }}} -->
+
+  <section xml:id="weakmap.synopsis">
+   &reftitle.classsynopsis;
+
+   <!-- {{{ Synopsis -->
+   <classsynopsis>
+    <ooclass><classname>WeakMap</classname></ooclass>
+
+    <!-- {{{ Class synopsis -->
+    <classsynopsisinfo>
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>WeakMap</classname>
+     </ooclass>
+
+     <oointerface>
+      <interfacename>Countable</interfacename>
+     </oointerface>
+
+     <oointerface>
+      <interfacename>ArrayAccess</interfacename>
+     </oointerface>
+
+     <oointerface>
+      <interfacename>IteratorAggregate</interfacename>
+     </oointerface>
+
+    </classsynopsisinfo>
+    <!-- }}} -->
+
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.weakmap')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+   </classsynopsis>
+   <!-- }}} -->
+
+  </section>
+  <!-- {{{ weakmap examples -->
+  <section xml:id="weakmap.examples">
+   &reftitle.examples;
+   <para>
+    <example>
+     <title><classname>Weakmap</classname> usage example</title>
+     <programlisting role="php">
+      <![CDATA[
+<?php
+$wm = new WeakMap();
+
+$o = new StdClass;
+
+class A {
+    public function __destruct() {
+        echo "Dead!\n";
+    }
+}
+
+$wm[$o] = new A;
+
+var_dump(count($wm));
+echo "Unsetting...\n";
+unset($o);
+echo "Done\n";
+var_dump(count($wm));
+]]>
+     </programlisting>
+     &example.outputs;
+     <screen>
+      <![CDATA[
+int(1)
+Unsetting...
+Dead!
+Done
+int(0)
+]]>
+     </screen>
+    </example>
+   </para>
+  </section>
+  <!-- }}} -->
+
+ </partintro>
+
+ &language.predefined.weakmap.construct;
+ &language.predefined.weakmap.count;
+ &language.predefined.weakmap.getiterator;
+ &language.predefined.weakmap.offsetexists;
+ &language.predefined.weakmap.offsetget;
+ &language.predefined.weakmap.offsetset;
+ &language.predefined.weakmap.offsetunset;
+
+</phpdoc:classref>
+
+ <!-- Keep this comment at the end of the file
+ Local variables:
+ mode: sgml
+ sgml-omittag:t
+ sgml-shorttag:t
+ sgml-minimize-attributes:nil
+ sgml-always-quote-attributes:t
+ sgml-indent-step:1
+ sgml-indent-data:t
+ indent-tabs-mode:nil
+ sgml-parent-document:nil
+ sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+ sgml-exposed-tags:nil
+ sgml-local-catalogs:nil
+ sgml-local-ecat-files:nil
+ End:
+ vim600: syn=xml fen fdm=syntax fdl=2 si
+ vim: et tw=78 syn=sgml
+ vi: ts=1 sw=1
+ -->
diff --git a/reference/weakref/weakmap/construct.xml b/language/predefined/weakmap/construct.xml
similarity index 88%
rename from reference/weakref/weakmap/construct.xml
rename to language/predefined/weakmap/construct.xml
index 990d994067..d882fe43af 100644
--- a/reference/weakref/weakmap/construct.xml
+++ b/language/predefined/weakmap/construct.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
-<refentry xml:id="weakmap.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="ext-weakmap.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>WeakMap::__construct</refname>
   <refpurpose>Constructs a new map</refpurpose>
diff --git a/reference/weakref/weakmap/count.xml b/language/predefined/weakmap/count.xml
similarity index 98%
rename from reference/weakref/weakmap/count.xml
rename to language/predefined/weakmap/count.xml
index e332ecb84f..b0bb65d7ea 100644
--- a/reference/weakref/weakmap/count.xml
+++ b/language/predefined/weakmap/count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="weakmap.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
diff --git a/reference/mongo/mongoclient/connect.xml b/language/predefined/weakmap/getiterator.xml
similarity index 59%
rename from reference/mongo/mongoclient/connect.xml
rename to language/predefined/weakmap/getiterator.xml
index 32e9aff4c4..ef6ab397d6 100644
--- a/reference/mongo/mongoclient/connect.xml
+++ b/language/predefined/weakmap/getiterator.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- $Revision$ -->
-<refentry xml:id="mongoclient.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::connect</refname>
-  <refpurpose>Connects to a database server</refpurpose>
- </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
+<refentry xml:id="weakmap.getiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>WeakMap::getIterator</refname>
+  <refpurpose>Retrieve an external iterator</refpurpose>
+ </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoClient::connect</methodname>
-   <void/>
+   <modifier>abstract</modifier> <modifier>public</modifier> <type>Traversable</type><methodname>WeakMap::getIterator</methodname>
+   <void />
   </methodsynopsis>
+  <para>
+   Returns an external iterator.
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,19 +26,20 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   If the connection was successful.
+   An instance of an object implementing <classname>Iterator</classname> or
+   <classname>Traversable</classname>
   </para>
  </refsect1>
 
- <refsect1 role="errors">
+ <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-   Throws <classname>MongoConnectionException</classname> if it fails to connect
-   to the database.
+   Throws an <classname>Exception</classname> on failure.
   </para>
- </refsect1>
+ </refsect1><!-- }}} -->
 
 </refentry>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -51,6 +49,7 @@ sgml-minimize-attributes:nil
 sgml-always-quote-attributes:t
 sgml-indent-step:1
 sgml-indent-data:t
+indent-tabs-mode:nil
 sgml-parent-document:nil
 sgml-default-dtd-file:"~/.phpdoc/manual.ced"
 sgml-exposed-tags:nil
@@ -60,4 +59,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
---> 
+-->
diff --git a/reference/weakref/weakmap/offsetexists.xml b/language/predefined/weakmap/offsetexists.xml
similarity index 98%
rename from reference/weakref/weakmap/offsetexists.xml
rename to language/predefined/weakmap/offsetexists.xml
index 28efedf360..e2186d26ea 100644
--- a/reference/weakref/weakmap/offsetexists.xml
+++ b/language/predefined/weakmap/offsetexists.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="weakmap.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
diff --git a/reference/weakref/weakmap/offsetget.xml b/language/predefined/weakmap/offsetget.xml
similarity index 98%
rename from reference/weakref/weakmap/offsetget.xml
rename to language/predefined/weakmap/offsetget.xml
index cd39a277b8..f5eec1d26e 100644
--- a/reference/weakref/weakmap/offsetget.xml
+++ b/language/predefined/weakmap/offsetget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="weakmap.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
diff --git a/reference/weakref/weakmap/offsetset.xml b/language/predefined/weakmap/offsetset.xml
similarity index 95%
rename from reference/weakref/weakmap/offsetset.xml
rename to language/predefined/weakmap/offsetset.xml
index a3c280cfcb..cc3bb00dfc 100644
--- a/reference/weakref/weakmap/offsetset.xml
+++ b/language/predefined/weakmap/offsetset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="weakmap.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -27,7 +27,7 @@
     <term><parameter>object</parameter></term>
     <listitem>
      <para>
-       The object serving as key of the key-value pair. 
+       The object serving as key of the key-value pair.
      </para>
     </listitem>
    </varlistentry>
@@ -35,7 +35,7 @@
     <term><parameter>value</parameter></term>
     <listitem>
      <para>
-       The arbitrary data serving as value of the key-value pair. 
+       The arbitrary data serving as value of the key-value pair.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/weakref/weakmap/offsetunset.xml b/language/predefined/weakmap/offsetunset.xml
similarity index 95%
rename from reference/weakref/weakmap/offsetunset.xml
rename to language/predefined/weakmap/offsetunset.xml
index a9d1bb07d6..7ac95a9b29 100644
--- a/reference/weakref/weakmap/offsetunset.xml
+++ b/language/predefined/weakmap/offsetunset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="weakmap.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -25,7 +25,7 @@
     <term><parameter>object</parameter></term>
     <listitem>
      <para>
-      The key object to remove from the map. 
+      The key object to remove from the map.
      </para>
     </listitem>
    </varlistentry>
diff --git a/language/predefined/weakreference.xml b/language/predefined/weakreference.xml
index 42b606d086..8ee63f2a59 100644
--- a/language/predefined/weakreference.xml
+++ b/language/predefined/weakreference.xml
@@ -15,12 +15,6 @@
     Weak references allow the programmer to retain a reference to an object which does not prevent
     the object from being destroyed. They are useful for implementing cache like structures.
    </para>
-   <note>
-    <para>
-     The class <classname>WeakReference</classname> is not to be confused with the class
-     <classname>WeakRef</classname> of the <link linkend="class.weakref">Weakref</link> extension.
-    </para>
-   </note>
    <para>
     <classname>WeakReference</classname>s cannot be serialized.
    </para>
diff --git a/language/predefined/weakreference/create.xml b/language/predefined/weakreference/create.xml
index 6d1dc7e984..ce689640c0 100644
--- a/language/predefined/weakreference/create.xml
+++ b/language/predefined/weakreference/create.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="weakreference.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>WeakReference::create</refname>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>WeakReference</type><methodname>WeakReference::create</methodname>
-   <methodparam><type>object</type><parameter>referent</parameter></methodparam>
+   <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
    Creates a new <classname>WeakReference</classname>.
@@ -22,7 +21,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>referent</parameter></term>
+    <term><parameter>object</parameter></term>
     <listitem>
      <para>
       The object to be weakly referenced.
@@ -40,7 +39,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/references.xml b/language/references.xml
index 6f2d3928d6..f5b58dfec6 100644
--- a/language/references.xml
+++ b/language/references.xml
@@ -95,10 +95,13 @@ $foo =& find_var($bar);
 ]]>
       </programlisting>
      </informalexample>
-     <link linkend="language.oop5.basic.new">new</link>
-     returns a reference automatically, thus it is syntactically invalid.
-     For more information, see <link linkend="language.oop5.references">Objects
-     and references</link>.)
+    </para>
+    <para>
+     Using the same syntax with a function that does <emphasis>not</emphasis>
+     return by reference will give an error, as will using it with the result
+     of the <link linkend="language.oop5.basic.new">new</link> operator.
+     Although objects are passed around as pointers, these are not the same as references,
+     as explained under <link linkend="language.oop5.references">Objects and references</link>.
     </para>
     <warning>
      <para>
diff --git a/language/types/array.xml b/language/types/array.xml
index 08849aa2c9..7f3e253d2f 100644
--- a/language/types/array.xml
+++ b/language/types/array.xml
@@ -358,9 +358,10 @@ string(3) "foo"
    
    <note>
     <para>
-     Both square brackets and curly braces can be used interchangeably
-     for accessing array elements (e.g. <literal>$array[42]</literal> and <literal>$array{42}</literal> will
-     both do the same thing in the example above).
+     Prior to PHP 8.0.0, square brackets and curly braces could be used interchangeably
+     for accessing array elements (e.g. <literal>$array[42]</literal> and <literal>$array{42}</literal>
+     would both do the same thing in the example above).
+     The curly brace syntax was deprecated as of PHP 7.4.0 and no longer supported as of PHP 8.0.0.
     </para>
    </note>
 
@@ -616,9 +617,12 @@ echo $foo[bar];
    </para>
    <warning>
     <simpara>
-     The fallback to treat an undefined constant as bare string is deprecated as
-     of PHP 7.2.0, and issues an error of level <constant>E_WARNING</constant>.
-     Formerly, an error of level <constant>E_NOTICE</constant> has been issued.
+     The fallback to treat an undefined constant as bare string issues an error
+     of level <constant>E_NOTICE</constant>.
+     This has been deprecated as of PHP 7.2.0, and issues an error
+     of level <constant>E_WARNING</constant>.
+     As of PHP 8.0.0, it has been removed and throws an
+     <classname>Error</classname> exception.
     </simpara>
    </warning>
 
diff --git a/language/types/boolean.xml b/language/types/boolean.xml
index f4865c3d26..761220d16a 100644
--- a/language/types/boolean.xml
+++ b/language/types/boolean.xml
@@ -84,7 +84,7 @@ if ($show_separators) {
    </listitem>
    <listitem>
     <simpara>
-     the <link linkend="language.types.integer">integer</link>s 0 and -0 (zero)
+     the <link linkend="language.types.integer">integer</link> 0 (zero)
     </simpara>
    </listitem>
    <listitem>
diff --git a/language/types/declarations.xml b/language/types/declarations.xml
index 4e4791b615..8933dba294 100644
--- a/language/types/declarations.xml
+++ b/language/types/declarations.xml
@@ -165,8 +165,8 @@ Stack trace:
   <para>
    <type>mixed</type> is equivalent to the <link linkend="language.types.declarations.union">union type</link>
    <type class="union">
-    <type>array</type><type>bool</type><type>callable</type><type>int</type><type>float</type>
-    <type>object</type><type>resource</type><type>string</type><type>null</type>
+    <type>object</type><type>resource</type><type>array</type><type>string</type>
+    <type>int</type><type>float</type><type>bool</type><type>null</type>
    </type>.
    Available as of PHP 8.0.0.
   </para>
diff --git a/language/types/iterable.xml b/language/types/iterable.xml
index f21d32b323..e7d9533ff7 100644
--- a/language/types/iterable.xml
+++ b/language/types/iterable.xml
@@ -113,42 +113,6 @@ function gen(): iterable {
     yield 3;
 }
 
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </sect2>
-
- <sect2 xml:id="language.types.iterable.variance">
-  <title>Iterable Type Variance</title>
-
-  <para>
-   Classes extending/implementing may broaden methods using &array; or
-   <classname>Traversable</classname> as parameter types to
-   <type>iterable</type> or narrow return types from <type>iterable</type> to
-   &array; or <classname>Traversable</classname>.
-  </para>
-
-  <para>
-   <example>
-    <title>
-     Iterable type variance example
-    </title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-interface Example {
-    public function method(array $array): iterable;
-}
-
-class ExampleImplementation implements Example {
-    public function method(iterable $iterable): array {
-        // Parameter broadened and return type narrowed.
-    }
-}
-
 ?>
 ]]>
     </programlisting>
diff --git a/language/types/string.xml b/language/types/string.xml
index a9c6df6fbd..ab35f62c31 100644
--- a/language/types/string.xml
+++ b/language/types/string.xml
@@ -808,8 +808,9 @@ echo "I'd like an {${beers::$ale}}\n";
 
    <note>
     <simpara>
-     <type>String</type>s may also be accessed using braces, as in
+     Prior to PHP 8.0.0, <type>string</type>s could also be accessed using braces, as in
      <varname>$str{42}</varname>, for the same purpose.
+     This curly brace syntax was deprecated as of PHP 7.4.0 and no longer supported as of PHP 8.0.0.
     </simpara>
    </note>
 
diff --git a/language/variables.xml b/language/variables.xml
index 34d1da6bf7..e0ca007d88 100644
--- a/language/variables.xml
+++ b/language/variables.xml
@@ -463,7 +463,7 @@ function test()
    </para>
 
    <para>
-    Static variables can be assigned values which are the,
+    Static variables can be assigned values which are the
     result of constant expressions, but dynamic expressions, such as function
     calls, will cause a parse error.
    </para>
diff --git a/language/wrappers/php.xml b/language/wrappers/php.xml
index b72abd763f..7b7d52f166 100644
--- a/language/wrappers/php.xml
+++ b/language/wrappers/php.xml
@@ -42,12 +42,7 @@
    <title>php://input</title>
    <simpara>
     <filename>php://input</filename> is a read-only stream that allows you to
-    read raw data from the request body. In the case of POST requests, it is
-    preferable to use <filename>php://input</filename> instead of <varname>$HTTP_RAW_POST_DATA</varname> as it does not depend
-    on special &php.ini; directives. Moreover, for those cases where
-    <varname>$HTTP_RAW_POST_DATA</varname> is not populated by default, it is a
-    potentially less memory intensive alternative to activating
-    <literal>always_populate_raw_post_data</literal>.
+    read raw data from the request body.
     <filename>php://input</filename> is not available with
     <literal>enctype="multipart/form-data"</literal>.
    </simpara>
diff --git a/reference/apache/functions/apache-child-terminate.xml b/reference/apache/functions/apache-child-terminate.xml
index 26415a9fa9..798a2d83b0 100644
--- a/reference/apache/functions/apache-child-terminate.xml
+++ b/reference/apache/functions/apache-child-terminate.xml
@@ -26,6 +26,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/apache/functions/apache-get-modules.xml b/reference/apache/functions/apache-get-modules.xml
index e8327c2646..560f129aa0 100644
--- a/reference/apache/functions/apache-get-modules.xml
+++ b/reference/apache/functions/apache-get-modules.xml
@@ -16,6 +16,11 @@
    Get a list of loaded Apache modules.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/apache/functions/apache-get-version.xml b/reference/apache/functions/apache-get-version.xml
index 439d4f3fad..354f59baf6 100644
--- a/reference/apache/functions/apache-get-version.xml
+++ b/reference/apache/functions/apache-get-version.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/apache/functions/apache-request-headers.xml b/reference/apache/functions/apache-request-headers.xml
index 7fda5a7a00..722b2555a3 100644
--- a/reference/apache/functions/apache-request-headers.xml
+++ b/reference/apache/functions/apache-request-headers.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/apache/functions/apache-response-headers.xml b/reference/apache/functions/apache-response-headers.xml
index dbd4b0997f..2171f80519 100644
--- a/reference/apache/functions/apache-response-headers.xml
+++ b/reference/apache/functions/apache-response-headers.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/apache/functions/getallheaders.xml b/reference/apache/functions/getallheaders.xml
index ed4a805632..7d232bb536 100644
--- a/reference/apache/functions/getallheaders.xml
+++ b/reference/apache/functions/getallheaders.xml
@@ -23,6 +23,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/apcu/apcuiterator/construct.xml b/reference/apcu/apcuiterator/construct.xml
index 070f843069..0693c0bd5a 100644
--- a/reference/apcu/apcuiterator/construct.xml
+++ b/reference/apcu/apcuiterator/construct.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <methodname>APCUIterator::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>search</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>search</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>format</parameter><initializer>APC_ITER_ALL</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>chunk_size</parameter><initializer>100</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>list</parameter><initializer>APC_LIST_ACTIVE</initializer></methodparam>
@@ -28,10 +28,10 @@
     <term><parameter>search</parameter></term>
     <listitem>
      <para>
-      A <link linkend="book.pcre">PCRE</link> regular expression that
-      matches against APCu key names, either as a <type>string</type> for
-      a single regular expression, or as an <type>array</type> of regular
-      expressions. Or, optionally pass in &null; to skip the search.
+      Either a <link linkend="book.pcre">PCRE</link> regular expression that
+      matches against APCu key names, given as a &string;.
+      Or an &array; of &string;s with APCu key names.
+      Or, optionally &null; to skip the search.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/apcu/book.xml b/reference/apcu/book.xml
index 9672719dd6..d38cc557a8 100644
--- a/reference/apcu/book.xml
+++ b/reference/apcu/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.apcu" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>APC User Cache</title>
  <titleabbrev>APCu</titleabbrev>
 
diff --git a/reference/apcu/functions/apcu-dec.xml b/reference/apcu/functions/apcu-dec.xml
index cc43e0ede1..5c3463df3c 100644
--- a/reference/apcu/functions/apcu-dec.xml
+++ b/reference/apcu/functions/apcu-dec.xml
@@ -68,28 +68,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>5.1.12</entry>
-      <entry>
-       The <parameter>ttl</parameter> parameter has been added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/apcu/functions/apcu-fetch.xml b/reference/apcu/functions/apcu-fetch.xml
index 562a032094..a35e061357 100644
--- a/reference/apcu/functions/apcu-fetch.xml
+++ b/reference/apcu/functions/apcu-fetch.xml
@@ -50,6 +50,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PECL apcu 3.0.17</entry>
+      <entry>
+       The <parameter>success</parameter> parameter was added.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -74,28 +96,6 @@ string(3) "BAR"
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL apcu 3.0.17</entry>
-      <entry>
-       The <parameter>success</parameter> parameter was added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/apcu/functions/apcu-inc.xml b/reference/apcu/functions/apcu-inc.xml
index 15c5e5d0ca..ae5b6a095c 100644
--- a/reference/apcu/functions/apcu-inc.xml
+++ b/reference/apcu/functions/apcu-inc.xml
@@ -68,28 +68,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>5.1.12</entry>
-      <entry>
-       The <parameter>ttl</parameter> parameter has been added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/array/constants.xml b/reference/array/constants.xml
index 6325e367f6..3e05e33685 100644
--- a/reference/array/constants.xml
+++ b/reference/array/constants.xml
@@ -107,7 +107,7 @@
    <listitem>
     <simpara>
     <constant>SORT_LOCALE_STRING</constant> is used to compare items as
-    strings, based on the current locale. Added in PHP 5.0.2.
+    strings, based on the current locale.
     </simpara>
    </listitem>
   </varlistentry>
@@ -119,7 +119,7 @@
    <listitem>
     <simpara>
     <constant>SORT_NATURAL</constant> is used to compare items as
-    strings using "natural ordering" like <function>natsort</function>. Added in PHP 5.4.0.
+    strings using "natural ordering" like <function>natsort</function>.
     </simpara>
    </listitem>
   </varlistentry>
@@ -133,7 +133,7 @@
     <constant>SORT_FLAG_CASE</constant> can be combined
          (bitwise OR) with
          <constant>SORT_STRING</constant> or
-         <constant>SORT_NATURAL</constant> to sort strings case-insensitively. Added in PHP 5.4.0.
+         <constant>SORT_NATURAL</constant> to sort strings case-insensitively.
     </simpara>
    </listitem>
   </varlistentry>
@@ -151,7 +151,6 @@
     <simpara>
      <constant>ARRAY_FILTER_USE_KEY</constant> is used with
      <function>array_filter</function> to pass each key as the first argument to the given callback function.
-     Added in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -164,7 +163,6 @@
     <simpara>
      <constant>ARRAY_FILTER_USE_BOTH</constant> is used with
      <function>array_filter</function> to pass both value and key to the given callback function.
-     Added in PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/array/functions/array-column.xml b/reference/array/functions/array-column.xml
index 095b39f86f..efe17ae346 100644
--- a/reference/array/functions/array-column.xml
+++ b/reference/array/functions/array-column.xml
@@ -91,13 +91,6 @@
         will no longer be cast to string and will now throw a <classname>TypeError</classname> instead.
        </entry>
       </row>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        Added the ability for the <parameter>array</parameter> parameter to be
-        an array of objects.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
@@ -282,18 +275,6 @@ Array
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.arraycolumn.compat;">Recommended
-     userland implementation for PHP lower than 5.5</link>
-    </member>
-   </simplelist>
-  </para>
- </refsect1> 
-
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/array/functions/array-fill.xml b/reference/array/functions/array-fill.xml
index 2209ac7577..08d8b8b6e2 100644
--- a/reference/array/functions/array-fill.xml
+++ b/reference/array/functions/array-fill.xml
@@ -81,31 +81,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        <parameter>count</parameter> may now be zero. Previously,
-        <parameter>count</parameter> was required to be greater than zero.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/array/functions/array-filter.xml b/reference/array/functions/array-filter.xml
index 5a84b90c3d..da972c4354 100644
--- a/reference/array/functions/array-filter.xml
+++ b/reference/array/functions/array-filter.xml
@@ -104,14 +104,6 @@
        <parameter>callback</parameter> is nullable now.
       </entry>
      </row>
-     <row>
-      <entry>5.6.0</entry>
-      <entry>
-       Added optional <parameter>mode</parameter> parameter and constants 
-       <constant>ARRAY_FILTER_USE_KEY</constant> and 
-       <constant>ARRAY_FILTER_USE_BOTH</constant>
-      </entry>
-     </row>
     </tbody>
    </tgroup>
   </informaltable>
@@ -254,11 +246,12 @@ array(2) {
    </para>
   </caution>
  </refsect1>
- 
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>array_intersect</function></member>
     <member><function>array_map</function></member>
     <member><function>array_reduce</function></member>
     <member><function>array_walk</function></member>
diff --git a/reference/array/functions/array-map.xml b/reference/array/functions/array-map.xml
index 7c9ac5bbdd..9ef72c0738 100644
--- a/reference/array/functions/array-map.xml
+++ b/reference/array/functions/array-map.xml
@@ -22,7 +22,9 @@
    used as arguments for the callback.
    The number of parameters that the <parameter>callback</parameter>
    function accepts should match the number of arrays
-   passed to <function>array_map</function>.
+   passed to <function>array_map</function>. Excess
+   input arrays are ignored. An <classname>ArgumentCountError</classname>
+   is thrown if an insufficient number of arguments is provided.
   </para>
  </refsect1>
 
@@ -118,15 +120,20 @@ Array
   </para>
   <para>
    <example>
-    <title><function>array_map</function> using a lambda function (as of PHP 5.3.0)</title>
+    <title><function>array_map</function> using a lambda function</title>
     <programlisting role="php">
 <![CDATA[
 <?php
-$func = function($value) {
+$func = function(int $value): int {
     return $value * 2;
 };
 
 print_r(array_map($func, range(1, 5)));
+
+// Or as of PHP 7.4.0:
+
+print_r(array_map(fn($value): int => $value * 2, range(1, 5)));
+
 ?>
 ]]>
     </programlisting>
@@ -150,12 +157,12 @@ Array
     <programlisting role="php">
 <![CDATA[
 <?php
-function show_Spanish($n, $m)
+function show_Spanish(int $n, string $m): string
 {
     return "The number {$n} is called {$m} in Spanish";
 }
 
-function map_Spanish($n, $m)
+function map_Spanish(int $n, string $m): array
 {
     return [$n => $m];
 }
@@ -371,6 +378,44 @@ array(1) {
     string(5) "value"
   }
 }
+]]>
+    </screen>
+   </example>
+   <example>
+    <title><function>array_map</function> - associative arrays</title>
+    <para>
+     While <function>array_map</function> does not directly support
+     using the array key as an input, that may be simulated using <function>array_keys</function>.
+    </para>
+    <programlisting role="php">
+<![CDATA[
+<?php
+$arr = [
+    'v1' => 'First release',
+    'v2' => 'Second release',
+    'v3' => 'Third release',
+];
+
+// Note: Before 7.4.0, use the longer syntax for anonymous functions instead.
+$callback = fn(string $k, string $v): string => "$k was the $v";
+
+$result = array_map($callback, array_keys($arr), array_values($arr));
+
+var_dump($result);
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+array(3) {
+  [0]=>
+  string(24) "v1 was the First release"
+  [1]=>
+  string(25) "v2 was the Second release"
+  [2]=>
+  string(24) "v3 was the Third release"
+}
 ]]>
     </screen>
    </example>
diff --git a/reference/array/functions/array-multisort.xml b/reference/array/functions/array-multisort.xml
index 9d8144f103..96fe901f59 100644
--- a/reference/array/functions/array-multisort.xml
+++ b/reference/array/functions/array-multisort.xml
@@ -263,7 +263,7 @@ foreach ($data as $key => $row) {
     $edition[$key] = $row['edition'];
 }
 
-// as of PHP 5.5.0 you can use array_column() instead of the above code
+// you can use array_column() instead of the above code
 $volume  = array_column($data, 'volume');
 $edition = array_column($data, 'edition');
 
diff --git a/reference/array/functions/array-unique.xml b/reference/array/functions/array-unique.xml
index 2d55489811..d44bcb9864 100644
--- a/reference/array/functions/array-unique.xml
+++ b/reference/array/functions/array-unique.xml
@@ -162,7 +162,17 @@ array(2) {
    </example>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <simpara>
+    Note that <function>array_unique</function> is not intended to
+    work on multi dimensional arrays.
+   </simpara>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -172,16 +182,6 @@ array(2) {
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Note that <function>array_unique</function> is not intended to 
-    work on multi dimensional arrays.
-   </simpara>
-  </note>
- </refsect1>
-
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/array/functions/array-walk-recursive.xml b/reference/array/functions/array-walk-recursive.xml
index 71170f555b..5f02e03419 100644
--- a/reference/array/functions/array-walk-recursive.xml
+++ b/reference/array/functions/array-walk-recursive.xml
@@ -11,7 +11,7 @@
    <type>bool</type><methodname>array_walk_recursive</methodname>
    <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
    <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>arg</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Applies the user-defined <parameter>callback</parameter> function to each
@@ -52,10 +52,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>userdata</parameter></term>
+     <term><parameter>arg</parameter></term>
      <listitem>
       <para>
-       If the optional <parameter>userdata</parameter> parameter is supplied,
+       If the optional <parameter>arg</parameter> parameter is supplied,
        it will be passed as the third parameter to the
        <parameter>callback</parameter>.
       </para>
diff --git a/reference/array/functions/array-walk.xml b/reference/array/functions/array-walk.xml
index f042383e54..850606e97b 100644
--- a/reference/array/functions/array-walk.xml
+++ b/reference/array/functions/array-walk.xml
@@ -11,7 +11,7 @@
    <type>bool</type><methodname>array_walk</methodname>
    <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
    <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>arg</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <simpara>
    Applies the user-defined <parameter>callback</parameter> function to each
@@ -71,10 +71,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>userdata</parameter></term>
+     <term><parameter>arg</parameter></term>
      <listitem>
       <para>
-       If the optional <parameter>userdata</parameter> parameter is supplied,
+       If the optional <parameter>arg</parameter> parameter is supplied,
        it will be passed as the third parameter to the
        <parameter>callback</parameter>.
       </para>
diff --git a/reference/array/functions/arsort.xml b/reference/array/functions/arsort.xml
index a79e7c37b7..edd9e4b60b 100644
--- a/reference/array/functions/arsort.xml
+++ b/reference/array/functions/arsort.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.arsort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>arsort</refname>
-  <refpurpose>Sort an array in reverse order and maintain index association</refpurpose>
+  <refpurpose>Sort an array in descending order and maintain index association</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   This function sorts an array such that array indices maintain their
+   This function sorts an array in descending order such that array indices maintain their
    correlation with the array elements they are associated with.
   </para>
   <para>
diff --git a/reference/array/functions/asort.xml b/reference/array/functions/asort.xml
index 9707da9769..4dc47b979d 100644
--- a/reference/array/functions/asort.xml
+++ b/reference/array/functions/asort.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.asort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>asort</refname>
-  <refpurpose>Sort an array and maintain index association</refpurpose>
+  <refpurpose>Sort an array in ascending order and maintain index association</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   This function sorts an array such that array indices maintain
+   This function sorts an array in ascending order such that array indices maintain
    their correlation with the array elements they are associated
    with.  This is used mainly when sorting associative arrays where
    the actual element order is significant.
diff --git a/reference/array/functions/count.xml b/reference/array/functions/count.xml
index 3e9c1f4f7e..d528048616 100644
--- a/reference/array/functions/count.xml
+++ b/reference/array/functions/count.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+
 <refentry xml:id="function.count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>count</refname>
   <refpurpose>Count all elements in an array, or something in an object</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -29,6 +31,7 @@
    are implemented and used in PHP.
   </para>
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -63,6 +66,7 @@
    </variablelist>
   </para>
  </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -74,6 +78,37 @@
    <literal>0</literal> will be returned.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <function>count</function> will now throw <classname>TypeError</classname> on 
+       invalid countable types passed to the <parameter>value</parameter> parameter.
+      </entry>
+     </row>
+     <row>
+      <entry>7.2.0</entry>
+      <entry>
+       <function>count</function> will now yield a warning on invalid countable types 
+       passed to the <parameter>value</parameter> parameter.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -87,6 +122,28 @@ $a[1] = 3;
 $a[2] = 5;
 var_dump(count($a));
 
+$b[0]  = 7;
+$b[5]  = 9;
+$b[10] = 11;
+var_dump(count($b));
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen role="php">
+<![CDATA[
+int(3)
+int(3)
+]]>
+    </screen>
+   </example>
+  </para>
+  <para>
+   <example>
+    <title><function>count</function> non Countable|array example (bad example - don't do this)</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
 $b[0]  = 7;
 $b[5]  = 9;
 $b[10] = 11;
@@ -102,13 +159,28 @@ var_dump(count(false));
     <screen role="php">
 <![CDATA[
 int(3)
+int(0)
+int(1)
+]]>
+    </screen>
+    &example.outputs.72;
+    <screen role="php">
+<![CDATA[
 int(3)
 
-Warning: count(): Parameter must be an array or an object that implements Countable in … on line 12 // as of PHP 7.2
+Warning: count(): Parameter must be an array or an object that implements Countable in … on line 12
 int(0)
 
-Warning: count(): Parameter must be an array or an object that implements Countable in … on line 14 // as of PHP 7.2
+Warning: count(): Parameter must be an array or an object that implements Countable in … on line 14
 int(1)
+]]>
+    </screen>
+    &example.outputs.8;
+    <screen role="php">
+<![CDATA[
+int(3)
+
+Fatal error: Uncaught TypeError: count(): Argument #1 ($var) must be of type Countable .. on line 12
 ]]>
     </screen>
    </example>
@@ -134,28 +206,7 @@ echo count($food); // output 2
    </example>
   </para>
  </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>7.2.0</entry>
-      <entry>
-       <function>count</function> will now yield a warning on invalid countable types 
-       passed to the <parameter>value</parameter> parameter.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -168,7 +219,9 @@ echo count($food); // output 2
    </simplelist>
   </para>
  </refsect1>
+
 </refentry>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/array/functions/current.xml b/reference/array/functions/current.xml
index 02bfd3f31a..68634ea855 100644
--- a/reference/array/functions/current.xml
+++ b/reference/array/functions/current.xml
@@ -43,31 +43,7 @@
   </para>
   &return.falseproblem;
  </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        <parameter>array</parameter> is now always passed by value.
-        Prior to this version, it was passed by reference if possible,
-        and by value otherwise.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -103,7 +79,7 @@ var_dump(current($arr)); // array(0) { }
     and on an array, whose internal pointer points beyond the end of the elements,
     are indistinguishable from a <type>bool</type> &false; element. 
     To properly traverse an array which may contain &false; elements, see the 
-    <function>foreach</function> function.
+    &foreach; control structure.
    </simpara>
    <simpara>
     To still use <function>current</function> and properly check if the value 
@@ -123,6 +99,7 @@ var_dump(current($arr)); // array(0) { }
     <member><function>prev</function></member>
     <member><function>reset</function></member>
     <member><function>next</function></member>
+    <member>&foreach;</member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/array/functions/key.xml b/reference/array/functions/key.xml
index 5a1c098c1e..dabf71a2a0 100644
--- a/reference/array/functions/key.xml
+++ b/reference/array/functions/key.xml
@@ -42,31 +42,7 @@
    empty, <function>key</function> returns &null;.
   </para>
  </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        <parameter>array</parameter> is now always passed by value.
-        Prior to this version, it was passed by reference if possible,
-        and by value otherwise.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/array/functions/krsort.xml b/reference/array/functions/krsort.xml
index 24d45acf59..7c9460205f 100644
--- a/reference/array/functions/krsort.xml
+++ b/reference/array/functions/krsort.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.krsort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>krsort</refname>
-  <refpurpose>Sort an array by key in reverse order</refpurpose>
+  <refpurpose>Sort an array by key in descending order</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   Sorts an array by key in reverse order, maintaining key to data
+   Sorts an array by key in descending order, maintaining key to data
    correlations. This is useful mainly for associative arrays.
   </para>
  </refsect1>
diff --git a/reference/array/functions/ksort.xml b/reference/array/functions/ksort.xml
index c3eb1854ab..0ea1727933 100644
--- a/reference/array/functions/ksort.xml
+++ b/reference/array/functions/ksort.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.ksort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ksort</refname>
-  <refpurpose>Sort an array by key</refpurpose>
+  <refpurpose>Sort an array by key in ascending order</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   Sorts an array by key, maintaining key to data correlations. This is
+   Sorts an array by key in ascending order, maintaining key to data correlations. This is
    useful mainly for associative arrays.
   </para>
  </refsect1>
diff --git a/reference/array/functions/list.xml b/reference/array/functions/list.xml
index 338ae504d7..ab0b9934be 100644
--- a/reference/array/functions/list.xml
+++ b/reference/array/functions/list.xml
@@ -14,8 +14,10 @@
   </methodsynopsis>
   <para>
    Like <function>array</function>, this is not really a function,
-   but a language construct.  <function>list</function> is used to
+   but a language construct. <function>list</function> is used to
    assign a list of variables in one operation.
+   Strings can not be unpacked and <function>list</function> expressions 
+   can not be completely empty.
   </para>
   <note>
    <para>
@@ -23,24 +25,6 @@
     the numerical indices start at 0.
    </para>
   </note>
-  <warning>
-   <para>
-    In PHP 5, <function>list</function> assigns the values starting with the
-    right-most parameter. In PHP 7, <function>list</function> starts with the
-    left-most parameter.
-   </para>
-   <para>
-   If you are using plain variables, you don't have to worry about this. But
-   if you are using arrays with indices you usually expect the order of the
-   indices in the array the same you wrote in the <function>list</function>
-   from left to right, which is not the case in PHP 5, as it's assigned in the
-   reverse order.
-   </para>
-   <para>
-    Generally speaking, it is advisable to avoid relying on a specific order
-    of operation, as this may change again in the future.
-   </para>
-  </warning>
  </refsect1>
  <refsect1 role="parameters">
   &reftitle.parameters;
@@ -98,26 +82,6 @@
         enables destructuring of arrays with non-integer or non-sequential keys.
        </entry>
       </row>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        The order that the assignment operations are performed in has
-        changed.
-       </entry>
-      </row>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        <function>list</function> expressions can no longer be completely
-        empty.
-       </entry>
-      </row>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        Strings can no longer be unpacked.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
@@ -159,24 +123,12 @@ var_dump($bar); // NULL
     <title>An example use of <function>list</function></title>
     <programlisting role="php">
 <![CDATA[
-<table>
- <tr>
-  <th>Employee name</th>
-  <th>Salary</th>
- </tr>
-
 <?php
-$result = $pdo->query("SELECT id, name, salary FROM employees");
-while (list($id, $name, $salary) = $result->fetch(PDO::FETCH_NUM)) {
-    echo " <tr>\n" .
-          "  <td><a href=\"info.php?id=$id\">$name</a></td>\n" .
-          "  <td>$salary</td>\n" .
-          " </tr>\n";
+$result = $pdo->query("SELECT id, name FROM employees");
+while (list($id, $name) = $result->fetch(PDO::FETCH_NUM)) {
+    echo "id: $id, name: $name\n";
 }
-
 ?>
-
-</table>
 ]]>
     </programlisting>
    </example>
@@ -200,54 +152,6 @@ var_dump($a, $b, $c);
 int(1)
 int(2)
 int(3)
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Using <function>list</function> with array indices</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$info = array('coffee', 'brown', 'caffeine');
-
-list($a[0], $a[1], $a[2]) = $info;
-
-var_dump($a);
-
-?>
-]]>
-    </programlisting>
-    <para>
-     Gives the following output (note the order of the elements compared in
-     which order they were written in the <function>list</function> syntax):
-    </para>
-    &example.outputs.7;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(6) "coffee"
-  [1]=>
-  string(5) "brown"
-  [2]=>
-  string(8) "caffeine"
-}
-]]>
-    </screen>
-    &example.outputs.5;
-    <screen>
-<![CDATA[
-array(3) {
-  [2]=>
-  string(8) "caffeine"
-  [1]=>
-  string(5) "brown"
-  [0]=>
-  string(6) "coffee"
-}
 ]]>
     </screen>
    </example>
diff --git a/reference/array/functions/rsort.xml b/reference/array/functions/rsort.xml
index aa5809121c..8227957645 100644
--- a/reference/array/functions/rsort.xml
+++ b/reference/array/functions/rsort.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.rsort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>rsort</refname>
-  <refpurpose>Sort an array in reverse order</refpurpose>
+  <refpurpose>Sort an array in descending order</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   This function sorts an array in reverse order (highest to lowest).
+   This function sorts an array by value in descending order.
   </para>
   &note.sort-unstable;
  </refsect1>
diff --git a/reference/array/functions/sort.xml b/reference/array/functions/sort.xml
index 9cd0a5daaa..3dd45d10e2 100644
--- a/reference/array/functions/sort.xml
+++ b/reference/array/functions/sort.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sort</refname>
-  <refpurpose>Sort an array</refpurpose>
+  <refpurpose>Sort an array in ascending order</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
@@ -13,8 +13,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   This function sorts an array.  Elements will be arranged from
-   lowest to highest when this function has completed.
+   This function sorts an array by value in ascending order.
   </para>
   &note.sort-unstable;
  </refsect1>
@@ -123,7 +122,7 @@ fruits[3] = orange20
    <simpara>
     Be careful when sorting arrays with mixed types values because
     <function>sort</function> can produce unexpected results,
-    if <parameter>flags</parameter> is <constant>SORT_REGULAR</constant>,
+    if <parameter>flags</parameter> is <constant>SORT_REGULAR</constant>.
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/array/reference.xml b/reference/array/reference.xml
index 2dfc50c546..1cfdc2cd46 100644
--- a/reference/array/reference.xml
+++ b/reference/array/reference.xml
@@ -7,7 +7,7 @@
    &reftitle.seealso;
    <para>
     See also <function>is_array</function>, <function>explode</function>,
-    <function>implode</function>, <function>split</function>,
+    <function>implode</function>,
     <function>preg_split</function>, and <function>unset</function>.
    </para>
  </partintro>
diff --git a/reference/array/sorting.xml b/reference/array/sorting.xml
index 8fdaa0ae59..3eb402c39f 100644
--- a/reference/array/sorting.xml
+++ b/reference/array/sorting.xml
@@ -30,8 +30,9 @@
     variable itself, as opposed to returning a new sorted array
    </member>
    <member>
-    If any of these sort functions evaluates two members as equal then the
-    order is undefined (the sorting is not stable).
+    If any of these sort functions evaluates two members as equal
+    then they retain their original order.
+    Prior to PHP 8.0.0, their order were undefined (the sorting was not stable).
    </member>
   </simplelist>
  </para>
@@ -166,4 +167,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/bc/book.xml b/reference/bc/book.xml
index 579222db44..ed84830e80 100644
--- a/reference/bc/book.xml
+++ b/reference/bc/book.xml
@@ -16,7 +16,7 @@
   </para>
   <para>
    Valid (aka. well-formed) BCMath numbers are strings which match the regular expression
-   <literal>/^[+-]?[0]*[1-9]*[.]?[0-9]*$/</literal>.
+   <literal>/^[+-]?[0-9]*(\.[0-9]*)?$/</literal>.
   </para>
   <caution>
    <para>
@@ -24,7 +24,7 @@
     a <type>string</type> as operand may not have the desired effect due to the
     way PHP converts <type>float</type> values to <type>string</type>, namely
     that the <type>string</type> may be in exponential notation (which is not
-    supported by BCMath), and that the decimal separator is locale dependent
+    supported by BCMath), and that, prior to PHP 8.0.0, the decimal separator is locale dependent
     (while BCMath always expects a decimal point).
    </para>
    <informalexample>
diff --git a/reference/bc/functions/bcpowmod.xml b/reference/bc/functions/bcpowmod.xml
index 3af13bebf4..0d173eb0fd 100644
--- a/reference/bc/functions/bcpowmod.xml
+++ b/reference/bc/functions/bcpowmod.xml
@@ -63,17 +63,7 @@
    is <literal>0</literal> or <parameter>exponent</parameter> is negative.
   </para>
  </refsect1>
- 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Because this method uses the modulus operation, numbers which are not
-    positive integers may give unexpected results.
-   </para>
-  </note>
- </refsect1>
- 
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -118,7 +108,17 @@ $b = bcmod(bcpow($x, $y), $mod);
    </informalexample>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Because this method uses the modulus operation, numbers which are not
+    positive integers may give unexpected results.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/classkit/book.xml b/reference/classkit/book.xml
deleted file mode 100644
index 58d5ab32d9..0000000000
--- a/reference/classkit/book.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.classkit" xmlns="http://docbook.org/ns/docbook">
- <title>Classkit</title>
-
- <preface xml:id="intro.classkit">
-  &reftitle.intro;
-  <para>
-   These functions allow the dynamic manipulation of PHP classes, at runtime.
-  </para>
-  <note>
-   <para>
-    This extension has been replaced by
-    <link linkend="book.runkit7">runkit</link>, which is not limited to class
-    manipulation but has function manipulation, as well.
-   </para>
-  </note>
- </preface>
-
- &reference.classkit.setup;
- &reference.classkit.constants;
- &reference.classkit.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/classkit/configure.xml b/reference/classkit/configure.xml
deleted file mode 100644
index cd585d0a36..0000000000
--- a/reference/classkit/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="classkit.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.info.dead;
-  <link xlink:href="&url.pecl.vcs;classkit">&url.pecl.vcs;classkit</link>.
- </para>
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/constants.xml b/reference/classkit/constants.xml
deleted file mode 100644
index d8aa3ff7dd..0000000000
--- a/reference/classkit/constants.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="classkit.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.classkit-acc-private">
-    <term>
-     <constant>CLASSKIT_ACC_PRIVATE</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Marks the method <literal>private</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.classkit-acc-protected">
-    <term>
-     <constant>CLASSKIT_ACC_PROTECTED</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Marks the method <literal>protected</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.classkit-acc-public">
-    <term>
-     <constant>CLASSKIT_ACC_PUBLIC</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Marks the method <literal>public</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-</appendix>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/functions/classkit-import.xml b/reference/classkit/functions/classkit-import.xml
deleted file mode 100644
index 2316280353..0000000000
--- a/reference/classkit/functions/classkit-import.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.classkit-import" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>classkit_import</refname>
-  <refpurpose>Import new class method definitions from a file</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>classkit_import</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  &note.classkit.selfmanipulation;
-  &warn.experimental.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the class method definitions to import
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Associative array of imported methods
-  </para>
- </refsect1>
- <!-- No changelog: it's only in PECL. -->
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>classkit_import</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// file: newclass.php
-class Example {
-    function foo() {
-        return "bar!\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// requires newclass.php (see above)
-class Example {
-    function foo() {
-        return "foo!\n";
-    }
-}
-
-$e = new Example();
-
-// output original
-echo $e->foo();
-
-// import replacement method
-classkit_import('newclass.php');
-
-// output imported
-echo $e->foo();
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-foo!
-bar!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>classkit_method_add</function></member>
-    <member><function>classkit_method_copy</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/functions/classkit-method-add.xml b/reference/classkit/functions/classkit-method-add.xml
deleted file mode 100644
index cc2722caef..0000000000
--- a/reference/classkit/functions/classkit-method-add.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.classkit-method-add" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>classkit_method_add</refname>
-  <refpurpose>Dynamically adds a new method to a given class</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>classkit_method_add</methodname>
-   <methodparam><type>string</type><parameter>classname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>methodname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>args</parameter></methodparam>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>CLASSKIT_ACC_PUBLIC</initializer></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>classname</parameter></term>
-     <listitem>
-      <para>
-       The class to which this method will be added
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>methodname</parameter></term>
-     <listitem>
-      <para>
-       The name of the method to add
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>args</parameter></term>
-     <listitem>
-      <para>
-       Comma-delimited list of arguments for the newly-created method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>code</parameter></term>
-     <listitem>
-      <para>
-       The code to be evaluated when <parameter>methodname</parameter>
-       is called
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       The type of method to create, can be
-       <constant>CLASSKIT_ACC_PUBLIC</constant>,
-       <constant>CLASSKIT_ACC_PROTECTED</constant> or
-       <constant>CLASSKIT_ACC_PRIVATE</constant>
-      </para>
-      <note>
-       <para>
-        This parameter is only used as of PHP 5, because, prior to this,
-        all methods were public.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <!-- No changelog: it's only in PECL. -->
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>classkit_method_add</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class Example {
-    function foo() {
-        echo "foo!\n";
-    }
-}
-
-// create an Example object
-$e = new Example();
-
-// Add a new public method
-classkit_method_add(
-    'Example',
-    'add',
-    '$num1, $num2',
-    'return $num1 + $num2;',
-    CLASSKIT_ACC_PUBLIC
-);
-
-// add 12 + 4
-echo $e->add(12, 4);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-16
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>classkit_method_copy</function></member>
-    <member><function>classkit_method_redefine</function></member>
-    <member><function>classkit_method_remove</function></member>
-    <member><function>classkit_method_rename</function></member>
-    <member><function>create_function</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/functions/classkit-method-copy.xml b/reference/classkit/functions/classkit-method-copy.xml
deleted file mode 100644
index 755b0e32a9..0000000000
--- a/reference/classkit/functions/classkit-method-copy.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.classkit-method-copy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>classkit_method_copy</refname>
-  <refpurpose>Copies a method from class to another</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>classkit_method_copy</methodname>
-   <methodparam><type>string</type><parameter>dClass</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dMethod</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sClass</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>sMethod</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dClass</parameter></term>
-     <listitem>
-      <para>
-       Destination class for copied method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dMethod</parameter></term>
-     <listitem>
-      <para>
-       Destination method name
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sClass</parameter></term>
-     <listitem>
-      <para>
-       Source class of the method to copy
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sMethod</parameter></term>
-     <listitem>
-      <para>
-       Name of the method to copy from the source class. If this parameter is
-       omitted, the value of <parameter>dMethod</parameter> is assumed.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <!-- No changelog: it's only in PECL. -->
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>classkit_method_copy</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class Foo {
-    function example() {
-        return "foo!\n";
-    }
-}
-
-class Bar {
-    // initially, no methods
-}
-
-// copy the example() method from the Foo class to the Bar class, as baz()
-classkit_method_copy('Bar', 'baz', 'Foo', 'example');
-
-// output copied function
-echo Bar::baz();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-foo!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>classkit_method_add</function></member>
-    <member><function>classkit_method_redefine</function></member>
-    <member><function>classkit_method_remove</function></member>
-    <member><function>classkit_method_rename</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/functions/classkit-method-redefine.xml b/reference/classkit/functions/classkit-method-redefine.xml
deleted file mode 100644
index caf38d1fc1..0000000000
--- a/reference/classkit/functions/classkit-method-redefine.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.classkit-method-redefine" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>classkit_method_redefine</refname>
-  <refpurpose>Dynamically changes the code of the given method</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>classkit_method_redefine</methodname>
-   <methodparam><type>string</type><parameter>classname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>methodname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>args</parameter></methodparam>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>CLASSKIT_ACC_PUBLIC</initializer></methodparam>
-  </methodsynopsis>
-  &note.classkit.selfmanipulation;
-  &warn.experimental.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>classname</parameter></term>
-     <listitem>
-      <para>
-       The class in which to redefine the method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>methodname</parameter></term>
-     <listitem>
-      <para>
-       The name of the method to redefine
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>args</parameter></term>
-     <listitem>
-      <para>
-       Comma-delimited list of arguments for the redefined method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>code</parameter></term>
-     <listitem>
-      <para>
-       The new code to be evaluated when <parameter>methodname</parameter>
-       is called
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       The redefined method can be
-       <constant>CLASSKIT_ACC_PUBLIC</constant>,
-       <constant>CLASSKIT_ACC_PROTECTED</constant> or
-       <constant>CLASSKIT_ACC_PRIVATE</constant>
-      </para>
-      <note>
-       <para>
-        This parameter is only used as of PHP 5, because, prior to this,
-        all methods were public.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <!-- No changelog: it's only in PECL. -->
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>classkit_method_redefine</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class Example {
-    function foo() {
-        return "foo!\n";
-    }
-}
-
-// create an Example object
-$e = new Example();
-
-// output Example::foo() (before redefine)
-echo "Before: " . $e->foo();
-
-// Redefine the 'foo' method
-classkit_method_redefine(
-    'Example',
-    'foo',
-    '',
-    'return "bar!\n";',
-    CLASSKIT_ACC_PUBLIC
-);
-
-// output Example::foo() (after redefine)
-echo "After: " . $e->foo();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Before: foo!
-After: bar!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>classkit_method_add</function></member>
-    <member><function>classkit_method_copy</function></member>
-    <member><function>classkit_method_remove</function></member>
-    <member><function>classkit_method_rename</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/functions/classkit-method-remove.xml b/reference/classkit/functions/classkit-method-remove.xml
deleted file mode 100644
index 5e3a03c98b..0000000000
--- a/reference/classkit/functions/classkit-method-remove.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.classkit-method-remove" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>classkit_method_remove</refname>
-  <refpurpose>Dynamically removes the given method</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>classkit_method_remove</methodname>
-   <methodparam><type>string</type><parameter>classname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>methodname</parameter></methodparam>
-  </methodsynopsis>
-  &note.classkit.selfmanipulation;
-  &warn.experimental.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>classname</parameter></term>
-     <listitem>
-      <para>
-       The class in which to remove the method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>methodname</parameter></term>
-     <listitem>
-      <para>
-       The name of the method to remove
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <!-- No changelog: it's only in PECL. -->
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>classkit_method_remove</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class Example {
-    function foo() {
-        return "foo!\n";
-    }
-    
-    function bar() {
-        return "bar!\n";
-    }
-}
-
-// Remove the 'foo' method
-classkit_method_remove(
-    'Example',
-    'foo'
-);
-
-echo implode(' ', get_class_methods('Example'));
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bar
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>classkit_method_add</function></member>
-    <member><function>classkit_method_copy</function></member>
-    <member><function>classkit_method_redefine</function></member>
-    <member><function>classkit_method_rename</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/functions/classkit-method-rename.xml b/reference/classkit/functions/classkit-method-rename.xml
deleted file mode 100644
index 8f4a638a91..0000000000
--- a/reference/classkit/functions/classkit-method-rename.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.classkit-method-rename" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>classkit_method_rename</refname>
-  <refpurpose>Dynamically changes the name of the given method</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>classkit_method_rename</methodname>
-   <methodparam><type>string</type><parameter>classname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>methodname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>newname</parameter></methodparam>
-  </methodsynopsis>
-  &note.classkit.selfmanipulation;
-  &warn.experimental.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>classname</parameter></term>
-     <listitem>
-      <para>
-       The class in which to rename the method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>methodname</parameter></term>
-     <listitem>
-      <para>
-       The name of the method to rename
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>newname</parameter></term>
-     <listitem>
-      <para>
-       The new name to give to the renamed method
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <!-- No changelog: it's only in PECL. -->
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>classkit_method_rename</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class Example {
-    function foo() {
-        return "foo!\n";
-    }
-}
-
-// Rename the 'foo' method to 'bar'
-classkit_method_rename(
-    'Example',
-    'foo',
-    'bar'
-);
-
-// output renamed function
-echo Example::bar();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-foo!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>classkit_method_add</function></member>
-    <member><function>classkit_method_copy</function></member>
-    <member><function>classkit_method_redefine</function></member>
-    <member><function>classkit_method_remove</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/ini.xml b/reference/classkit/ini.xml
deleted file mode 100644
index 2dc7deb8fc..0000000000
--- a/reference/classkit/ini.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="classkit.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &no.config;
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/classkit/reference.xml b/reference/classkit/reference.xml
deleted file mode 100644
index ccbc921110..0000000000
--- a/reference/classkit/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.classkit" xmlns="http://docbook.org/ns/docbook">
- <title>Classkit &Functions;</title>
-
- &reference.classkit.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/classkit/setup.xml b/reference/classkit/setup.xml
deleted file mode 100644
index ba2b85414d..0000000000
--- a/reference/classkit/setup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="classkit.setup">
- &reftitle.setup;
-
- <section xml:id="classkit.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
-
- &reference.classkit.configure;
-
- &reference.classkit.ini;
-
- <section xml:id="classkit.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/classkit/versions.xml b/reference/classkit/versions.xml
deleted file mode 100644
index 8bfa1bdf62..0000000000
--- a/reference/classkit/versions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions> 
- <function name='classkit_aggregate_methods' from='PECL classkit &gt;= 0.3'/>
- <function name='classkit_doc_comments' from='PECL classkit &gt;= 0.4'/>
- <function name='classkit_import' from='PECL classkit &gt;= 0.3'/>
- <function name='classkit_method_add' from='PECL classkit &gt;= 0.1'/>
- <function name='classkit_method_copy' from='PECL classkit &gt;= 0.2'/>
- <function name='classkit_method_redefine' from='PECL classkit &gt;= 0.1'/>
- <function name='classkit_method_remove' from='PECL classkit &gt;= 0.1'/>
- <function name='classkit_method_rename' from='PECL classkit &gt;= 0.1'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/classobj/examples.xml b/reference/classobj/examples.xml
index dbdf80d34c..4c425474da 100644
--- a/reference/classobj/examples.xml
+++ b/reference/classobj/examples.xml
@@ -6,62 +6,66 @@
  <para>
   In this example, we first define a base class and an extension
   of the class. The base class describes a general vegetable,
-  whether it is edible or not and what is its color. The subclass
+  whether it is edible, and what is its color. The subclass
   <varname>Spinach</varname> adds a method to cook it and another to
   find out if it is cooked.
  </para>
  <para>
   <example>
-   <title>classes.inc</title>
+   <title>Class Definitions</title>
+   <para><varname>Vegetable</varname></para>
    <programlisting role="php">
 <![CDATA[
 <?php
 
-// base class with member properties and methods
 class Vegetable {
+    public $edible;
 
-   var $edible;
-   var $color;
+    public $color;
 
-   function __construct($edible, $color="green")
-   {
-       $this->edible = $edible;
-       $this->color = $color;
-   }
+    public function __construct($edible, $color = "green")
+    {
+        $this->edible = $edible;
+        $this->color = $color;
+    }
 
-   function is_edible()
-   {
-       return $this->edible;
-   }
+    public function isEdible()
+    {
+        return $this->edible;
+    }
 
-   function what_color()
-   {
-       return $this->color;
-   }
+    public function getColor()
+    {
+        return $this->color;
+    }
+}
 
-} // end of class Vegetable
+?>
+]]>
+   </programlisting>
+   <para><varname>Spinach</varname></para>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-// extends the base class
 class Spinach extends Vegetable {
+    public $cooked = false;
 
-   var $cooked = false;
+    public function __construct()
+    {
+        parent::__construct(true, "green");
+    }
 
-   function __construct()
-   {
-       parent::__construct(true, "green");
-   }
+    public function cook()
+    {
+        $this->cooked = true;
+    }
 
-   function cook_it()
-   {
-       $this->cooked = true;
-   }
-
-   function is_cooked()
-   {
-       return $this->cooked;
-   }
-
-} // end of class Spinach
+    public function isCooked()
+    {
+        return $this->cooked;
+    }
+}
 
 ?>
 ]]>
@@ -79,40 +83,37 @@ class Spinach extends Vegetable {
    <title>test_script.php</title>
    <programlisting role="php">
 <![CDATA[
-<pre>
 <?php
 
-include "classes.inc";
+// register autoloader to load classes
+spl_autoload_register();
 
-// utility functions
-
-function print_vars($obj)
+function printProperties($obj)
 {
-foreach (get_object_vars($obj) as $prop => $val) {
-    echo "\t$prop = $val\n";
-}
+    foreach (get_object_vars($obj) as $prop => $val) {
+        echo "\t$prop = $val\n";
+    }
 }
 
-function print_methods($obj)
+function printMethods($obj)
 {
-$arr = get_class_methods(get_class($obj));
-foreach ($arr as $method) {
-    echo "\tfunction $method()\n";
-}
+    $arr = get_class_methods(get_class($obj));
+    foreach ($arr as $method) {
+        echo "\tfunction $method()\n";
+    }
 }
 
-function class_parentage($obj, $class)
+function objectBelongsTo($obj, $class)
 {
-if (is_subclass_of($GLOBALS[$obj], $class)) {
-    echo "Object $obj belongs to class " . get_class($GLOBALS[$obj]);
-    echo ", a subclass of $class\n";
-} else {
-    echo "Object $obj does not belong to a subclass of $class\n";
-}
+    if (is_subclass_of($obj, $class)) {
+        echo "Object belongs to class " . get_class($obj);
+        echo ", a subclass of $class\n";
+    } else {
+        echo "Object does not belong to a subclass of $class\n";
+    }
 }
 
 // instantiate 2 objects
-
 $veggie = new Vegetable(true, "blue");
 $leafy = new Spinach();
 
@@ -123,34 +124,47 @@ echo ", PARENT " . get_parent_class($leafy) . "\n";
 
 // show veggie properties
 echo "\nveggie: Properties\n";
-print_vars($veggie);
+printProperties($veggie);
 
 // and leafy methods
 echo "\nleafy: Methods\n";
-print_methods($leafy);
+printMethods($leafy);
 
 echo "\nParentage:\n";
-class_parentage("leafy", "Spinach");
-class_parentage("leafy", "Vegetable");
+objectBelongsTo($leafy, Spinach::class);
+objectBelongsTo($leafy, Vegetable::class);
+
 ?>
-</pre>
 ]]>
    </programlisting>
+   &examples.outputs;
+   <screen>
+<![CDATA[
+veggie: CLASS Vegetable
+leafy: CLASS Spinach, PARENT Vegetable
+
+veggie: Properties
+        edible = 1
+        color = blue
+
+leafy: Methods
+        function __construct()
+        function cook()
+        function isCooked()
+        function isEdible()
+        function getColor()
+
+Parentage:
+Object does not belong to a subclass of Spinach
+Object belongs to class Spinach, a subclass of Vegetable
+]]>
+   </screen>
    <para>
     One important thing to note in the example above is that
     the object <varname>$leafy</varname> is an instance of the class
     <classname>Spinach</classname> which is a subclass of
-    <classname>Vegetable</classname>,
-    therefore the last part of the script above will output:
+    <classname>Vegetable</classname>.
    </para>
-   <screen>
-<![CDATA[
-   [...]
-Parentage:
-Object leafy does not belong to a subclass of Spinach
-Object leafy belongs to class spinach, a subclass of Vegetable
-]]>
-   </screen>
   </example>
  </para>
 </appendix>
@@ -175,4 +189,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/classobj/functions/class-alias.xml b/reference/classobj/functions/class-alias.xml
index b2da5a50ff..60190f2051 100644
--- a/reference/classobj/functions/class-alias.xml
+++ b/reference/classobj/functions/class-alias.xml
@@ -9,13 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>class_alias</methodname>
-   <methodparam><type>string</type><parameter>original</parameter></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type>string</type><parameter>alias</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>autoload</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Creates an alias named <parameter>alias</parameter>
-   based on the user defined class <parameter>original</parameter>.
+   based on the user defined class <parameter>class</parameter>.
    The aliased class is exactly the same as the original class.
   </para>
  </refsect1>
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>original</parameter></term>
+     <term><parameter>class</parameter></term>
      <listitem>
       <para>
        The original class.
@@ -112,7 +112,6 @@ bool(true)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/class-exists.xml b/reference/classobj/functions/class-exists.xml
index 4c0d2d83e9..95f3c549be 100644
--- a/reference/classobj/functions/class-exists.xml
+++ b/reference/classobj/functions/class-exists.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>class_exists</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>autoload</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>class_name</parameter></term>
+     <term><parameter>class</parameter></term>
      <listitem>
       <para>
        The class name. The name is matched in a case-insensitive manner.
@@ -32,7 +32,7 @@
      <term><parameter>autoload</parameter></term>
      <listitem>
       <para>
-       Whether or not to call &link.autoload; by default.
+       Whether to call &link.autoload; by default.
       </para>
      </listitem>
     </varlistentry>
@@ -42,7 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if <parameter>class_name</parameter> is a defined class,
+   Returns &true; if <parameter>class</parameter> is a defined class,
    &false; otherwise.
   </para>
  </refsect1>
@@ -68,17 +68,16 @@ if (class_exists('MyClass')) {
     <programlisting role="php">
 <![CDATA[
 <?php
-function __autoload($class)
-{
-    include($class . '.php');
+spl_autoload_register(function ($class_name) {
+    include $class_name . '.php';
 
     // Check to see whether the include declared the class
-    if (!class_exists($class, false)) {
-        trigger_error("Unable to load class: $class", E_USER_WARNING);
+    if (!class_exists($class_name, false)) {
+        throw new LogicException("Unable to load class: $class_name");
     }
-}
+});
 
-if (class_exists('MyClass')) {
+if (class_exists(MyClass::class)) {
     $myclass = new MyClass();
 }
 
@@ -99,7 +98,6 @@ if (class_exists('MyClass')) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/get-called-class.xml b/reference/classobj/functions/get-called-class.xml
index aa6dbcde14..4b35b2ffe1 100644
--- a/reference/classobj/functions/get-called-class.xml
+++ b/reference/classobj/functions/get-called-class.xml
@@ -15,6 +15,12 @@
    Gets the name of the class the static method is called in.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/classobj/functions/get-class-methods.xml b/reference/classobj/functions/get-class-methods.xml
index 59621988f7..9c9e7b7947 100644
--- a/reference/classobj/functions/get-class-methods.xml
+++ b/reference/classobj/functions/get-class-methods.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>get_class_methods</methodname>
-   <methodparam><type>mixed</type><parameter>class_name</parameter></methodparam>
+   <methodparam><type class="union"><type>object</type><type>string</type></type><parameter>object_or_class</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the class methods names.
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>class_name</parameter></term>
+     <term><parameter>object_or_class</parameter></term>
      <listitem>
       <para>
        The class name or an object instance
@@ -34,9 +34,32 @@
   &reftitle.returnvalues;
   <para>
    Returns an array of method names defined for the class specified by
-   <parameter>class_name</parameter>. In case of an error, it returns &null;.
+   <parameter>object_or_class</parameter>.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The <parameter>object_or_class</parameter> parameter now only accepts objects or valid class names.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -99,7 +122,6 @@ myfunc2
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/get-class-vars.xml b/reference/classobj/functions/get-class-vars.xml
index 9f388a281b..51a1a74087 100644
--- a/reference/classobj/functions/get-class-vars.xml
+++ b/reference/classobj/functions/get-class-vars.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>get_class_vars</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
   </methodsynopsis>
   <para>
    Get the default properties of the given class.
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>class_name</parameter></term>
+     <term><parameter>class</parameter></term>
      <listitem>
       <para>
        The class name
@@ -36,7 +36,7 @@
    Returns an associative array of declared properties visible from the
    current scope, with their default value.
    The resulting array elements are in the form of 
-   <literal>varname => value</literal>.
+   <literal>varname =&gt; value</literal>.
    In case of an error, it returns &false;.
   </para>
  </refsect1>
@@ -144,7 +144,6 @@ a
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/get-class.xml b/reference/classobj/functions/get-class.xml
index e997c57f9a..9451089e2e 100644
--- a/reference/classobj/functions/get-class.xml
+++ b/reference/classobj/functions/get-class.xml
@@ -193,6 +193,7 @@ string(11) "Foo\Bar\Baz"
     <member><function>get_called_class</function></member>
     <member><function>get_parent_class</function></member>
     <member><function>gettype</function></member>
+    <member><function>get_debug_type</function></member>
     <member><function>is_subclass_of</function></member>
    </simplelist>
   </para>
diff --git a/reference/classobj/functions/get-declared-classes.xml b/reference/classobj/functions/get-declared-classes.xml
index df1a0d9d00..403363259f 100644
--- a/reference/classobj/functions/get-declared-classes.xml
+++ b/reference/classobj/functions/get-declared-classes.xml
@@ -15,6 +15,12 @@
    Gets the declared classes.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/classobj/functions/get-declared-interfaces.xml b/reference/classobj/functions/get-declared-interfaces.xml
index 09b176345f..1588d17aca 100644
--- a/reference/classobj/functions/get-declared-interfaces.xml
+++ b/reference/classobj/functions/get-declared-interfaces.xml
@@ -15,6 +15,12 @@
    Gets the declared interfaces.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/classobj/functions/get-object-vars.xml b/reference/classobj/functions/get-object-vars.xml
index 8c9c274c10..f9465560b5 100644
--- a/reference/classobj/functions/get-object-vars.xml
+++ b/reference/classobj/functions/get-object-vars.xml
@@ -90,6 +90,11 @@ array(4) {
     </screen>
    </example>
   </para>
+  <note>
+   <para>
+    Uninitialized properties are considered inaccessible, and thus will not be included in the array.
+   </para>
+  </note>
  </refsect1>
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/classobj/functions/get-parent-class.xml b/reference/classobj/functions/get-parent-class.xml
index 1902372643..f89ebf6286 100644
--- a/reference/classobj/functions/get-parent-class.xml
+++ b/reference/classobj/functions/get-parent-class.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>get_parent_class</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>object</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>object</type><type>string</type></type><parameter>object_or_class</parameter></methodparam>
   </methodsynopsis>
   <para>
    Retrieves the parent class name for object or class.
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>object_or_class</parameter></term>
      <listitem>
       <para>
        The tested object or class name. This parameter is optional if called
@@ -46,6 +46,29 @@
    If called without parameter outside object, this function returns &false;.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The <parameter>object_or_class</parameter> parameter now only accepts objects or valid class names.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -55,22 +78,22 @@
 <![CDATA[
 <?php
 
-class dad {
-    function dad()
+class Dad {
+    function __construct()
     {
     // implements some logic
     }
 }
 
-class child extends dad {
-    function child()
+class Child extends Dad {
+    function __construct()
     {
         echo "I'm " , get_parent_class($this) , "'s son\n";
     }
 }
 
-class child2 extends dad {
-    function child2()
+class Child2 extends Dad {
+    function __construct()
     {
         echo "I'm " , get_parent_class('child2') , "'s son too\n";
     }
@@ -85,8 +108,8 @@ $bar = new child2();
     &example.outputs;
     <screen>
 <![CDATA[
-I'm dad's son
-I'm dad's son too
+I'm Dad's son
+I'm Dad's son too
 ]]>
     </screen>
    </example>
diff --git a/reference/classobj/functions/interface-exists.xml b/reference/classobj/functions/interface-exists.xml
index 9b7b880d4b..06302654c9 100644
--- a/reference/classobj/functions/interface-exists.xml
+++ b/reference/classobj/functions/interface-exists.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>interface_exists</methodname>
-   <methodparam><type>string</type><parameter>interface_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>interface</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>autoload</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>interface_name</parameter></term>
+     <term><parameter>interface</parameter></term>
      <listitem>
       <para>
        The interface name
@@ -43,7 +43,7 @@
   &reftitle.returnvalues;
   <para>
    Returns &true; if the interface given by 
-   <parameter>interface_name</parameter> has been defined, &false; otherwise.
+   <parameter>interface</parameter> has been defined, &false; otherwise.
   </para>
  </refsect1>
  <refsect1 role="examples">
@@ -79,7 +79,6 @@ if (interface_exists('MyInterface')) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/is-a.xml b/reference/classobj/functions/is-a.xml
index c9ef39f4fe..a80e747849 100644
--- a/reference/classobj/functions/is-a.xml
+++ b/reference/classobj/functions/is-a.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>is_a</methodname>
-   <methodparam><type>mixed</type><parameter>object</parameter></methodparam>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter>object_or_class</parameter></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>allow_string</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Checks if the given <parameter>object</parameter> is of this class or has
+   Checks if the given <parameter>object_or_class</parameter> is of this class or has
    this class as one of its parents.
   </para>
  </refsect1>
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>object_or_class</parameter></term>
      <listitem>
       <para>
        A class name or an object instance.
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>class_name</parameter></term>
+     <term><parameter>class</parameter></term>
      <listitem>
       <para>
        The class name
@@ -42,7 +42,7 @@
      <term><parameter>allow_string</parameter></term>
      <listitem>
       <para>
-       If this parameter set to &false;, string class name as <parameter>object</parameter>
+       If this parameter set to &false;, string class name as <parameter>object_or_class</parameter>
        is not allowed. This also prevents from calling autoloader if the class doesn't exist.
       </para>
      </listitem>
@@ -82,7 +82,7 @@ if (is_a($WF, 'WidgetFactory')) {
     </programlisting>
    </example>
    <example>
-    <title>Using the <emphasis>instanceof</emphasis> operator in PHP 5</title>
+    <title>Using the <emphasis>instanceof</emphasis> operator</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -106,7 +106,6 @@ if ($WF instanceof WidgetFactory) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/is-subclass-of.xml b/reference/classobj/functions/is-subclass-of.xml
index 5f35b4e760..a82d0689c7 100644
--- a/reference/classobj/functions/is-subclass-of.xml
+++ b/reference/classobj/functions/is-subclass-of.xml
@@ -9,13 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>is_subclass_of</methodname>
-   <methodparam><type>mixed</type><parameter>object</parameter></methodparam>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter>object_or_class</parameter></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>allow_string</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Checks if the given <parameter>object</parameter> has the class
-   <parameter>class_name</parameter> as one of its parents or implements it.
+   Checks if the given <parameter>object_or_class</parameter> has the class
+   <parameter>class</parameter> as one of its parents or implements it.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>object_or_class</parameter></term>
      <listitem>
       <para>
        A class name or an object instance. No error is generated if the class does not exist.
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>class_name</parameter></term>
+     <term><parameter>class</parameter></term>
      <listitem>
       <para>
        The class name
@@ -42,7 +42,7 @@
      <term><parameter>allow_string</parameter></term>
      <listitem>
       <para>
-       If this parameter set to false, string class name as <parameter>object</parameter>
+       If this parameter set to false, string class name as <parameter>object_or_class</parameter>
        is not allowed. This also prevents from calling autoloader if the class doesn't exist.
       </para>
      </listitem>
@@ -53,9 +53,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   This function returns &true; if the object <parameter>object</parameter>,
+   This function returns &true; if the object <parameter>object_or_class</parameter>,
    belongs to a class which is a subclass of
-   <parameter>class_name</parameter>, &false; otherwise.
+   <parameter>class</parameter>, &false; otherwise.
   </para>
  </refsect1>
  <refsect1 role="examples">
@@ -96,7 +96,6 @@ if (is_subclass_of($WF, 'WidgetFactory')) {
 }
 
 
-// usable only since PHP 5.0.3
 if (is_subclass_of('WidgetFactory_Child', 'WidgetFactory')) {
   echo "yes, WidgetFactory_Child is a subclass of WidgetFactory\n";
 } else {
@@ -185,7 +184,6 @@ Yes, MyClass is a subclass of MyInterface
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/method-exists.xml b/reference/classobj/functions/method-exists.xml
index 92593348bb..f2150f0575 100644
--- a/reference/classobj/functions/method-exists.xml
+++ b/reference/classobj/functions/method-exists.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>method_exists</methodname>
-   <methodparam><type class="union"><type>string</type><type>object</type></type><parameter>object</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
+   <methodparam><type class="union"><type>object</type><type>string</type></type><parameter>object_or_class</parameter></methodparam>
+   <methodparam><type>string</type><parameter>method</parameter></methodparam>
   </methodsynopsis>
   <para>
    Checks if the class method exists in the given
-   <parameter>object</parameter>.
+   <parameter>object_or_class</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>object_or_class</parameter></term>
      <listitem>
       <para>
        An object instance or a class name
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>method_name</parameter></term>
+     <term><parameter>method</parameter></term>
      <listitem>
       <para>
        The method name
@@ -43,17 +43,12 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if the method given by <parameter>method_name</parameter>
-   has been defined for the given <parameter>object</parameter>, &false; 
+   Returns &true; if the method given by <parameter>method</parameter>
+   has been defined for the given <parameter>object_or_class</parameter>, &false;
    otherwise.
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.uses-autoload;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -92,6 +87,12 @@ bool(true)
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &note.uses-autoload;
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -103,7 +104,6 @@ bool(true)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/property-exists.xml b/reference/classobj/functions/property-exists.xml
index 9933874fb8..cba445274e 100644
--- a/reference/classobj/functions/property-exists.xml
+++ b/reference/classobj/functions/property-exists.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>property_exists</methodname>
-   <methodparam><type>mixed</type><parameter>class</parameter></methodparam>
+   <methodparam><type class="union"><type>object</type><type>string</type></type><parameter>object_or_class</parameter></methodparam>
    <methodparam><type>string</type><parameter>property</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>class</parameter></term>
+     <term><parameter>object_or_class</parameter></term>
       <listitem>
        <para>
         The class name or an object of the class to test for
@@ -57,19 +57,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.uses-autoload;
-  <note>
-   <para>
-    The <function>property_exists</function> function cannot detect properties
-    that are magically accessible using the <link
-    linkend="language.oop5.overloading.members"><literal>__get</literal></link>
-    magic method.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -91,9 +78,9 @@ class myClass {
 
 var_dump(property_exists('myClass', 'mine'));   //true
 var_dump(property_exists(new myClass, 'mine')); //true
-var_dump(property_exists('myClass', 'xpto'));   //true, as of PHP 5.3.0
+var_dump(property_exists('myClass', 'xpto'));   //true
 var_dump(property_exists('myClass', 'bar'));    //false
-var_dump(property_exists('myClass', 'test'));   //true, as of PHP 5.3.0
+var_dump(property_exists('myClass', 'test'));   //true
 myClass::test();
 
 ?>
@@ -102,6 +89,19 @@ myClass::test();
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &note.uses-autoload;
+  <note>
+   <para>
+    The <function>property_exists</function> function cannot detect properties
+    that are magically accessible using the <link linkend="language.oop5.overloading.members"><literal>__get</literal></link>
+    magic method.
+   </para>
+  </note>
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -111,7 +111,6 @@ myClass::test();
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/functions/trait-exists.xml b/reference/classobj/functions/trait-exists.xml
index 22d04dc4b5..44503b3943 100644
--- a/reference/classobj/functions/trait-exists.xml
+++ b/reference/classobj/functions/trait-exists.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.trait-exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>trait_exists</refname>
@@ -11,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>trait_exists</methodname>
-   <methodparam><type>string</type><parameter>traitname</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>autoload</parameter></methodparam>
+   <methodparam><type>string</type><parameter>trait</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>autoload</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
 
@@ -24,7 +23,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>traitname</parameter></term>
+    <term><parameter>trait</parameter></term>
     <listitem>
      <para>
       Name of the trait to check
@@ -51,7 +50,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/classobj/versions.xml b/reference/classobj/versions.xml
index b2c5e1cf21..7d88b25f6a 100644
--- a/reference/classobj/versions.xml
+++ b/reference/classobj/versions.xml
@@ -5,7 +5,7 @@
 -->
 
 <versions>
- <function name="__autoload" from="PHP 5, PHP 7" deprecated="PHP 7.2.0"/>
+ <function name="__autoload" from="PHP 5, PHP 7" deprecated="PHP 7.2.0" removed="PHP 8"/>
  <function name="class_alias" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="class_exists" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="get_called_class" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
diff --git a/reference/cmark/book.xml b/reference/cmark/book.xml
index 4f8a2ee721..be707687e1 100644
--- a/reference/cmark/book.xml
+++ b/reference/cmark/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.cmark" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <?phpdoc extension-membership="pecl" ?>
  <title>CommonMark</title>
  <titleabbrev>CommonMark</titleabbrev>
 
diff --git a/reference/com/functions/com-create-guid.xml b/reference/com/functions/com-create-guid.xml
index fed10db617..dcee44dc0c 100644
--- a/reference/com/functions/com-create-guid.xml
+++ b/reference/com/functions/com-create-guid.xml
@@ -19,6 +19,12 @@
    Microsoft convention is to enclose a GUID in curly braces.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/componere/book.xml b/reference/componere/book.xml
index 42f3d408ab..8f2756fab3 100644
--- a/reference/componere/book.xml
+++ b/reference/componere/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.componere" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Componere</title>
  <titleabbrev>Componere</titleabbrev>
 
diff --git a/reference/componere/functions/componere.cast.xml b/reference/componere/functions/componere.cast.xml
index d9c6783d83..894b2771c3 100644
--- a/reference/componere/functions/componere.cast.xml
+++ b/reference/componere/functions/componere.cast.xml
@@ -45,8 +45,8 @@
   </para>
  </refsect1>
 
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
+ <refsect1 role="errors">
+  &reftitle.errors;
   <warning>
    <para>
     Shall throw <type>InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
diff --git a/reference/componere/functions/componere.cast_by_ref.xml b/reference/componere/functions/componere.cast_by_ref.xml
index 8d7f8a8b4e..e53bc29150 100644
--- a/reference/componere/functions/componere.cast_by_ref.xml
+++ b/reference/componere/functions/componere.cast_by_ref.xml
@@ -45,8 +45,8 @@
   </para>
  </refsect1>
 
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
+ <refsect1 role="errors">
+  &reftitle.errors;
   <warning>
    <para>
     Shall throw <type>InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
diff --git a/reference/cubrid/book.xml b/reference/cubrid/book.xml
index 59ba003623..44e8869f4a 100644
--- a/reference/cubrid/book.xml
+++ b/reference/cubrid/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.cubrid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>CUBRID</title>
  <titleabbrev>CUBRID</titleabbrev>
 
diff --git a/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml b/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
index 140464c707..88bb745f83 100644
--- a/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
+++ b/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
@@ -49,18 +49,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    The benefits of <function>cubrid_unbuffered_query</function> come
-    at a cost: you cannot use <function>cubrid_num_rows</function> and
-    <function>cubrid_data_seek</function> on a result set returned from
-    <function>cubrid_unbuffered_query</function>. 
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -89,6 +77,18 @@
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    The benefits of <function>cubrid_unbuffered_query</function> come
+    at a cost: you cannot use <function>cubrid_num_rows</function> and
+    <function>cubrid_data_seek</function> on a result set returned from
+    <function>cubrid_unbuffered_query</function>.
+   </para>
+  </note>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/cubrid/functions/cubrid-bind.xml b/reference/cubrid/functions/cubrid-bind.xml
index 6538f38bdd..6f9fa658d2 100644
--- a/reference/cubrid/functions/cubrid-bind.xml
+++ b/reference/cubrid/functions/cubrid-bind.xml
@@ -31,12 +31,12 @@
     name of a file on the client filesystem.
    </para>
    <para>
-    If the type of data to be bound explicitly is ENUM, the $bind_value
+    If the type of data to be bound explicitly is ENUM, the <parameter>bind_value</parameter>
     argument should be the enum element which is in string format.
    </para>
    <para>
-    In CUBRID shard envrioment, the $bind_value_type must be included in 
-    the cubrid_bind function.
+    In CUBRID shard envrioment, the <parameter>bind_value_type</parameter> must be included in 
+    the <function>cubrid_bind</function> function.
    </para>
   </note>
   <para>
@@ -176,10 +176,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-col-size.xml b/reference/cubrid/functions/cubrid-col-size.xml
index c1d731a22b..e35cf09e20 100644
--- a/reference/cubrid/functions/cubrid-col-size.xml
+++ b/reference/cubrid/functions/cubrid-col-size.xml
@@ -45,10 +45,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Number of elements, when process is successful. 
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Number of elements, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-column-names.xml b/reference/cubrid/functions/cubrid-column-names.xml
index 0cd2c6acdb..47c52380d5 100644
--- a/reference/cubrid/functions/cubrid-column-names.xml
+++ b/reference/cubrid/functions/cubrid-column-names.xml
@@ -34,10 +34,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Array of string values containing the column names, when process is successful. 
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Array of string values containing the column names, when process is successful,&return.falseforfailure;. 
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-column-types.xml b/reference/cubrid/functions/cubrid-column-types.xml
index 7dead4be14..68fd151454 100644
--- a/reference/cubrid/functions/cubrid-column-types.xml
+++ b/reference/cubrid/functions/cubrid-column-types.xml
@@ -34,10 +34,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Array of string values containing the column types, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Array of string values containing the column types, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-commit.xml b/reference/cubrid/functions/cubrid-commit.xml
index 7aff6524e7..cccab93325 100644
--- a/reference/cubrid/functions/cubrid-commit.xml
+++ b/reference/cubrid/functions/cubrid-commit.xml
@@ -42,10 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-connect-with-url.xml b/reference/cubrid/functions/cubrid-connect-with-url.xml
index 9cd636ae60..7c3cbd1a42 100644
--- a/reference/cubrid/functions/cubrid-connect-with-url.xml
+++ b/reference/cubrid/functions/cubrid-connect-with-url.xml
@@ -152,10 +152,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Connection identifier, when process is successful. 
-  </para>
-  <para>
-   &false;, when process is unsuccessful.
+   Connection identifier, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-connect.xml b/reference/cubrid/functions/cubrid-connect.xml
index 075338e1ca..5ab8c15264 100644
--- a/reference/cubrid/functions/cubrid-connect.xml
+++ b/reference/cubrid/functions/cubrid-connect.xml
@@ -70,10 +70,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Connection identifier, when process is successful. 
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Connection identifier, when process is successful,&return.falseforfailure;. 
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-current-oid.xml b/reference/cubrid/functions/cubrid-current-oid.xml
index 0fac4a6831..ba1d6e79f5 100644
--- a/reference/cubrid/functions/cubrid-current-oid.xml
+++ b/reference/cubrid/functions/cubrid-current-oid.xml
@@ -17,7 +17,7 @@
     The <function>cubrid_current_oid</function> function is used to get the
     oid of the current cursor location from the query result.  To use
     <function>cubrid_current_oid</function>, the query executed must be a
-    updatable query, and the CUBRID_INCLUDE_OID option must be included during
+    updatable query, and the <constant>CUBRID_INCLUDE_OID</constant> option must be included during
     the query execution.
   </para>
  </refsect1>
@@ -37,10 +37,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Oid of current cursor location, when process is successful
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Oid of current cursor location, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-disconnect.xml b/reference/cubrid/functions/cubrid-disconnect.xml
index cc93f84bfa..ab009651f1 100644
--- a/reference/cubrid/functions/cubrid-disconnect.xml
+++ b/reference/cubrid/functions/cubrid-disconnect.xml
@@ -35,10 +35,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-drop.xml b/reference/cubrid/functions/cubrid-drop.xml
index 10679e084f..48d17043d1 100644
--- a/reference/cubrid/functions/cubrid-drop.xml
+++ b/reference/cubrid/functions/cubrid-drop.xml
@@ -39,10 +39,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-error-code-facility.xml b/reference/cubrid/functions/cubrid-error-code-facility.xml
index 0ccc9e1c4d..e40469e059 100644
--- a/reference/cubrid/functions/cubrid-error-code-facility.xml
+++ b/reference/cubrid/functions/cubrid-error-code-facility.xml
@@ -29,9 +29,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Facility code of the error code that occurred: CUBRID_FACILITY_DBMS, CUBRID_FACILITY_CAS, CUBRID_FACILITY_CCI, CUBRID_FACILITY_CLIENT
-    </para>
-  <para />
+    Facility code of the error code that occurred: 
+    <constant>CUBRID_FACILITY_DBMS</constant>, <constant>CUBRID_FACILITY_CAS</constant>,
+    <constant>CUBRID_FACILITY_CCI</constant>, <constant>CUBRID_FACILITY_CLIENT</constant>.
+  </para>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/cubrid/functions/cubrid-execute.xml b/reference/cubrid/functions/cubrid-execute.xml
index cfe12185db..8642876f88 100644
--- a/reference/cubrid/functions/cubrid-execute.xml
+++ b/reference/cubrid/functions/cubrid-execute.xml
@@ -35,10 +35,10 @@
     <para>
      The <parameter>option</parameter> is used to determine whether to get OID
      after query execution and whether to execute the query in synchronous or
-     asynchronous mode. CUBRID_INCLUDE_OID and CUBRID_ASYNC (or
-     CUBRID_EXEC_QUERY_ALL if you want to execute multiple SQL statements) can
+     asynchronous mode. <constant>CUBRID_INCLUDE_OID</constant> and <constant>CUBRID_ASYNC</constant> (or
+     <constant>CUBRID_EXEC_QUERY_ALL</constant> if you want to execute multiple SQL statements) can
      be specified by using a bitwise OR operator. If not specified, neither of
-     them isselected. If the flag CUBRID_EXEC_QUERY_ALL is set, a synchronous
+     them isselected. If the flag <constant>CUBRID_EXEC_QUERY_ALL</constant> is set, a synchronous
      mode (sync_mode) is used to retrieve query results, and in such cases the
      following rules are applied: 
     </para>
@@ -64,7 +64,7 @@
     <para>
      If the first argument is <parameter>request_identifier</parameter> to
      execute the <function>cubrid_prepare</function> function, you can specify
-     an option, CUBRID_ASYNC only.
+     an option, <constant>CUBRID_ASYNC</constant> only.
     </para>
  </refsect1>
 
@@ -82,7 +82,7 @@
        </varlistentry>
        <varlistentry>
       <term><parameter>option</parameter></term>
-      <listitem><para>Query execution option CUBRID_INCLUDE_OID, CUBRID_ASYNC, CUBRID_EXEC_QUERY_ALL.</para></listitem>
+        <listitem><para>Query execution option <constant>CUBRID_INCLUDE_OID</constant>, <constant>CUBRID_ASYNC</constant>, <constant>CUBRID_EXEC_QUERY_ALL</constant>.</para></listitem>
        </varlistentry>
         <varlistentry>
       <term><parameter>request_identifier</parameter></term>
@@ -97,10 +97,7 @@
   <para>
     Request identifier, when process is successful and first param is
     conn_identifier; &true;, when process is successful and first argument is
-    request_identifier.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+    request_identifier,&return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -119,7 +116,7 @@
       <row>
        <entry>8.4.0</entry>
        <entry>
-        Add new option CUBRID_EXEC_QUERY_ALL.
+        Add new option <constant>CUBRID_EXEC_QUERY_ALL</constant>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/cubrid/functions/cubrid-free-result.xml b/reference/cubrid/functions/cubrid-free-result.xml
index 1c73465d5b..9445e692bd 100644
--- a/reference/cubrid/functions/cubrid-free-result.xml
+++ b/reference/cubrid/functions/cubrid-free-result.xml
@@ -15,7 +15,7 @@
   </methodsynopsis>
   <para>
     This function frees the memory occupied by the result data. It returns
-    TRUE on success or FALSE on failure. Note that it can only frees the
+    &true; on success or &false; on failure. Note that it can only frees the
     client fetch buffer now, and if you want free all memory, use function
     <function>cubrid_close_request</function>.
   </para>
@@ -36,10 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &true; on success.
-  </para>
-   <para>
-    &false; on failure.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-get-charset.xml b/reference/cubrid/functions/cubrid-get-charset.xml
index cd5ee654f5..7a71a6b907 100644
--- a/reference/cubrid/functions/cubrid-get-charset.xml
+++ b/reference/cubrid/functions/cubrid-get-charset.xml
@@ -35,10 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A string that represents the CUBRID connection charset; on success.
-  </para>
-   <para>
-    &false; on failure.
+   A string that represents the CUBRID connection charset on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-get-class-name.xml b/reference/cubrid/functions/cubrid-get-class-name.xml
index ba420d9908..5bb51aea90 100644
--- a/reference/cubrid/functions/cubrid-get-class-name.xml
+++ b/reference/cubrid/functions/cubrid-get-class-name.xml
@@ -40,10 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Class name when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+    Class name when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-get-client-info.xml b/reference/cubrid/functions/cubrid-get-client-info.xml
index 8e2be68a9c..fb23ef7603 100644
--- a/reference/cubrid/functions/cubrid-get-client-info.xml
+++ b/reference/cubrid/functions/cubrid-get-client-info.xml
@@ -28,10 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A string that represents the client library version; on success.
-  </para>
-   <para>
-    &false; on failure.
+   A string that represents the client library version on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-get-db-parameter.xml b/reference/cubrid/functions/cubrid-get-db-parameter.xml
index c04f6303d5..39ddbe78ea 100644
--- a/reference/cubrid/functions/cubrid-get-db-parameter.xml
+++ b/reference/cubrid/functions/cubrid-get-db-parameter.xml
@@ -14,9 +14,8 @@
    <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>  
   </methodsynopsis>
   <para>
-   This function returns the CUBRID database parameters or it returns FALSE on
-   failure. It returns an associative array with the values for the following
-   parameters:
+   This function returns the CUBRID database parameters,&return.falseforfailure;. 
+   It returns an associative array with the values for the following parameters:
   </para>
   <para>
   <simplelist>
@@ -145,10 +144,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   An associative array with CUBRID database parameters; on success.
-  </para>
-   <para>
-    &false; on failure.
+   An associative array with CUBRID database parameters; on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-get-query-timeout.xml b/reference/cubrid/functions/cubrid-get-query-timeout.xml
index d02bbe9aab..e14fd66948 100644
--- a/reference/cubrid/functions/cubrid-get-query-timeout.xml
+++ b/reference/cubrid/functions/cubrid-get-query-timeout.xml
@@ -34,10 +34,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Success: the query timeout value of the current request. Units of msec.
-  </para>
-  <para>
-   Failure: FALSE
+   Returns the query timeout value in milliseconds of the current request on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-get-server-info.xml b/reference/cubrid/functions/cubrid-get-server-info.xml
index 1be0360144..f5afcd56ae 100644
--- a/reference/cubrid/functions/cubrid-get-server-info.xml
+++ b/reference/cubrid/functions/cubrid-get-server-info.xml
@@ -33,10 +33,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A string that represents the CUBRID server version; on success.
-  </para>
-   <para>
-    &false; on failure.
+   A string that represents the CUBRID server version on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob-close.xml b/reference/cubrid/functions/cubrid-lob-close.xml
index e8629a4076..5ecfad2499 100644
--- a/reference/cubrid/functions/cubrid-lob-close.xml
+++ b/reference/cubrid/functions/cubrid-lob-close.xml
@@ -25,7 +25,7 @@
   <variablelist>
     <varlistentry>
   <term><parameter>lob_identifier_array</parameter></term>
-  <listitem><para>LOB identifier array return from cubrid_lob_get.</para></listitem>
+  <listitem><para>LOB identifier array returned from <function>cubrid_lob_get</function>.</para></listitem>
    </varlistentry>
   </variablelist>
   </para>
@@ -34,10 +34,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob-export.xml b/reference/cubrid/functions/cubrid-lob-export.xml
index 3a7aa5033d..1524529cc3 100644
--- a/reference/cubrid/functions/cubrid-lob-export.xml
+++ b/reference/cubrid/functions/cubrid-lob-export.xml
@@ -44,10 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob-get.xml b/reference/cubrid/functions/cubrid-lob-get.xml
index abb6eb81a2..eb82906413 100644
--- a/reference/cubrid/functions/cubrid-lob-get.xml
+++ b/reference/cubrid/functions/cubrid-lob-get.xml
@@ -43,10 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Return an array of LOB resources, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Return an array of LOB resources, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob-send.xml b/reference/cubrid/functions/cubrid-lob-send.xml
index 4f95ca4390..fc99ee56fb 100644
--- a/reference/cubrid/functions/cubrid-lob-send.xml
+++ b/reference/cubrid/functions/cubrid-lob-send.xml
@@ -39,10 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob-size.xml b/reference/cubrid/functions/cubrid-lob-size.xml
index 401f189895..65a866486f 100644
--- a/reference/cubrid/functions/cubrid-lob-size.xml
+++ b/reference/cubrid/functions/cubrid-lob-size.xml
@@ -33,10 +33,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    A string representing LOB data size, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    A string representing LOB data size, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-bind.xml b/reference/cubrid/functions/cubrid-lob2-bind.xml
index 45d367473a..ea8ff73562 100644
--- a/reference/cubrid/functions/cubrid-lob2-bind.xml
+++ b/reference/cubrid/functions/cubrid-lob2-bind.xml
@@ -61,10 +61,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lob2-close.xml b/reference/cubrid/functions/cubrid-lob2-close.xml
index b1675e7e4f..fa0e0dc0e3 100644
--- a/reference/cubrid/functions/cubrid-lob2-close.xml
+++ b/reference/cubrid/functions/cubrid-lob2-close.xml
@@ -36,10 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, on success.
-  </para>
-    <para>
-    &false;, on failure.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-export.xml b/reference/cubrid/functions/cubrid-lob2-export.xml
index b67e12840e..fb5cf7ec7f 100644
--- a/reference/cubrid/functions/cubrid-lob2-export.xml
+++ b/reference/cubrid/functions/cubrid-lob2-export.xml
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true; if the process is successful and &false; for failure.
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lob2-import.xml b/reference/cubrid/functions/cubrid-lob2-import.xml
index 64266c6eaa..17c79287c7 100644
--- a/reference/cubrid/functions/cubrid-lob2-import.xml
+++ b/reference/cubrid/functions/cubrid-lob2-import.xml
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true; if the process is successful and &false; for failure.
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lob2-new.xml b/reference/cubrid/functions/cubrid-lob2-new.xml
index d717488938..057425d44b 100644
--- a/reference/cubrid/functions/cubrid-lob2-new.xml
+++ b/reference/cubrid/functions/cubrid-lob2-new.xml
@@ -45,10 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Lob identifier when it is successful.
-  </para>
-  <para>
-   &false;  on failure.
+   Lob identifier when it is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-read.xml b/reference/cubrid/functions/cubrid-lob2-read.xml
index 31634b197e..c921910927 100644
--- a/reference/cubrid/functions/cubrid-lob2-read.xml
+++ b/reference/cubrid/functions/cubrid-lob2-read.xml
@@ -43,15 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Returns the contents as a string.
-  </para>
-  <para>
-    &false; when there is no more data.
-  </para>
-  <para>
-    NULL on failure.
-  </para>
-  <para>
+    Returns the contents as a string, &false; when there is no more data, or &null; on failure.
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lob2-seek.xml b/reference/cubrid/functions/cubrid-lob2-seek.xml
index 5a7bf5b189..1158b84711 100644
--- a/reference/cubrid/functions/cubrid-lob2-seek.xml
+++ b/reference/cubrid/functions/cubrid-lob2-seek.xml
@@ -21,16 +21,16 @@
    argument, to the direction set in the <parameter>origin</parameter> argument.
   </para>
   <para>
-   To set the <parameter>origin</parameter> argument, you can use CUBRID_CURSOR_FIRST
+   To set the <parameter>origin</parameter> argument, you can use <constant>CUBRID_CURSOR_FIRST</constant>
    to set the cursor position moving forward <parameter>offset</parameter> units from
    the first beginning. In this case, <parameter>offset</parameter> must be a positive value.
   </para>
   <para>
-   If you use CUBRID_CURSOR_CURRENT for <parameter>origin</parameter>, you can move 
+   If you use <constant>CUBRID_CURSOR_CURRENT</constant> for <parameter>origin</parameter>, you can move 
    forward or backward. and <parameter>offset</parameter> can be positive or negative.
   </para>
   <para>
-   If you use CUBRID_CURSOR_LAST for <parameter>origin</parameter>, you can move 
+   If you use <constant>CUBRID_CURSOR_LAST</constant> for <parameter>origin</parameter>, you can move 
    backward <parameter>offset</parameter> units from the end of LOB object and
    <parameter>offset</parameter> only can be positive.
   </para>
@@ -68,7 +68,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true; if the process is successful and &false; for failure.
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lob2-seek64.xml b/reference/cubrid/functions/cubrid-lob2-seek64.xml
index 22f4273cb2..730b82072b 100644
--- a/reference/cubrid/functions/cubrid-lob2-seek64.xml
+++ b/reference/cubrid/functions/cubrid-lob2-seek64.xml
@@ -23,16 +23,16 @@
    data can be stored, you can use this function.
   </para>
   <para>
-   To set the <parameter>origin</parameter> argument, you can use CUBRID_CURSOR_FIRST
+   To set the <parameter>origin</parameter> argument, you can use <constant>CUBRID_CURSOR_FIRST</constant>
    to set the cursor position moving forward <parameter>offset</parameter> units from
    the first beginning. In this case, <parameter>offset</parameter> must be a positive value.
   </para>
   <para>
-   If you use CUBRID_CURSOR_CURRENT for <parameter>origin</parameter>, you can move
+   If you use <constant>CUBRID_CURSOR_CURRENT</constant> for <parameter>origin</parameter>, you can move
    forward or backward. and <parameter>offset</parameter> can be positive or negative.
   </para>
   <para>
-   If you use CUBRID_CURSOR_LAST for <parameter>origin</parameter>, you can move backward
+   If you use <constant>CUBRID_CURSOR_LAST</constant> for <parameter>origin</parameter>, you can move backward
    <parameter>offset</parameter> units from the end of LOB object and <parameter>offset</parameter> only can be positive.
   </para>
   <note>   
@@ -74,7 +74,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true; if the process is successful and &false; for failure.
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lob2-size.xml b/reference/cubrid/functions/cubrid-lob2-size.xml
index 7331ad0078..8f75d47d45 100644
--- a/reference/cubrid/functions/cubrid-lob2-size.xml
+++ b/reference/cubrid/functions/cubrid-lob2-size.xml
@@ -35,10 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   It will return the size of the LOB object when it processes successfully.
-  </para>
-  <para>
-   &false; on failure.
+   It will return the size of the LOB object when it processes successfully,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-size64.xml b/reference/cubrid/functions/cubrid-lob2-size64.xml
index 9a663abadc..a3f0c71866 100644
--- a/reference/cubrid/functions/cubrid-lob2-size64.xml
+++ b/reference/cubrid/functions/cubrid-lob2-size64.xml
@@ -38,10 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   It will return the size of the LOB object as a string when it processes successfully.
-  </para>
-  <para>
-   &false; on failure.
+   It will return the size of the LOB object as a string when it processes successfully,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-tell.xml b/reference/cubrid/functions/cubrid-lob2-tell.xml
index 51cdb4aaa5..ceb8f39cf9 100644
--- a/reference/cubrid/functions/cubrid-lob2-tell.xml
+++ b/reference/cubrid/functions/cubrid-lob2-tell.xml
@@ -35,10 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    It will return the cursor position on the LOB object when it processes successfully.
-  </para>
-  <para>
-    &false; on failure.
+    It will return the cursor position on the LOB object when it processes successfully,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-tell64.xml b/reference/cubrid/functions/cubrid-lob2-tell64.xml
index 82b09c55da..7363143eac 100644
--- a/reference/cubrid/functions/cubrid-lob2-tell64.xml
+++ b/reference/cubrid/functions/cubrid-lob2-tell64.xml
@@ -38,10 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    It will return the cursor position on the LOB object as a string when it processes successfully.
-  </para>
-  <para>
-    &false; on failure.
+    It will return the cursor position on the LOB object as a string when it processes successfully,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lob2-write.xml b/reference/cubrid/functions/cubrid-lob2-write.xml
index 42a9e97061..158a7ba00b 100644
--- a/reference/cubrid/functions/cubrid-lob2-write.xml
+++ b/reference/cubrid/functions/cubrid-lob2-write.xml
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true; if the process is successful and &false; for failure.
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-lock-read.xml b/reference/cubrid/functions/cubrid-lock-read.xml
index 0e2665701f..340d5b010d 100644
--- a/reference/cubrid/functions/cubrid-lock-read.xml
+++ b/reference/cubrid/functions/cubrid-lock-read.xml
@@ -39,10 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-lock-write.xml b/reference/cubrid/functions/cubrid-lock-write.xml
index 781e406e18..d82731226e 100644
--- a/reference/cubrid/functions/cubrid-lock-write.xml
+++ b/reference/cubrid/functions/cubrid-lock-write.xml
@@ -39,10 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-move-cursor.xml b/reference/cubrid/functions/cubrid-move-cursor.xml
index 90cfc1fa17..7ed71694da 100644
--- a/reference/cubrid/functions/cubrid-move-cursor.xml
+++ b/reference/cubrid/functions/cubrid-move-cursor.xml
@@ -20,18 +20,18 @@
     current cursor location of <parameter>req_identifier</parameter> by the
     value set in the <parameter>offset</parameter> argument, to the direction
     set in the <parameter>origin</parameter> argument. To set the
-    <parameter>origin</parameter> argument, you can use CUBRID_CURSOR_FIRST
-    for the first part of the result, CUBRID_CURSOR_CURRENT for the current
-    location of the result, or CUBRID_CURSOR_LAST for the last part of the
-    result.  If <parameter>origin</parameter> argument is not explicitly
-    designated, then the function uses CUBRID_CURSOR_CURRENT as its default
+    <parameter>origin</parameter> argument, you can use <constant>CUBRID_CURSOR_FIRST</constant>
+    for the first part of the result, <constant>CUBRID_CURSOR_CURRENT</constant> for the current
+    location of the result, or <constant>CUBRID_CURSOR_LAST</constant> for the last part of the
+    result. If <parameter>origin</parameter> argument is not explicitly
+    designated, then the function uses <constant>CUBRID_CURSOR_CURRENT</constant> as its default
     value.
   </para>
   <para>
     If the value of cursor movement range goes over the valid limit, then the
     cursor moves to the next location after the valid range for the cursor.
     For example, if you move 20 units in the result with the size of 10, then
-    the cursor will move to 11th place and return CUBRID_NO_MORE_DATA.
+    the cursor will move to 11th place and return <constant>CUBRID_NO_MORE_DATA</constant>.
   </para>
  </refsect1>
 
@@ -49,7 +49,7 @@
    </varlistentry>
   <varlistentry>
   <term><parameter>origin</parameter></term>
-  <listitem><para>Location where you want to move the cursor from CUBRID_CURSOR_FIRST, CUBRID_CURSOR_CURRENT, CUBRID_CURSOR_LAST.</para></listitem>
+  <listitem><para>Location where you want to move the cursor from <constant>CUBRID_CURSOR_FIRST</constant>, <constant>CUBRID_CURSOR_CURRENT</constant>, <constant>CUBRID_CURSOR_LAST</constant>.</para></listitem>
    </varlistentry>
   </variablelist>
   </para>
@@ -58,10 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &true;, when process is successful.
-  </para>
-  <para>
-   &false;, when process is unsucceful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-next-result.xml b/reference/cubrid/functions/cubrid-next-result.xml
index 7c6f4e89c7..09bc94f520 100644
--- a/reference/cubrid/functions/cubrid-next-result.xml
+++ b/reference/cubrid/functions/cubrid-next-result.xml
@@ -16,7 +16,7 @@
   <para>
     The <function>cubrid_next_result</function> function is used to get
     results of next query if multiple SQL statements are executed and
-    CUBRID_EXEC_QUERY_ALL flag is set upon
+   <constant>CUBRID_EXEC_QUERY_ALL</constant> flag is set upon
     <function>cubrid_execute</function>.
    </para>
  </refsect1>
@@ -35,8 +35,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>&true;, when process is successful.</para>
-  <para>&false;, when process is unsuccessful.</para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/cubrid/functions/cubrid-num-cols.xml b/reference/cubrid/functions/cubrid-num-cols.xml
index ece1358a5e..c822df7e3f 100644
--- a/reference/cubrid/functions/cubrid-num-cols.xml
+++ b/reference/cubrid/functions/cubrid-num-cols.xml
@@ -16,7 +16,7 @@
   <para>
     The <function>cubrid_num_cols</function> function is used to get the
     number of columns from the query result. It can only be used when the
-    query executed is a select statement.
+    query executed is a <literal>SELECT</literal> statement.
   </para>
 </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-num-rows.xml b/reference/cubrid/functions/cubrid-num-rows.xml
index 0a92e76179..a140c18421 100644
--- a/reference/cubrid/functions/cubrid-num-rows.xml
+++ b/reference/cubrid/functions/cubrid-num-rows.xml
@@ -14,11 +14,11 @@
    <methodparam><type>resource</type><parameter>result</parameter></methodparam>  
   </methodsynopsis>
   <para>
-    The <function>cubrid_num_rows</function> function is used to get the
-    number of rows from the query result.  You can use it only when the query
-    executed is a select statement.  When you want to know such value for
-    INSERT, UPDATE, or DELETE query, you have to use the
-    <function>cubrid_affected_rows</function> function.
+   The <function>cubrid_num_rows</function> function is used to get the 
+   number of rows from the query result.
+   It can be used for <literal>SELECT</literal> statements.
+   For <literal>INSERT</literal>, <literal>UPDATE</literal>, or <literal>DELETE</literal> queries,
+   use the <function>cubrid_affected_rows</function> function.
   </para>
   <para>
    Note: The <function>cubrid_num_rows</function> function can only be used
diff --git a/reference/cubrid/functions/cubrid-pconnect-with-url.xml b/reference/cubrid/functions/cubrid-pconnect-with-url.xml
index 5620e38266..370d0870a6 100644
--- a/reference/cubrid/functions/cubrid-pconnect-with-url.xml
+++ b/reference/cubrid/functions/cubrid-pconnect-with-url.xml
@@ -154,10 +154,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Connection identifier, when process is successful. 
-  </para>
-  <para>
-   &false;, when process is unsuccessful.
+   Connection identifier, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-pconnect.xml b/reference/cubrid/functions/cubrid-pconnect.xml
index 0492e871a7..a8dd55a4c6 100644
--- a/reference/cubrid/functions/cubrid-pconnect.xml
+++ b/reference/cubrid/functions/cubrid-pconnect.xml
@@ -73,10 +73,7 @@
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Connection identifier, when process is successful. 
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+    Connection identifier, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-prepare.xml b/reference/cubrid/functions/cubrid-prepare.xml
index e1539b11d2..863c7f04b8 100644
--- a/reference/cubrid/functions/cubrid-prepare.xml
+++ b/reference/cubrid/functions/cubrid-prepare.xml
@@ -43,7 +43,7 @@
    </varlistentry>
    <varlistentry>
   <term><parameter>option</parameter></term>
-  <listitem><para>OID return option CUBRID_INCLUDE_OID.</para></listitem>
+    <listitem><para>OID return option <constant>CUBRID_INCLUDE_OID</constant>.</para></listitem>
    </varlistentry>
   </variablelist>
   </para>
@@ -52,10 +52,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Request identifier, if process is successful; 
-  </para>
-  <para>
-    &false;, if process is unsuccessful.
+    Request identifier, if process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-put.xml b/reference/cubrid/functions/cubrid-put.xml
index 7e719bf3c1..24290091f7 100644
--- a/reference/cubrid/functions/cubrid-put.xml
+++ b/reference/cubrid/functions/cubrid-put.xml
@@ -57,10 +57,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-rollback.xml b/reference/cubrid/functions/cubrid-rollback.xml
index 42e0c29b67..a21c70499e 100644
--- a/reference/cubrid/functions/cubrid-rollback.xml
+++ b/reference/cubrid/functions/cubrid-rollback.xml
@@ -40,10 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-schema.xml b/reference/cubrid/functions/cubrid-schema.xml
index ac714e5427..56263e12ca 100644
--- a/reference/cubrid/functions/cubrid-schema.xml
+++ b/reference/cubrid/functions/cubrid-schema.xml
@@ -17,16 +17,15 @@
    <methodparam choice="opt"><type>string</type><parameter>attr_name</parameter></methodparam>  
   </methodsynopsis>
   <para>
-    The <function>cubrid_schema</function> function is used to get the
-    requested schema information from database. You have to designate
-    <parameter>class_name</parameter>, if you want to get information on
-    certain class, <parameter>attr_name</parameter>, if you want to get
-    information on certain attribute (can be used only with CUBRID_
-    SCH_ATTR_PRIVILEGE).
+   The <function>cubrid_schema</function> function is used to get the
+   requested schema information from database. To get information about specific class,
+   set the <parameter>class_name</parameter>, to get information about specific attribute
+   (can be used only with <constant>CUBRID_SCH_ATTR_PRIVILEGE</constant>),
+   set the <parameter>attr_name</parameter>.
   </para>
 
   <para>
-  The result of the cubrid_schema function is returned as a two-dimensional
+  The result of the <function>cubrid_schema</function> function is returned as a two-dimensional
   array (column (associative array) * row (numeric array)). The following
   tables shows types of schema and the column structure of the result array to
   be returned based on the schema type.
@@ -432,10 +431,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    Array containing the schema information, when process is successful; 
-  </para>
-  <para>
-    &false;, when process is unsuccessful
+    Array containing the schema information, when process is successful,&return.falseforfailure;.
   </para>
  </refsect1>
  
diff --git a/reference/cubrid/functions/cubrid-seq-drop.xml b/reference/cubrid/functions/cubrid-seq-drop.xml
index 26ad55c47d..57ae31ac94 100644
--- a/reference/cubrid/functions/cubrid-seq-drop.xml
+++ b/reference/cubrid/functions/cubrid-seq-drop.xml
@@ -50,10 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-seq-insert.xml b/reference/cubrid/functions/cubrid-seq-insert.xml
index d113b9a8e2..af6bc4b31f 100644
--- a/reference/cubrid/functions/cubrid-seq-insert.xml
+++ b/reference/cubrid/functions/cubrid-seq-insert.xml
@@ -54,10 +54,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-seq-put.xml b/reference/cubrid/functions/cubrid-seq-put.xml
index 62f35b0015..76fa1fa04d 100644
--- a/reference/cubrid/functions/cubrid-seq-put.xml
+++ b/reference/cubrid/functions/cubrid-seq-put.xml
@@ -54,10 +54,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-set-add.xml b/reference/cubrid/functions/cubrid-set-add.xml
index 6e4d1270a2..87b0b71e88 100644
--- a/reference/cubrid/functions/cubrid-set-add.xml
+++ b/reference/cubrid/functions/cubrid-set-add.xml
@@ -50,10 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-set-autocommit.xml b/reference/cubrid/functions/cubrid-set-autocommit.xml
index d1bb3fe748..d1133032e4 100644
--- a/reference/cubrid/functions/cubrid-set-autocommit.xml
+++ b/reference/cubrid/functions/cubrid-set-autocommit.xml
@@ -52,10 +52,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-set-db-parameter.xml b/reference/cubrid/functions/cubrid-set-db-parameter.xml
index 9f372f9bdd..ee81c8f36c 100644
--- a/reference/cubrid/functions/cubrid-set-db-parameter.xml
+++ b/reference/cubrid/functions/cubrid-set-db-parameter.xml
@@ -61,10 +61,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &true; on success.
-  </para>
-  <para>
-   &false; on failure.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-set-drop.xml b/reference/cubrid/functions/cubrid-set-drop.xml
index 84134e4927..8671775d87 100644
--- a/reference/cubrid/functions/cubrid-set-drop.xml
+++ b/reference/cubrid/functions/cubrid-set-drop.xml
@@ -50,10 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-  <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/cubrid/functions/cubrid-set-query-timeout.xml b/reference/cubrid/functions/cubrid-set-query-timeout.xml
index bc48aa4026..d6029af299 100644
--- a/reference/cubrid/functions/cubrid-set-query-timeout.xml
+++ b/reference/cubrid/functions/cubrid-set-query-timeout.xml
@@ -31,7 +31,7 @@
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>Timeout time, unit of msec.</para>
+     <para>Timeout time in milliseconds.</para>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -41,10 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    &true;, when process is successful.
-  </para>
-    <para>
-    &false;, when process is unsuccessful.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/curl/configure.xml b/reference/curl/configure.xml
index f8e243c8dc..849dedc113 100644
--- a/reference/curl/configure.xml
+++ b/reference/curl/configure.xml
@@ -9,9 +9,7 @@
   directories. In the <filename>include</filename> directory there should be a folder
   named <filename>curl</filename> which should contain the <filename>easy.h</filename> and
   <filename>curl.h</filename> files. There should be a file named 
-  <filename>libcurl.a</filename> located in the <filename>lib</filename> directory. Before
-  PHP 5.5.0 it was possible to configure PHP to use cURL for URL streams
-  <option role="configure">--with-curlwrappers</option>.
+  <filename>libcurl.a</filename> located in the <filename>lib</filename> directory.
  </para>
  <note>
   <title>Note to Win32 Users</title>
diff --git a/reference/curl/constants.xml b/reference/curl/constants.xml
index ffef26ae0a..cfa6d0a9b8 100644
--- a/reference/curl/constants.xml
+++ b/reference/curl/constants.xml
@@ -16,7 +16,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -27,7 +27,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -60,7 +60,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.2.0
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -104,7 +104,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.2.0
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -115,7 +115,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.2.0
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -126,7 +126,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.2.0
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -137,7 +137,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.2.0
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -148,7 +148,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.2.4
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -159,7 +159,7 @@
      </term>
      <listitem>
        <simpara>
-         Available since PHP 5.1.0
+
        </simpara>
      </listitem>
    </varlistentry>
@@ -481,7 +481,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.2.1
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -503,7 +503,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -602,7 +602,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.14.1
+     Available since cURL 7.14.1
     </simpara>
    </listitem>
   </varlistentry>
@@ -723,7 +723,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.5.19 and 5.6.3
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -734,7 +734,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.5.19 and 5.6.3
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -745,7 +745,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.5.19 and 5.6.3
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -947,17 +947,6 @@
     </simpara>
    </listitem>
   </varlistentry>
-  <varlistentry xml:id="constant.curlopt-closepolicy">
-   <term>
-    <constant>CURLOPT_CLOSEPOLICY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Removed in PHP 5.6.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
   <varlistentry xml:id="constant.curlopt-fresh-connect">
    <term>
     <constant>CURLOPT_FRESH_CONNECT</constant>
@@ -1394,7 +1383,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.0 and cURL 7.15.5
+     Available since cURL 7.15.5
     </simpara>
    </listitem>
   </varlistentry>
@@ -1405,7 +1394,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.0 and cURL 7.15.5
+     Available since cURL 7.15.5
     </simpara>
    </listitem>
   </varlistentry>
@@ -1431,61 +1420,6 @@
     </simpara>
    </listitem>
   </varlistentry>
-  <varlistentry xml:id="constant.curlclosepolicy-least-recently-used">
-   <term>
-    <constant>CURLCLOSEPOLICY_LEAST_RECENTLY_USED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Removed in PHP 5.6.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.curlclosepolicy-least-traffic">
-   <term>
-    <constant>CURLCLOSEPOLICY_LEAST_TRAFFIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Removed in PHP 5.6.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.curlclosepolicy-slowest">
-   <term>
-    <constant>CURLCLOSEPOLICY_SLOWEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Removed in PHP 5.6.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.curlclosepolicy-callback">
-   <term>
-    <constant>CURLCLOSEPOLICY_CALLBACK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Removed in PHP 5.6.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.curlclosepolicy-oldest">
-   <term>
-    <constant>CURLCLOSEPOLICY_OLDEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Removed in PHP 5.6.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
   <varlistentry xml:id="constant.curlinfo-private">
    <term>
     <constant>CURLINFO_PRIVATE</constant>
@@ -1493,7 +1427,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.2.4
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1515,7 +1449,7 @@
    </term>
    <listitem>
     <simpara>
-     As of PHP 5.5.0 and cURL 7.10.8, this is a legacy alias of
+     As of cURL 7.10.8, this is a legacy alias of
      <constant>CURLINFO_RESPONSE_CODE</constant>
     </simpara>
    </listitem>
@@ -1527,7 +1461,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.10.8
+     Available since cURL 7.10.8
     </simpara>
    </listitem>
   </varlistentry>
@@ -1538,7 +1472,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.3
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1747,7 +1681,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.7
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1758,7 +1692,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.7
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1769,7 +1703,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.7
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1780,7 +1714,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.7
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1791,7 +1725,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.7
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -1861,6 +1795,17 @@
     </simpara>
    </listitem>
   </varlistentry>
+  <varlistentry xml:id="constant.curl-timecond-none">
+   <term>
+    <constant>CURL_TIMECOND_NONE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
+    </simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry xml:id="constant.curl-timecond-ifmodsince">
    <term>
     <constant>CURL_TIMECOND_IFMODSINCE</constant>
@@ -2077,7 +2022,7 @@
    <listitem>
     <simpara>
      HTTP2 support built-in.
-     Available since PHP 5.5.24 and 5.6.8 and cURL 7.33.0
+     Available since cURL 7.33.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -2089,7 +2034,7 @@
    <listitem>
     <simpara>
      Supports files larger than 2GB.
-     Available since PHP 5.5.24 and 5.6.8 and cURL 7.33.0
+     Available since cURL 7.33.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -2908,7 +2853,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0 and cURL 7.16.1.
+     Available since cURL 7.16.1.
     </simpara>
    </listitem>
   </varlistentry>
@@ -2919,7 +2864,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -2930,7 +2875,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -2941,7 +2886,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -2974,7 +2919,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.2.10 and cURL 7.10.
+     Available since cURL 7.10.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3073,7 +3018,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.24 and 5.6.8 and cURL 7.33.0
+     Available since cURL 7.33.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -3238,7 +3183,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.25.0
+     Available since cURL 7.25.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -3249,7 +3194,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.25.0
+     Available since cURL 7.25.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -3271,7 +3216,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.19.1
+     Available since cURL 7.19.1
     </simpara>
    </listitem>
   </varlistentry>
@@ -3524,7 +3469,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.25.0
+     Available since cURL 7.25.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -3535,7 +3480,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.25.0
+     Available since cURL 7.25.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -3546,7 +3491,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.25.0
+     Available since cURL 7.25.0
     </simpara>
    </listitem>
   </varlistentry>
@@ -3557,7 +3502,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.16.0.
+     Available since cURL 7.16.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3568,7 +3513,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.16.3.
+     Available since cURL 7.16.3.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3726,19 +3671,6 @@
     </simpara>
    </listitem>
   </varlistentry>
-  <varlistentry xml:id="constant.curl-wrappers-enabled">
-   <term>
-    <constant>CURL_WRAPPERS_ENABLED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Defined if PHP was configured with
-     <option role="configure">--with-curlwrappers</option>.
-     Moved to PECL in PHP 5.5.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
   <varlistentry xml:id="constant.curlpause-all">
    <term>
     <constant>CURLPAUSE_ALL</constant>
@@ -3746,7 +3678,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3757,7 +3689,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3768,7 +3700,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3779,7 +3711,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3790,7 +3722,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3801,7 +3733,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.0 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3812,7 +3744,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 7.0.0 and cURL 7.43.0.
+     Available since cURL 7.43.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3823,7 +3755,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 7.0.0 and cURL 7.43.0.
+     Available since cURL 7.43.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3834,7 +3766,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 7.0.0 and cURL 7.43.0.
+     Available since cURL 7.43.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3845,7 +3777,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.23 and PHP 5.6.7 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -3856,7 +3788,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.5.23 and PHP 5.6.7 and cURL 7.18.0.
+     Available since cURL 7.18.0.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/curl/functions/curl-getinfo.xml b/reference/curl/functions/curl-getinfo.xml
index b79265dca3..1bce36be74 100644
--- a/reference/curl/functions/curl-getinfo.xml
+++ b/reference/curl/functions/curl-getinfo.xml
@@ -37,7 +37,7 @@
         <listitem>
          <simpara>
           <constant>CURLINFO_HTTP_CODE</constant> -  The last response code.
-          As of PHP 5.5.0 and cURL 7.10.8, this is a legacy alias of
+          As of cURL 7.10.8, this is a legacy alias of
           <constant>CURLINFO_RESPONSE_CODE</constant>
          </simpara>
         </listitem>
diff --git a/reference/curl/functions/curl-setopt-array.xml b/reference/curl/functions/curl-setopt-array.xml
index d9ce1d429f..22b4174c7a 100644
--- a/reference/curl/functions/curl-setopt-array.xml
+++ b/reference/curl/functions/curl-setopt-array.xml
@@ -90,31 +90,6 @@ curl_exec($ch);
 // close cURL resource, and free up system resources
 curl_close($ch);
 ?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Prior to PHP 5.1.3 this function can be simulated with:
-  </para>
-  <para>
-   <example>
-    <title>Our own implementation of <function>curl_setopt_array</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if (!function_exists('curl_setopt_array')) {
-   function curl_setopt_array(&$ch, $curl_options)
-   {
-       foreach ($curl_options as $option => $value) {
-           if (!curl_setopt($ch, $option, $value)) {
-               return false;
-           } 
-       }
-       return true;
-   }
-}
-?>
 ]]>
     </programlisting>
    </example>
diff --git a/reference/curl/functions/curl-setopt.xml b/reference/curl/functions/curl-setopt.xml
index 680e8d2273..d26ce0f34a 100644
--- a/reference/curl/functions/curl-setopt.xml
+++ b/reference/curl/functions/curl-setopt.xml
@@ -60,18 +60,6 @@
            <entry valign="top">
            </entry>
           </row>
-          <row>
-           <entry valign="top"><constant>CURLOPT_BINARYTRANSFER</constant></entry>
-           <entry valign="top">
-            &true; to return the raw output when
-            <constant>CURLOPT_RETURNTRANSFER</constant> is used.
-           </entry>
-           <entry valign="top">
-            From PHP 5.1.3, this option has no effect: the raw output will
-            always be returned when
-            <constant>CURLOPT_RETURNTRANSFER</constant> is used.
-           </entry>
-          </row>
           <row>
            <entry valign="top"><constant>CURLOPT_COOKIESESSION</constant></entry>
            <entry valign="top">
@@ -92,8 +80,7 @@
             on secure transfers.
            </entry>
            <entry valign="top">
-            Added in cURL 7.19.1. 
-            Available since PHP 5.3.2. 
+            Added in cURL 7.19.1.
             Requires <constant>CURLOPT_VERBOSE</constant> to be on to have an effect.
            </entry>
           </row>
@@ -106,7 +93,6 @@
            </entry>
            <entry valign="top">
             Added in 7.15.2.
-            Available since PHP 5.5.0.
            </entry>
           </row>
           <row>
@@ -272,7 +258,7 @@
             the number of small packets on the network.
            </entry>
            <entry valign="top">
-            Available since PHP 5.2.1 for versions compiled with libcurl 7.11.2 or
+            Available for versions compiled with libcurl 7.11.2 or
             greater.
            </entry>
           </row>
@@ -308,7 +294,7 @@
             &true; to track the handle's request string.
            </entry>
            <entry valign="top">
-            Available since PHP 5.1.3. The <constant>CURLINFO_</constant>
+            The <constant>CURLINFO_</constant>
             prefix is intentional.
            </entry>
           </row>
@@ -346,7 +332,7 @@
             &false; to get the raw HTTP response body.
            </entry>
            <entry valign="top">
-            Available as of PHP 5.5.0 if built against libcurl &gt;= 7.16.2.
+            Available if built against libcurl &gt;= 7.16.2.
            </entry>
           </row>
           <row>
@@ -628,21 +614,6 @@
             Added in cURL 7.10.
            </entry>
           </row>
-          <row>
-           <entry valign="top"><constant>CURLOPT_CLOSEPOLICY</constant></entry>
-           <entry valign="top">
-            One of the <constant>CURLCLOSEPOLICY_*</constant> values.
-            <note>
-             <para>
-              This option is deprecated, as it was never implemented in cURL and
-              never had any effect.
-             </para>
-            </note>
-           </entry>
-           <entry valign="top">
-            Removed in PHP 5.6.0.
-           </entry>
-          </row>
           <row>
            <entry><constant>CURLOPT_CONNECTTIMEOUT</constant></entry>
            <entry valign="top">
@@ -663,7 +634,7 @@
             timeouts with a minimum timeout allowed of one second.
            </entry>
            <entry valign="top">
-            Added in cURL 7.16.2. Available since PHP 5.2.3.
+            Added in cURL 7.16.2.
            </entry>
           </row>
           <row>
@@ -854,7 +825,7 @@
             specific type of redirect occurs.
            </entry>
            <entry valign="top">
-            Added in cURL 7.19.1. Available since PHP 5.3.2.
+            Added in cURL 7.19.1.
            </entry>
           </row>
           <row>
@@ -1001,10 +972,11 @@
           <row>
            <entry valign="top"><constant>CURLOPT_SSL_VERIFYHOST</constant></entry>
            <entry valign="top">
-            <literal>1</literal> to check the existence of a common name in the
-            SSL peer certificate. <literal>2</literal> to check the existence of
-            a common name and also verify that it matches the hostname
-            provided. <literal>0</literal> to not check the names. In production environments the value of this option
+            <literal>2</literal> to verify that a Common Name field or a Subject Alternate Name
+            field in the SSL peer certificate matches the provided hostname.
+            <literal>0</literal> to not check the names.
+            <literal>1</literal> should not be used.
+            In production environments the value of this option
             should be kept at <literal>2</literal> (default value).
            </entry>
            <entry valign="top">
@@ -1121,7 +1093,7 @@
             supports them. If set to <literal>0</literal> (default) keepalive probes are disabled.
            </entry>
            <entry valign="top">
-            Added in cURL 7.25.0. Available since PHP 5.5.0.
+            Added in cURL 7.25.0.
            </entry>
           </row>
           <row>
@@ -1133,7 +1105,7 @@
             The default is <literal>60</literal>.
            </entry>
            <entry valign="top">
-            Added in cURL 7.25.0. Available since PHP 5.5.0.
+            Added in cURL 7.25.0.
            </entry>
           </row>
           <row>
@@ -1145,7 +1117,7 @@
             The default is <literal>60</literal>.
            </entry>
            <entry valign="top">
-            Added in cURL 7.25.0. Available since PHP 5.5.0.
+            Added in cURL 7.25.0.
            </entry>
           </row>
           <row>
@@ -1158,10 +1130,13 @@
             a <literal>"304 Not Modified"</literal> header will be returned
             assuming <constant>CURLOPT_HEADER</constant> is &true;.
             Use <constant>CURL_TIMECOND_IFUNMODSINCE</constant> for the reverse
-            effect. <constant>CURL_TIMECOND_IFMODSINCE</constant> is the
-            default.
+            effect. Use <constant>CURL_TIMECOND_NONE</constant> to ignore
+            <constant>CURLOPT_TIMEVALUE</constant> and always return the page.
+            <constant>CURL_TIMECOND_NONE</constant> is the default.
            </entry>
            <entry valign="top">
+            Before cURL 7.46.0 the default was
+            <constant>CURL_TIMECOND_IFMODSINCE</constant>.
            </entry>
           </row>
           <row>
@@ -1183,15 +1158,14 @@
             timeouts with a minimum timeout allowed of one second.
            </entry>
            <entry valign="top">
-            Added in cURL 7.16.2. Available since PHP 5.2.3.
+            Added in cURL 7.16.2.
            </entry>
           </row>
           <row>
            <entry valign="top"><constant>CURLOPT_TIMEVALUE</constant></entry>
            <entry valign="top">
             The time in seconds since January 1st, 1970. The time will be used
-            by <constant>CURLOPT_TIMECONDITION</constant>. By default,
-            <constant>CURL_TIMECOND_IFMODSINCE</constant> is used.
+            by <constant>CURLOPT_TIMECONDITION</constant>.
            </entry>
            <entry valign="top">
            </entry>
@@ -1218,7 +1192,7 @@
             Defaults to unlimited speed.
            </entry>
            <entry valign="top">
-            Added in cURL 7.15.5. Available since PHP 5.4.0.
+            Added in cURL 7.15.5.
            </entry>
           </row>
           <row>
@@ -1230,7 +1204,7 @@
             Defaults to unlimited speed.
            </entry>
            <entry valign="top">
-            Added in cURL 7.15.5. Available since PHP 5.4.0.
+            Added in cURL 7.15.5.
            </entry>
           </row>
           <row>
@@ -1271,7 +1245,7 @@
             <constant>CURLFTPMETHOD_SINGLECWD</constant>.
            </entry>
            <entry valign="top">
-            Added in cURL 7.15.1. Available since PHP 5.3.0.
+            Added in cURL 7.15.1.
            </entry>
           </row>
          </tbody>
@@ -1368,7 +1342,7 @@
             <literal>"RELOAD"</literal> loads all cookies from the files specified by <constant>CURLOPT_COOKIEFILE</constant>.
            </entry>
            <entry valign="top">
-            Available since PHP 5.5.0 and cURL 7.14.1.
+            Available since cURL 7.14.1.
            </entry>
           </row>
           <row>
@@ -1993,7 +1967,16 @@
             The user name to use in authentication.
            </entry>
            <entry valign="top">
-            Added in cURL 7.19.1. Available since PHP 5.5.0.
+            Added in cURL 7.19.1.
+           </entry>
+          </row>
+          <row>
+           <entry valign="top"><constant>CURLOPT_PASSWORD</constant></entry>
+           <entry valign="top">
+            The password to use in authentication.
+           </entry>
+           <entry valign="top">
+            Added in cURL 7.19.1.
            </entry>
           </row>
           <row>
@@ -2102,7 +2085,7 @@
             </code>
            </entry>
            <entry valign="top">
-            Added in cURL 7.21.3. Available since PHP 5.5.0.
+            Added in cURL 7.21.3.
            </entry>
           </row>
          </tbody>
diff --git a/reference/curl/ini.xml b/reference/curl/ini.xml
index 5a7bfb8c85..c7696edc2e 100644
--- a/reference/curl/ini.xml
+++ b/reference/curl/ini.xml
@@ -20,7 +20,7 @@
       <entry><link linkend="ini.curl.cainfo">curl.cainfo</link></entry>
       <entry>NULL</entry>
       <entry>PHP_INI_SYSTEM</entry>
-      <entry>Available since PHP 5.3.7.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/datetime/configure.xml b/reference/datetime/configure.xml
index 7ee5c3b008..6378d7e30b 100644
--- a/reference/datetime/configure.xml
+++ b/reference/datetime/configure.xml
@@ -14,16 +14,6 @@
   </para>
  </note>
 
- <note>
-  <title>Experimental DateTime support in PHP 5.1.x</title>
-  <para>
-   Although the <classname>DateTime</classname> class (and related functions)
-   are enabled by default since PHP 5.2.0, it is possible to add experimental
-   support into PHP 5.1.x by using the following flag before configure/compile:
-   <literal>CFLAGS=-DEXPERIMENTAL_DATE_SUPPORT=1</literal>
-  </para>
- </note>
-
 </section>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/datetime/constants.xml b/reference/datetime/constants.xml
index 8fe882780b..f952769f0f 100644
--- a/reference/datetime/constants.xml
+++ b/reference/datetime/constants.xml
@@ -4,12 +4,12 @@
  &reftitle.constants;
  <para>
   The <link linkend="datetime.constants.types"><literal>DATE_</literal>
-  constants</link> are defined since PHP 5.1.1 and they offer standard
+  constants</link> are defined and they offer standard
   date representations, which can be used along with the date format functions
   (like <function>date</function>).
  </para>
  <para>
-  Following constants exists since PHP 5.1.2 and specify a format returned by
+  Following constants specify a format returned by
   functions <function>date_sunrise</function> and
   <function>date_sunset</function>.
  </para>
diff --git a/reference/datetime/dateinterval.xml b/reference/datetime/dateinterval.xml
index 8a22f4ea58..d6ebd75fa6 100644
--- a/reference/datetime/dateinterval.xml
+++ b/reference/datetime/dateinterval.xml
@@ -191,10 +191,6 @@
        days between the start and end dates. Otherwise,
        <varname>days</varname> will be &false;.
       </para>
-      <para>
-       Before PHP 5.4.20/5.5.4 instead of &false; you will receive -99999 upon
-       accessing the property.
-      </para>
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/datetime/dateinterval/construct.xml b/reference/datetime/dateinterval/construct.xml
index 3791ea289b..e7dab5b155 100644
--- a/reference/datetime/dateinterval/construct.xml
+++ b/reference/datetime/dateinterval/construct.xml
@@ -65,8 +65,8 @@
           <row>
            <entry><literal>W</literal></entry>
            <entry>
-            weeks. These get converted into days,
-            so can not be combined with <literal>D</literal>.
+            weeks. Converted into days.
+            Prior to PHP 8.0.0, can not be combined with <literal>D</literal>.
            </entry>
           </row>
           <row>
@@ -128,6 +128,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <literal>W</literal> can be combined with <literal>D</literal>.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -137,32 +159,87 @@
 <![CDATA[
 <?php
 
-$interval = new DateInterval('P2Y4DT6H8M');
+$interval = new DateInterval('P1W2D');
 var_dump($interval);
 
 ?>
 ]]>
     </programlisting>
-    &example.outputs;
+    &example.outputs.8;
     <screen role="php">
 <![CDATA[
-object(DateInterval)#1 (8) {
+object(DateInterval)#1 (16) {
   ["y"]=>
-  int(2)
+  int(0)
   ["m"]=>
   int(0)
   ["d"]=>
-  int(4)
+  int(9)
   ["h"]=>
-  int(6)
+  int(0)
   ["i"]=>
-  int(8)
+  int(0)
   ["s"]=>
   int(0)
+  ["f"]=>
+  float(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   bool(false)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
+}
+]]>
+    </screen>
+    &example.outputs.7;
+    <screen role="php">
+     <![CDATA[
+object(DateInterval)#1 (16) {
+  ["y"]=>
+  int(0)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(2)
+  ["h"]=>
+  int(0)
+  ["i"]=>
+  int(0)
+  ["s"]=>
+  int(0)
+  ["f"]=>
+  float(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  bool(false)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
 ]]>
     </screen>
diff --git a/reference/datetime/dateinterval/createfromdatestring.xml b/reference/datetime/dateinterval/createfromdatestring.xml
index 21cd0078e9..7ee040665d 100644
--- a/reference/datetime/dateinterval/createfromdatestring.xml
+++ b/reference/datetime/dateinterval/createfromdatestring.xml
@@ -38,6 +38,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a new <classname>DateInterval</classname> instance on success, &return.falseforfailure;.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -74,13 +81,6 @@ $i = DateInterval::createFromDateString('3600 seconds');
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new <classname>DateInterval</classname> instance on success, &return.falseforfailure;.
-  </para>
- </refsect1>
-
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/datetime/dateinterval/format.xml b/reference/datetime/dateinterval/format.xml
index b720bb1d62..eab044f952 100644
--- a/reference/datetime/dateinterval/format.xml
+++ b/reference/datetime/dateinterval/format.xml
@@ -150,19 +150,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    The <methodname>DateInterval::format</methodname> method does not 
-    recalculate carry over points in time strings nor in date segments. This 
-    is expected because it is not possible to overflow values like <literal>"32 days"</literal>
-    which could be interpreted as anything from <literal>"1 month and 4 days"</literal> 
-    to <literal>"1 month and 1 day"</literal>.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -178,7 +165,7 @@
       <row>
        <entry>7.1.0</entry>
        <entry>The <literal>F</literal> and <literal>f</literal> format
-       characters were added.</entry>
+        characters were added.</entry>
       </row>
      </tbody>
     </tgroup>
@@ -192,7 +179,7 @@
    <example>
     <title><classname>DateInterval</classname> example</title>
     <programlisting role="php">
-<![CDATA[
+     <![CDATA[
 <?php
 
 $interval = new DateInterval('P2Y4DT6H8M');
@@ -203,7 +190,7 @@ echo $interval->format('%d days');
     </programlisting>
     &example.outputs;
     <screen role="php">
-<![CDATA[
+     <![CDATA[
 4 days
 ]]>
     </screen>
@@ -213,7 +200,7 @@ echo $interval->format('%d days');
    <example>
     <title><classname>DateInterval</classname> and carry over points</title>
     <programlisting role="php">
-<![CDATA[
+     <![CDATA[
 <?php
 
 $interval = new DateInterval('P32D');
@@ -223,8 +210,8 @@ echo $interval->format('%d days');
 ]]>
     </programlisting>
     &example.outputs;
-   <screen role="php">
-<![CDATA[
+    <screen role="php">
+     <![CDATA[
 32 days
 ]]>
     </screen>
@@ -233,11 +220,11 @@ echo $interval->format('%d days');
   <para>
    <example>
     <title>
-     <classname>DateInterval</classname> and 
+     <classname>DateInterval</classname> and
      <methodname>DateTime::diff</methodname> with the %a and %d modifiers
     </title>
     <programlisting role="php">
-<![CDATA[
+     <![CDATA[
 <?php
 
 $january = new DateTime('2010-01-01');
@@ -256,7 +243,7 @@ echo $interval->format('%m month, %d days');
     </programlisting>
     &example.outputs;
     <screen role="php">
-<![CDATA[
+     <![CDATA[
 31 total days
 1 month, 0 days
 ]]>
@@ -264,6 +251,19 @@ echo $interval->format('%m month, %d days');
    </example>
   </para>
  </refsect1>
+ 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    The <methodname>DateInterval::format</methodname> method does not 
+    recalculate carry over points in time strings nor in date segments. This 
+    is expected because it is not possible to overflow values like <literal>"32 days"</literal>
+    which could be interpreted as anything from <literal>"1 month and 4 days"</literal> 
+    to <literal>"1 month and 1 day"</literal>.
+   </para>
+  </note>
+ </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/datetime/dateperiod.xml b/reference/datetime/dateperiod.xml
index c8b0b062cc..11203aff92 100644
--- a/reference/datetime/dateperiod.xml
+++ b/reference/datetime/dateperiod.xml
@@ -168,33 +168,6 @@
    </variablelist>
   </section>
 
-  <section role="changelog" xml:id="dateperiod.changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.3.27, 5.4.17</entry>
-        <entry>
-         The public properties <varname>recurrences</varname>,
-         <varname>include_start_date</varname>, <varname>start</varname>,
-         <varname>current</varname>, <varname>end</varname> and
-         <varname>interval</varname> have been exposed.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
  </partintro>
 
  &reference.datetime.entities.dateperiod;
diff --git a/reference/datetime/dateperiod/construct.xml b/reference/datetime/dateperiod/construct.xml
index 2c56c0ef42..96bbec935a 100644
--- a/reference/datetime/dateperiod/construct.xml
+++ b/reference/datetime/dateperiod/construct.xml
@@ -73,8 +73,9 @@
      <term><parameter>isostr</parameter></term>
      <listitem>
       <para>
-       An ISO 8601 repeating interval specification.
-       Zero occurences (<literal>R0/</literal>) are not supported.
+       An <link
+        xlink:href="&url.iso-8601.repeating_intervals;">ISO 8601 repeating interval specification</link>.
+       Zero occurrences (<literal>R0/</literal>) are not supported.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/datetime/datetime.xml b/reference/datetime/datetime.xml
index 08bf3eb964..e92f8dc15d 100644
--- a/reference/datetime/datetime.xml
+++ b/reference/datetime/datetime.xml
@@ -80,35 +80,6 @@
         on <classname>DateTimeInterface</classname>.
        </entry>
       </row>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        Added constants: <link linkend="datetime.constants.rfc3339_extended">DATE_RFC3339_EXTENDED</link> and
-        <link linkend="datetime.constants.rfc3339_extended">DateTime::RFC3339_EXTENDED</link>.
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        The class now implements <classname>DateTimeInterface</classname>.
-       </entry>
-      </row>
-      <row>
-       <entry>5.4.24</entry>
-       <entry>
-        The COOKIE constant was changed to reflect RFC 1036 using a four digit 
-        year rather than a two digit year (RFC 850) as prior versions.
-       </entry>
-      </row>
-      <row>
-       <entry>5.2.2</entry>
-       <entry>
-        DateTime object comparison with the
-        <link linkend="language.operators.comparison">comparison operators</link>
-        changed to work as expected. Previously, all DateTime objects were
-        considered equal (using <literal>==</literal>).
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/datetime/datetime/add.xml b/reference/datetime/datetime/add.xml
index fd58d1f67d..58a3e052db 100644
--- a/reference/datetime/datetime/add.xml
+++ b/reference/datetime/datetime/add.xml
@@ -134,14 +134,6 @@ echo $date->format('Y-m-d') . "\n";
   </example>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   <function>DateTime::modify</function>
-   is an alternative when using PHP 5.2.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/datetime/datetime/createfromimmutable.xml b/reference/datetime/datetime/createfromimmutable.xml
index 6f65f4da69..ac21090147 100644
--- a/reference/datetime/datetime/createfromimmutable.xml
+++ b/reference/datetime/datetime/createfromimmutable.xml
@@ -34,6 +34,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a new <classname>DateTime</classname> instance.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -52,12 +59,6 @@ $mutable = DateTime::createFromImmutable( $date );
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new <classname>DateTime</classname> instance.
-  </para>
- </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/datetime/datetime/settimestamp.xml b/reference/datetime/datetime/settimestamp.xml
index 2bb1cbaceb..0227007b45 100644
--- a/reference/datetime/datetime/settimestamp.xml
+++ b/reference/datetime/datetime/settimestamp.xml
@@ -86,34 +86,6 @@ echo date_format($date, 'U = Y-m-d H:i:s') . "\n";
   </example>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   Using the Unix timestamp format to construct a new <type>DateTime</type>
-   object is an alternative when using PHP 5.2, as shown in the example below.
-  </para>
-  <example>
-   <title>
-    <function>DateTime::setTimestamp</function> alternative in PHP 5.2
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ts = 1171502725;
-$date = new DateTime("@$ts");
-echo $date->format('U = Y-m-d H:i:s') . "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1171502725 = 2007-02-14 20:25:25
-]]>
-   </screen>
-  </example>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/datetime/datetime/sub.xml b/reference/datetime/datetime/sub.xml
index 415a55bf1e..285845e99d 100644
--- a/reference/datetime/datetime/sub.xml
+++ b/reference/datetime/datetime/sub.xml
@@ -134,14 +134,6 @@ echo $date->format('Y-m-d') . "\n";
   </example>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   <function>DateTime::modify</function>
-   is an alternative when using PHP 5.2.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/datetime/datetimeimmutable/createfrommutable.xml b/reference/datetime/datetimeimmutable/createfrommutable.xml
index 2c7a641541..e96eff314a 100644
--- a/reference/datetime/datetimeimmutable/createfrommutable.xml
+++ b/reference/datetime/datetimeimmutable/createfrommutable.xml
@@ -34,6 +34,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a new <classname>DateTimeImmutable</classname> instance.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -52,12 +59,6 @@ $immutable = DateTimeImmutable::createFromMutable( $date );
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new <classname>DateTimeImmutable</classname> instance.
-  </para>
- </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/datetime/datetimeinterface.xml b/reference/datetime/datetimeinterface.xml
index 6f01cb2718..8c60b4b60f 100644
--- a/reference/datetime/datetimeinterface.xml
+++ b/reference/datetime/datetimeinterface.xml
@@ -20,7 +20,7 @@
 <!-- }}} -->
 
   <section xml:id="datetimeinterface.synopsis">
-   &reftitle.classsynopsis;
+   &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
    <classsynopsis>
@@ -28,9 +28,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>DateTimeInterface</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>DateTimeInterface</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
 
@@ -228,7 +228,7 @@
      <term><constant>DATE_RFC3339</constant></term>
      <listitem>
       <simpara>
-       Same as <constant>DATE_ATOM</constant> (since PHP 5.1.3)
+       Same as <constant>DATE_ATOM</constant>
       </simpara>
      </listitem>
     </varlistentry>
@@ -238,7 +238,7 @@
      <term><constant>DATE_RFC3339_EXTENDED</constant></term>
      <listitem>
       <simpara>
-       RFC 3339 EXTENDED format (since PHP 7.0.0) (example: 2005-08-15T15:52:01.000+00:00)
+       RFC 3339 EXTENDED format (example: 2005-08-15T15:52:01.000+00:00)
       </simpara>
      </listitem>
     </varlistentry>
@@ -286,14 +286,6 @@
         on <classname>DateTimeInterface</classname>.
        </entry>
       </row>
-      <row>
-       <entry>5.5.8</entry>
-       <entry>
-        Trying to implement <classname>DateTimeInterface</classname> raises a
-        fatal error now. Formerly implementing the interface didn't raise an
-        error, but the behavior was erroneous.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/datetime/datetimeinterface/diff.xml b/reference/datetime/datetimeinterface/diff.xml
index dc6467a927..8353df4b9e 100644
--- a/reference/datetime/datetimeinterface/diff.xml
+++ b/reference/datetime/datetimeinterface/diff.xml
@@ -114,7 +114,7 @@ echo $interval->format('%R%a days');
    <title><classname>DateTime</classname> object comparison</title>
    <note>
     <para>
-     As of PHP 5.2.2, DateTime objects can be compared using
+     DateTime objects can be compared using
      <link linkend="language.operators.comparison">comparison operators</link>.
     </para>
    </note>
diff --git a/reference/datetime/datetimeinterface/format.xml b/reference/datetime/datetimeinterface/format.xml
index a3a8c078fd..3e3f11eb04 100644
--- a/reference/datetime/datetimeinterface/format.xml
+++ b/reference/datetime/datetimeinterface/format.xml
@@ -243,7 +243,7 @@
          <row>
           <entry><literal>v</literal></entry>
           <entry>
-           Milliseconds (added in PHP 7.0.0). Same note applies as for
+           Milliseconds. Same note applies as for
            <literal>u</literal>.
           </entry>
           <entry>Example: <literal>654</literal></entry>
@@ -280,8 +280,8 @@
          </row>
          <row>
           <entry><literal>T</literal></entry>
-          <entry>Timezone abbreviation</entry>
-          <entry>Examples: <literal>EST</literal>, <literal>MDT</literal> ...</entry>
+          <entry>Timezone abbreviation, if known; otherwise the GMT offset.</entry>
+          <entry>Examples: <literal>EST</literal>, <literal>MDT</literal>, <literal>+05</literal></entry>
          </row>
          <row>
           <entry><literal>Z</literal></entry>
diff --git a/reference/datetime/datetimeinterface/gettimestamp.xml b/reference/datetime/datetimeinterface/gettimestamp.xml
index bdb1d7b896..9c602dadee 100644
--- a/reference/datetime/datetimeinterface/gettimestamp.xml
+++ b/reference/datetime/datetimeinterface/gettimestamp.xml
@@ -99,15 +99,6 @@ echo date_timestamp_get($date);
   </example>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   Using <literal>U</literal> as the parameter to
-   <function>DateTime::format</function>
-   is an alternative when using PHP 5.2.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/datetime/datetimezone/construct.xml b/reference/datetime/datetimezone/construct.xml
index 527b6b9891..5b4e866951 100644
--- a/reference/datetime/datetimezone/construct.xml
+++ b/reference/datetime/datetimezone/construct.xml
@@ -56,30 +56,6 @@
    recognised as a valid timezone.
   </para>
  </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.10</entry>
-       <entry>
-        The <parameter>timezone</parameter> parameter accepts offset values.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/datetime/datetimezone/getoffset.xml b/reference/datetime/datetimezone/getoffset.xml
index 7f5a3d4723..f853ec35d9 100644
--- a/reference/datetime/datetimezone/getoffset.xml
+++ b/reference/datetime/datetimezone/getoffset.xml
@@ -68,14 +68,6 @@
         Prior to this version, &false; was returned on failure.
        </entry>
       </row>
-      <row>
-       <entry>5.5.19, 5.6.3</entry>
-       <entry>
-        <parameter>datetime</parameter> type changed to
-        <interfacename>DateTimeInterface</interfacename>.
-        Previously, <classname>DateTime</classname>.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/datetime/datetimezone/listabbreviations.xml b/reference/datetime/datetimezone/listabbreviations.xml
index be530cc8ea..4b55ad143d 100644
--- a/reference/datetime/datetimezone/listabbreviations.xml
+++ b/reference/datetime/datetimezone/listabbreviations.xml
@@ -26,6 +26,11 @@
   </note>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/datetime/examples.xml b/reference/datetime/examples.xml
index c9192d94f3..1c854718c3 100644
--- a/reference/datetime/examples.xml
+++ b/reference/datetime/examples.xml
@@ -100,7 +100,7 @@ End:   2016-03-02 00:00:00 -05:00
     </screen>
     <simpara>
      To get the last day of the next month (i.e. to prevent the overflow),
-     the <literal>last day of</literal> format is available as of PHP 5.3.0.
+     the <literal>last day of</literal> format is available.
     </simpara>
     <programlisting role="php">
 <![CDATA[
diff --git a/reference/datetime/formats.xml b/reference/datetime/formats.xml
index 891edc8dd0..4341994344 100644
--- a/reference/datetime/formats.xml
+++ b/reference/datetime/formats.xml
@@ -956,19 +956,12 @@
       </thead>
       <tbody>
        <row>
-        <entry>5.6.23, 7.0.8</entry>
+        <entry>7.0.8</entry>
         <entry>
          Weeks always start on monday. Formerly, sunday would also be considered
          to start a week.
         </entry>
        </row>
-       <row>
-        <entry>5.3.3</entry>
-        <entry>
-         "first day" and "last day" changed to behave has "+1 day" and "-1 day",
-         respectively. Previously, the behaviour was as "first day of" and "last day of".
-        </entry>
-       </row>
       </tbody>
      </tgroup>
     </informaltable>
diff --git a/reference/datetime/functions/date-default-timezone-get.xml b/reference/datetime/functions/date-default-timezone-get.xml
index a96fbb8d4e..2d2c9e6bb7 100644
--- a/reference/datetime/functions/date-default-timezone-get.xml
+++ b/reference/datetime/functions/date-default-timezone-get.xml
@@ -22,12 +22,6 @@
       <function>date_default_timezone_set</function> function (if any)
      </para>
     </listitem>
-    <listitem>
-     <para>
-      Prior to PHP 5.4.0 <emphasis>only</emphasis>: Reading the <varname>TZ</varname>
-      environment variable (if non empty)
-     </para>
-    </listitem>
     <listitem>
      <para>
       Reading the value of the <link linkend="ini.date.timezone">date.timezone</link> ini option
@@ -36,10 +30,7 @@
     </listitem>
     <listitem>
      <para>
-      Prior to PHP 5.4.0 <emphasis>only</emphasis>: Querying the host operating system (if supported
-      and allowed by the OS). This uses an algorithm
-      that has to <emphasis>guess</emphasis> the timezone. This is by no means going to work correctly for 
-      every situation. A warning is shown when this stage is reached. Do not rely on it to be guessed
+      A warning is shown when this stage is reached. Do not rely on it to be guessed
       correctly, and set <link linkend="ini.date.timezone">date.timezone</link> to the correct timezone
       instead.
      </para>
@@ -52,6 +43,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/datetime/functions/date-sunset.xml b/reference/datetime/functions/date-sunset.xml
index 7641976bec..84eab50da1 100644
--- a/reference/datetime/functions/date-sunset.xml
+++ b/reference/datetime/functions/date-sunset.xml
@@ -146,13 +146,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-   
-   &date.timezone.errors.description;
- 
- </refsect1>
-
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -162,6 +155,13 @@
    the year.
   </para>
  </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+   
+   &date.timezone.errors.description;
+ 
+ </refsect1>
  
  <refsect1 role="changelog">
   &reftitle.changelog;
diff --git a/reference/datetime/functions/date.xml b/reference/datetime/functions/date.xml
index 9368fb91ff..a5a599d685 100644
--- a/reference/datetime/functions/date.xml
+++ b/reference/datetime/functions/date.xml
@@ -86,7 +86,7 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-// set the default timezone to use. Available since PHP 5.1
+// set the default timezone to use.
 date_default_timezone_set('UTC');
 
 
@@ -202,7 +202,7 @@ $today = date("Y-m-d H:i:s");                   // 2001-03-10 17:16:18 (the MySQ
   <tip>
    <para>
     Timestamp of the start of the request is available in
-    <varname>$_SERVER['REQUEST_TIME']</varname> since PHP 5.1.
+    <varname>$_SERVER['REQUEST_TIME']</varname>.
    </para>
   </tip>
  </refsect1>
diff --git a/reference/datetime/functions/gmmktime.xml b/reference/datetime/functions/gmmktime.xml
index 7ebfdf399c..1c968c82fc 100644
--- a/reference/datetime/functions/gmmktime.xml
+++ b/reference/datetime/functions/gmmktime.xml
@@ -98,20 +98,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>isDST</parameter></term>
-     <listitem>
-      <para>
-       Parameters always represent a GMT date so <parameter>isDST</parameter>
-       doesn't influence the result.
-      </para>
-      <note>
-       <para>
-        This parameter has been removed in PHP 7.0.0.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/datetime/functions/localtime.xml b/reference/datetime/functions/localtime.xml
index 4950920016..25f41c375e 100644
--- a/reference/datetime/functions/localtime.xml
+++ b/reference/datetime/functions/localtime.xml
@@ -31,64 +31,8 @@
      <term><parameter>associative</parameter></term>
      <listitem>
       <para>
-       If set to &false; or not supplied then the array is returned as a regular, 
-       numerically indexed array.  If the argument is set to &true; then
-       <function>localtime</function> returns an associative array containing
-       all the different elements of the structure returned by the C
-       function call to localtime.  The names of the different keys of
-       the associative array are as follows:
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <simpara>
-          "tm_sec" - seconds, <literal>0</literal> to <literal>59</literal>
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_min" - minutes, <literal>0</literal> to <literal>59</literal>
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_hour" - hours, <literal>0</literal> to <literal>23</literal>
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_mday" - day of the month, <literal>1</literal> to <literal>31</literal>
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_mon" - month of the year, <literal>0</literal> (Jan) to <literal>11</literal> (Dec)
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_year" - years since 1900
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_wday" - day of the week, <literal>0</literal> (Sun) to <literal>6</literal> (Sat)
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_yday" - day of the year, <literal>0</literal> to <literal>365</literal>
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          "tm_isdst" - is daylight savings time in effect? 
-         </simpara>
-         <simpara>
-          Positive if yes, <literal>0</literal> if not, negative if unknown.
-         </simpara>
-        </listitem>
-       </itemizedlist>
+       Determines whether the function should return a regular, numerically indexed array, 
+       or an associative one.
       </para>
      </listitem>
     </varlistentry>
@@ -96,6 +40,71 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   If <parameter>associative</parameter> is set to &false; or not supplied then 
+   the array is returned as a regular, numerically indexed array.
+   If <parameter>associative</parameter> is set to &true; then
+   <function>localtime</function> returns an associative array containing
+   all the different elements of the structure returned by the C
+   function call to localtime. 
+   The names of the different keys of the associative array are as follows:
+  </para>
+  <para>
+   <itemizedlist>
+    <listitem>
+     <simpara>
+      "tm_sec" - seconds, <literal>0</literal> to <literal>59</literal>
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_min" - minutes, <literal>0</literal> to <literal>59</literal>
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_hour" - hours, <literal>0</literal> to <literal>23</literal>
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_mday" - day of the month, <literal>1</literal> to <literal>31</literal>
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_mon" - month of the year, <literal>0</literal> (Jan) to <literal>11</literal> (Dec)
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_year" - years since 1900
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_wday" - day of the week, <literal>0</literal> (Sun) to <literal>6</literal> (Sat)
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_yday" - day of the year, <literal>0</literal> to <literal>365</literal>
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      "tm_isdst" - is daylight savings time in effect?
+     </simpara>
+     <simpara>
+      Positive if yes, <literal>0</literal> if not, negative if unknown.
+     </simpara>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
    
diff --git a/reference/datetime/functions/microtime.xml b/reference/datetime/functions/microtime.xml
index bbf7acd859..c176a9635d 100644
--- a/reference/datetime/functions/microtime.xml
+++ b/reference/datetime/functions/microtime.xml
@@ -61,34 +61,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>Timing script execution with <function>microtime</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Simple function to replicate PHP 5 behaviour
- */
-function microtime_float()
-{
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-}
-
-$time_start = microtime_float();
-
-// Sleep for a while
-usleep(100);
-
-$time_end = microtime_float();
-$time = $time_end - $time_start;
-
-echo "Did nothing in $time seconds\n";
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Timing script execution in PHP 5</title>
+    <title>Timing script execution</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -106,14 +79,14 @@ echo "Did nothing in $time seconds\n";
     </programlisting>
    </example>
    <example>
-    <title><function>microtime</function> and <literal>REQUEST_TIME_FLOAT</literal> (as of PHP 5.4.0)</title>
+    <title><function>microtime</function> and <literal>REQUEST_TIME_FLOAT</literal></title>
     <programlisting role="php">
 <![CDATA[
 <?php
 // Randomize sleeping time
 usleep(mt_rand(100, 10000));
 
-// As of PHP 5.4.0, REQUEST_TIME_FLOAT is available in the $_SERVER superglobal array.
+// REQUEST_TIME_FLOAT is available in the $_SERVER superglobal array.
 // It contains the timestamp of the start of the request with microsecond precision.
 $time = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"];
 
diff --git a/reference/datetime/functions/mktime.xml b/reference/datetime/functions/mktime.xml
index 316d9aa17d..53ccdb9dbd 100644
--- a/reference/datetime/functions/mktime.xml
+++ b/reference/datetime/functions/mktime.xml
@@ -99,39 +99,10 @@
        with values between 0-69 mapping to 2000-2069 and 70-100 to
        1970-2000. On systems where time_t is a 32bit signed integer, as
        most common today, the valid range for <parameter>year</parameter> 
-       is somewhere between 1901 and 2038. However, before PHP 5.1.0 this
-       range was limited from 1970 to 2038 on some systems (e.g. Windows).
+       is somewhere between 1901 and 2038.
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>isDST</parameter></term>
-     <listitem>
-      <para>
-       This parameter can be set to 1 if the time is during daylight savings time (DST), 
-       0 if it is not, or -1 (the default) if it is unknown whether the time is within 
-       daylight savings time or not. If it's unknown, PHP tries to figure it out itself.
-       This can cause unexpected (but not incorrect) results.
-       Some times are invalid if DST is enabled on the system PHP is running on or 
-       <parameter>isDST</parameter> is set to 1. If DST is enabled in e.g. 2:00, all times 
-       between 2:00 and 3:00 are invalid and <function>mktime</function> returns an undefined 
-       (usually negative) value. 
-       Some systems (e.g. Solaris 8) enable DST at midnight so time 0:30 of the day when DST 
-       is enabled is evaluated as 23:30 of the previous day.
-      </para>
-      <note>
-       <para>
-        As of PHP 5.1.0, this parameter became deprecated. As a result, the
-        new timezone handling features should be used instead.
-       </para>
-      </note>
-      <note>
-       <para>
-        This parameter has been removed in PHP 7.0.0.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>                                                                                                            
@@ -190,7 +161,7 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-// Set the default timezone to use. Available as of PHP 5.1
+// Set the default timezone to use.
 date_default_timezone_set('UTC');
 
 // Prints: July 1, 2000 is on a Saturday
@@ -246,17 +217,6 @@ echo strftime("Last day in Feb 2000 is: %d", $lastday);
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <para>
-    Before PHP 5.1.0, negative timestamps were not supported under any known
-    version of Windows and some other systems as well. Therefore the range of
-    valid years was limited to 1970 through 2038.
-   </para>
-  </caution>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/datetime/functions/strftime.xml b/reference/datetime/functions/strftime.xml
index e4a3d503e2..bc28758169 100644
--- a/reference/datetime/functions/strftime.xml
+++ b/reference/datetime/functions/strftime.xml
@@ -332,7 +332,7 @@
       </warning>
       <warning>
        <simpara>
-        <emphasis>macOS only:</emphasis> The <literal>%P</literal> modifier 
+        <emphasis>macOS and musl only:</emphasis> The <literal>%P</literal> modifier 
         is not supported in the macOS implementation of this function.
        </simpara>
       </warning>
diff --git a/reference/datetime/functions/strptime.xml b/reference/datetime/functions/strptime.xml
index 94e691829d..33214f1486 100644
--- a/reference/datetime/functions/strptime.xml
+++ b/reference/datetime/functions/strptime.xml
@@ -167,7 +167,7 @@ Array
        function provided by the system's C library. This function can exhibit
        noticeably different behaviour across different operating systems. The
        use of <function>date_parse_from_format</function>, which does not
-       suffer from these issues, is recommended on PHP 5.3.0 and later.
+       suffer from these issues, is recommended.
       </para>
      </note>
      <note>
@@ -178,13 +178,6 @@ Array
        on leap seconds</link>.
       </para>
      </note>
-     <note>
-      <para>
-       Prior to PHP 5.2.0, this function could return undefined behaviour. Notably,
-       the <literal>"tm_sec"</literal>, <literal>"tm_min"</literal> and <literal>"tm_hour"</literal> 
-       entries would return undefined values.
-      </para>
-     </note>
     </refsect1>
 
     <refsect1 role="seealso">
diff --git a/reference/datetime/functions/strtotime.xml b/reference/datetime/functions/strtotime.xml
index 91dbef017f..1867ca3fa3 100644
--- a/reference/datetime/functions/strtotime.xml
+++ b/reference/datetime/functions/strtotime.xml
@@ -125,7 +125,6 @@ echo strtotime("last Monday"), "\n";
 <?php
 $str = 'Not Good';
 
-// previous to PHP 5.1.0 you would compare with -1, instead of false
 if (($timestamp = strtotime($str)) === false) {
     echo "The string ($str) is bogus";
 } else {
@@ -155,12 +154,6 @@ if (($timestamp = strtotime($str)) === false) {
     the dates that correspond to the minimum and maximum values for
     a 32-bit signed integer.)
    </para>
-   <para>
-    Prior to PHP 5.1.0, not all platforms support negative timestamps, therefore
-    your date range may be limited to no earlier than the Unix epoch. This
-    means that e.g. dates prior to Jan 1, 1970 will not work on Windows,
-    some Linux distributions, and a few other operating systems.
-   </para>
    <para>
     For 64-bit versions of PHP, the valid range of a timestamp is effectively
     infinite, as 64 bits can represent approximately 293 billion years in either
@@ -189,8 +182,7 @@ if (($timestamp = strtotime($str)) === false) {
    <para>
     Using this function for mathematical operations is not advisable.
     It is better to use <methodname>DateTime::add</methodname> and
-    <methodname>DateTime::sub</methodname> in PHP 5.3 and later, or
-    <methodname>DateTime::modify</methodname> in PHP 5.2.
+    <methodname>DateTime::sub</methodname>.
    </para>
   </note>
  </refsect1>
diff --git a/reference/datetime/functions/time.xml b/reference/datetime/functions/time.xml
index a7ecf79ce3..35607fc512 100644
--- a/reference/datetime/functions/time.xml
+++ b/reference/datetime/functions/time.xml
@@ -18,6 +18,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the current timestamp.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -52,7 +64,7 @@ Next Week: 2005-04-06
   <tip>
    <para>
     Timestamp of the start of the request is available in
-    <varname>$_SERVER['REQUEST_TIME']</varname> since PHP 5.1.
+    <varname>$_SERVER['REQUEST_TIME']</varname>.
    </para>
   </tip>
  </refsect1>
diff --git a/reference/datetime/functions/timezone-version-get.xml b/reference/datetime/functions/timezone-version-get.xml
index f15aae528e..9add0a0d9d 100644
--- a/reference/datetime/functions/timezone-version-get.xml
+++ b/reference/datetime/functions/timezone-version-get.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/datetime/ini.xml b/reference/datetime/ini.xml
index ff137d2c97..1fcb39bfaa 100644
--- a/reference/datetime/ini.xml
+++ b/reference/datetime/ini.xml
@@ -44,7 +44,7 @@
       <entry><link linkend="ini.date.timezone">date.timezone</link></entry>
       <entry>""</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available as of PHP 5.1.0.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
@@ -63,7 +63,9 @@
     </term>
     <listitem>
      <para>
-      The default latitude.
+      The default latitude
+      ranging from <literal>0</literal> at the equator,
+      to <literal>+90</literal> northward, and <literal>-90</literal> southward.
      </para>
     </listitem>
    </varlistentry>
@@ -75,7 +77,9 @@
     </term>
     <listitem>
      <para>
-      The default longitude.
+      The default longitude
+      ranging from <literal>0</literal>0 at the prime meridian
+      to <literal>+180</literal> eastward and <literal>−180</literal> westward.
      </para>
     </listitem>
    </varlistentry>
@@ -111,9 +115,8 @@
     </term>
     <listitem>
      <para>
-      The default timezone used by all date/time functions. Prior to PHP 5.4.0,
-      this would only work if the <varname>TZ</varname> environment variable
-      was not set. The precedence order for which timezone is used if none
+      The default timezone used by all date/time functions.
+      The precedence order for which timezone is used if none
       is explicitly mentioned is described in the
       <function>date_default_timezone_get</function> page. See <xref
       linkend="timezones"/> for a list of supported timezones.
diff --git a/reference/dba/configure.xml b/reference/dba/configure.xml
index 56355bb7c5..46ef883d9e 100644
--- a/reference/dba/configure.xml
+++ b/reference/dba/configure.xml
@@ -213,7 +213,7 @@
        <option role="configure">--with-tcadb[=DIR]</option>.
        <note>
         <para>
-         This was added in PHP 5.4.0. The Tokyo Cabinet library can be downloaded from
+         The Tokyo Cabinet library can be downloaded from
          <link xlink:href="&url.tcadb;"/>.
         </para>
        </note>
diff --git a/reference/dba/functions/dba-list.xml b/reference/dba/functions/dba-list.xml
index db5344baee..fa35dc69b2 100644
--- a/reference/dba/functions/dba-list.xml
+++ b/reference/dba/functions/dba-list.xml
@@ -15,6 +15,12 @@
    <function>dba_list</function> list all open database files.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -22,7 +28,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/dba/functions/dba-open.xml b/reference/dba/functions/dba-open.xml
index 9c6363694b..cdb6c6c200 100644
--- a/reference/dba/functions/dba-open.xml
+++ b/reference/dba/functions/dba-open.xml
@@ -140,7 +140,7 @@
          </tgroup>
         </table>
         <simplelist>
-         <member>ok: the second call will be successfull.</member>
+         <member>ok: the second call will be successful.</member>
          <member>wait: the second call waits until <function>dba_close</function> is called for the first.</member>
          <member>false: the second call returns false.</member>
          <member>illegal: you must not mix <literal>"l"</literal> and <literal>"d"</literal> modifiers for <parameter>mode</parameter> parameter.</member>
diff --git a/reference/dba/setup.xml b/reference/dba/setup.xml
index a432671789..88aa3c50b9 100644
--- a/reference/dba/setup.xml
+++ b/reference/dba/setup.xml
@@ -132,7 +132,7 @@
       <row>
        <entry><literal>tcadb</literal></entry>
        <entry>
-        This is available since PHP 5.4.0. The Tokyo Cabinet library can be 
+        The Tokyo Cabinet library can be 
         downloaded from <link xlink:href="&url.tcadb;"/>.
        </entry>
       </row>
diff --git a/reference/dbase/book.xml b/reference/dbase/book.xml
index 6def45ef8c..4ec110cf40 100644
--- a/reference/dbase/book.xml
+++ b/reference/dbase/book.xml
@@ -89,7 +89,7 @@
        <entry><literal>F</literal></entry>
        <entry>Float</entry>
        <entry>A float number</entry>
-       <entry>Same as <literal>N</literal>. Available as of PHP 5.2.0</entry>
+       <entry>Same as <literal>N</literal>.</entry>
       </row>
       <row>
        <entry><literal>C</literal></entry>
diff --git a/reference/dbplus/book.xml b/reference/dbplus/book.xml
deleted file mode 100644
index e8b7e53fff..0000000000
--- a/reference/dbplus/book.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
- 
-<book xml:id="book.dbplus" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>DB++</title>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.dbplus">
-  &reftitle.intro;
-  <para>
-   db++, made by the German company <link
-   xlink:href="&url.dbplus.company;">Concept asa</link>, is a relational
-   database system with high performance and low memory and disk
-   usage in mind. While providing SQL as an additional language
-   interface, it is not really an SQL database in the first place but
-   provides its own AQL query language which is much more influenced
-   by the relational algebra than SQL is.
-  </para>
-  <para>
-   Concept asa always had an interest in supporting open source
-   languages, db++ has had Perl and Tcl call interfaces for years
-   now and uses Tcl as its internal stored procedure language.
-  </para>
-  <note>
-   <para>
-    &pecl.moved-ver;4.3.0
-   </para>
-  </note>
-  &warn.experimental;
- </preface>
- <!-- }}} -->
- 
- &reference.dbplus.setup;
- &reference.dbplus.constants;
- &reference.dbplus.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/dbplus/configure.xml b/reference/dbplus/configure.xml
deleted file mode 100644
index a5f7c43e9e..0000000000
--- a/reference/dbplus/configure.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="dbplus.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.moved-ver;4.3.0
- </para>
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;dbplus">&url.pecl.package;dbplus</link>.
- </para>
- <para>
-  In order to build this extension yourself you need the db++ client libraries
-  and header files to be installed on your system (these are included in the
-  db++ installation archives by default). You have to run
-  <command>configure</command> with option <option>--with-dbplus</option> to
-  build this extension.
- </para>
- <para>
-  <command>configure</command> looks for the client libraries and header files
-  under the default paths <filename>/usr/dbplus</filename>,
-  <filename>/usr/local/dbplus</filename> and <filename>/opt/dblus</filename>.
-  If you have installed db++ in a different place you have add the installation
-  path to the <command>configure</command> option like this:
-  <option>--with-dbplus=/your/installation/path</option>.
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/constants.xml b/reference/dbplus/constants.xml
deleted file mode 100644
index 7f5f2105e9..0000000000
--- a/reference/dbplus/constants.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="dbplus.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
-  <section xml:id="dbplus.errorcodes">
-   <title>db++ error codes</title>
-   <para>
-    <table>
-     <title>DB++ Error Codes</title>
-     <tgroup cols="3">
-      <thead>
-       <row>
-        <entry>PHP Constant</entry>
-        <entry>db++ constant</entry>
-        <entry>meaning</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-       <entry>
-        <constant xml:id="constant.dbplus-err-noerr">DBPLUS_ERR_NOERR</constant>
-        (<type>int</type>)
-       </entry>
-        <entry>ERR_NOERR</entry>
-        <entry>Null error condition</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-duplicate">DBPLUS_ERR_DUPLICATE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_DUPLICATE</entry>
-        <entry>Tried to insert a duplicate tuple</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-eoscan">DBPLUS_ERR_EOSCAN</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_EOSCAN</entry>
-        <entry>End of scan from <literal>rget()</literal></entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-empty">DBPLUS_ERR_EMPTY</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_EMPTY</entry>
-        <entry>Relation is empty (server)</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-close">DBPLUS_ERR_CLOSE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_CLOSE</entry>
-        <entry>The server can't close</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-wlocked">DBPLUS_ERR_WLOCKED</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_WLOCKED</entry>
-        <entry>The record is write locked</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-locked">DBPLUS_ERR_LOCKED</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_LOCKED</entry>
-        <entry>Relation was already locked</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-nolock">DBPLUS_ERR_NOLOCK</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_NOLOCK</entry>
-        <entry>Relation cannot be locked</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-read">DBPLUS_ERR_READ</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_READ</entry>
-        <entry>Read error on relation</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-write">DBPLUS_ERR_WRITE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_WRITE</entry>
-        <entry>Write error on relation</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-create">DBPLUS_ERR_CREATE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_CREATE</entry>
-        <entry><literal>Create()</literal> system call failed</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-lseek">DBPLUS_ERR_LSEEK</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_LSEEK</entry>
-        <entry><literal>Lseek()</literal> system call failed</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-length">DBPLUS_ERR_LENGTH</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_LENGTH</entry>
-        <entry>Tuple exceeds maximum length</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-open">DBPLUS_ERR_OPEN</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_OPEN</entry>
-        <entry><literal>Open()</literal> system call failed</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-wopen">DBPLUS_ERR_WOPEN</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_WOPEN</entry>
-        <entry>Relation already opened for writing</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-magic">DBPLUS_ERR_MAGIC</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_MAGIC</entry>
-        <entry>File is not a relation</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-version">DBPLUS_ERR_VERSION</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_VERSION</entry>
-        <entry>File is a very old relation</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-pgsize">DBPLUS_ERR_PGSIZE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_PGSIZE</entry>
-        <entry>Relation uses a different page size</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-crc">DBPLUS_ERR_CRC</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_CRC</entry>
-        <entry>Invalid crc in the superpage</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-pipe">DBPLUS_ERR_PIPE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_PIPE</entry>
-        <entry>Piped relation requires <literal>lseek()</literal></entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-nidx">DBPLUS_ERR_NIDX</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_NIDX</entry>
-        <entry>Too many secondary indices</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-malloc">DBPLUS_ERR_MALLOC</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_MALLOC</entry>
-        <entry><literal>Malloc()</literal> call failed</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-nusers">DBPLUS_ERR_NUSERS</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_NUSERS</entry>
-        <entry>Error use of max users</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-preexit">DBPLUS_ERR_PREEXIT</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_PREEXIT</entry>
-        <entry>Caused by invalid usage</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-ontrap">DBPLUS_ERR_ONTRAP</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_ONTRAP</entry>
-        <entry>Caused by a signal</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-preproc">DBPLUS_ERR_PREPROC</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_PREPROC</entry>
-        <entry>Error in the preprocessor</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-dbparse">DBPLUS_ERR_DBPARSE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_DBPARSE</entry>
-        <entry>Error in the parser</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-dbrunerr">DBPLUS_ERR_DBRUNERR</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_DBRUNERR</entry>
-        <entry>Run error in db</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-dbpreexit">DBPLUS_ERR_DBPREEXIT</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_DBPREEXIT</entry>
-        <entry>Exit condition caused by <literal>prexit()</literal> * procedure</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-wait">DBPLUS_ERR_WAIT</constant>
-          (<type>int</type>)
-        </entry>
-        <entry>ERR_WAIT</entry>
-        <entry>Wait a little (Simple only)</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-corrupt-tuple">DBPLUS_ERR_CORRUPT_TUPLE</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_CORRUPT_TUPLE</entry>
-        <entry>A client sent a corrupt tuple</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-warning0">DBPLUS_ERR_WARNING0</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_WARNING0</entry> 
-        <entry>
-         The Simple routines encountered a non fatal error which was
-         corrected
-        </entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-panic">DBPLUS_ERR_PANIC</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_PANIC</entry>
-        <entry>
-         The server should not really die but after a disaster
-         send ERR_PANIC to all its clients
-        </entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-fifo">DBPLUS_ERR_FIFO</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_FIFO</entry>
-        <entry>Can't create a fifo</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-perm">DBPLUS_ERR_PERM</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_PERM</entry>
-        <entry>Permission denied</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-tcl">DBPLUS_ERR_TCL</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_TCL</entry>
-        <entry>TCL_error</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-restricted">DBPLUS_ERR_RESTRICTED</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_RESTRICTED</entry>
-        <entry>Only two users</entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-user">DBPLUS_ERR_USER</constant>
-         (<type>int</type>)
-        </entry> 
-        <entry>ERR_USER</entry>
-        <entry>
-         An error in the use of the library by an application
-         programmer
-        </entry>
-       </row>
-       <row>
-        <entry>
-         <constant xml:id="constant.dbplus-err-unknown">DBPLUS_ERR_UNKNOWN</constant>
-         (<type>int</type>)
-        </entry>
-        <entry>ERR_UNKNOWN</entry>
-        <entry></entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </table>
-   </para>
-  </section>
- </appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-add.xml b/reference/dbplus/functions/dbplus-add.xml
deleted file mode 100644
index a1d78e0ef8..0000000000
--- a/reference/dbplus/functions/dbplus-add.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-add" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_add</refname>
-  <refpurpose>Add a tuple to a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <!-- TODO: Check if tuple should be passed by reference -->
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_add</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter>tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a tuple to a <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-       An array of attribute/value pairs to be inserted into the given
-       <parameter>relation</parameter>.
-      </para>
-      <para>
-       After successful execution this array will contain the complete data
-       of the newly created tuple, including all implicitly set domain fields
-       like sequences.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The function will return <constant>DBPLUS_ERR_NOERR</constant> on success
-   or a db++ error code on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_errcode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-aql.xml b/reference/dbplus/functions/dbplus-aql.xml
deleted file mode 100644
index d628c1951b..0000000000
--- a/reference/dbplus/functions/dbplus-aql.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-aql" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_aql</refname>
-  <refpurpose>Perform AQL query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbplus_aql</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>server</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>dbpath</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Executes an AQL <parameter>query</parameter> on the given
-   <parameter>server</parameter> and <parameter>dbpath</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       The AQL query to be executed. Further information on the AQL (Algebraic
-       Query Language) is provided in the original db++ manual.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>server</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dbpath</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a relation handle on success. The result data may be fetched from
-   this relation by calling <function>dbplus_next</function> and
-   <function>dbplus_curr</function>. Other relation access functions will
-   not work on a result relation.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-chdir.xml b/reference/dbplus/functions/dbplus-chdir.xml
deleted file mode 100644
index 3e0b1e4a3b..0000000000
--- a/reference/dbplus/functions/dbplus-chdir.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-chdir" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_chdir</refname>
-  <refpurpose>Get/Set database virtual current directory</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>dbplus_chdir</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>newdir</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes the virtual current directory where relation files will be looked
-   for by <function>dbplus_open</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>newdir</parameter></term>
-     <listitem>
-      <para>
-       The new directory for relation files. You can omit this parameter to
-       query the current working directory.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the absolute path of the current directory. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-close.xml b/reference/dbplus/functions/dbplus-close.xml
deleted file mode 100644
index 75a0d7ef08..0000000000
--- a/reference/dbplus/functions/dbplus-close.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_close</refname>
-  <refpurpose>Close a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>dbplus_close</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes a relation previously opened by <function>dbplus_open</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success or <constant>DBPLUS_ERR_UNKNOWN</constant> on
-   failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-curr.xml b/reference/dbplus/functions/dbplus-curr.xml
deleted file mode 100644
index ff60f8c41a..0000000000
--- a/reference/dbplus/functions/dbplus-curr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-curr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_curr</refname>
-  <refpurpose>Get current tuple from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_curr</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads the data for the current tuple for the given
-   <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-       The data will be passed back in this parameter, as an associative
-       array.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The function will return zero (aka. <constant>DBPLUS_ERR_NOERR</constant>) on success
-   or a db++ error code on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_first</function></member>
-    <member><function>dbplus_prev</function></member>
-    <member><function>dbplus_next</function></member>
-    <member><function>dbplus_last</function></member>
-    <member><function>dbplus_errcode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-errcode.xml b/reference/dbplus/functions/dbplus-errcode.xml
deleted file mode 100644
index 5c86f0fa93..0000000000
--- a/reference/dbplus/functions/dbplus-errcode.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-errcode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_errcode</refname>
-  <refpurpose>Get error string for given errorcode or last error</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>dbplus_errcode</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>errno</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a clear error string for the given error code.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>errno</parameter></term>
-     <listitem>
-      <para>
-       The error code. If not provided, the result code of the last db++
-       operation is assumed.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the error message.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-errno.xml b/reference/dbplus/functions/dbplus-errno.xml
deleted file mode 100644
index d526ff884a..0000000000
--- a/reference/dbplus/functions/dbplus-errno.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-errno" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_errno</refname>
-  <refpurpose>Get error code for last operation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_errno</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the error code returned by the last db++ operation.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the error code, as an integer.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_errcode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-find.xml b/reference/dbplus/functions/dbplus-find.xml
deleted file mode 100644
index 67ef13f3b8..0000000000
--- a/reference/dbplus/functions/dbplus-find.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-find" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_find</refname>
-  <refpurpose>Set a constraint on a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_find</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter>constraints</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Places a constraint on the given <parameter>relation</parameter>.
-  </para>
-  <para>
-   Further calls to functions like <function>dbplus_curr</function> or
-   <function>dbplus_next</function> will only return tuples matching the
-   given constraints.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>constraints</parameter></term>
-     <listitem>
-      <para>
-       Constraints are triplets of strings containing of a domain name,
-       a comparison operator and a comparison value. The
-       <parameter>constraints</parameter> parameter array may consist of
-       a collection of string arrays, each of which contains a domain, an
-       operator and a value, or of a single string array containing a
-       multiple of three elements.
-      </para>
-      <para>
-       The comparison operator may be one of the following strings:
-       '==', '&gt;', '&gt;=', '&lt;', '&lt;=', '!=', '~' for a regular
-       expression match and 'BAND' or 'BOR' for bitwise operations.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_unselect</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-first.xml b/reference/dbplus/functions/dbplus-first.xml
deleted file mode 100644
index 8300bbd907..0000000000
--- a/reference/dbplus/functions/dbplus-first.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-first" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_first</refname>
-  <refpurpose>Get first tuple from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_first</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads the data for the first tuple for the given
-   <parameter>relation</parameter>, makes it the current tuple and pass it
-   back as an associative array in <parameter>tuple</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <constant>DBPLUS_ERR_NOERR</constant> on success or a db++ error
-   code on failure. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_curr</function></member>
-    <member><function>dbplus_prev</function></member>
-    <member><function>dbplus_next</function></member>
-    <member><function>dbplus_last</function></member>
-    <member><function>dbplus_errcode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-flush.xml b/reference/dbplus/functions/dbplus-flush.xml
deleted file mode 100644
index ee59125539..0000000000
--- a/reference/dbplus/functions/dbplus-flush.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-flush" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_flush</refname>
-  <refpurpose>Flush all changes made on a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_flush</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Writes all changes applied to <parameter>relation</parameter> since the
-   last flush to disk.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <constant>DBPLUS_ERR_NOERR</constant> on success or a db++ error
-   code on failure. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_errcode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-freealllocks.xml b/reference/dbplus/functions/dbplus-freealllocks.xml
deleted file mode 100644
index 36408ea1d3..0000000000
--- a/reference/dbplus/functions/dbplus-freealllocks.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-freealllocks" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_freealllocks</refname>
-  <refpurpose>Free all locks held by this client</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_freealllocks</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Frees all tuple locks held by this client.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_getlock</function></member>
-    <member><function>dbplus_freelock</function></member>
-    <member><function>dbplus_freerlocks</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-freelock.xml b/reference/dbplus/functions/dbplus-freelock.xml
deleted file mode 100644
index d15db87bd8..0000000000
--- a/reference/dbplus/functions/dbplus-freelock.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-freelock" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_freelock</refname>
-  <refpurpose>Release write lock on tuple</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_freelock</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>string</type><parameter>tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Releases a write lock on the given <parameter>tuple</parameter> previously
-   obtained by <function>dbplus_getlock</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_getlock</function></member>
-    <member><function>dbplus_freerlocks</function></member>
-    <member><function>dbplus_freealllocks</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-freerlocks.xml b/reference/dbplus/functions/dbplus-freerlocks.xml
deleted file mode 100644
index 1d15c438ff..0000000000
--- a/reference/dbplus/functions/dbplus-freerlocks.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-freerlocks" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_freerlocks</refname>
-  <refpurpose>Free all tuple locks on given relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_freerlocks</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Frees all tuple locks held on the given <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_getlock</function></member>
-    <member><function>dbplus_freelock</function></member>
-    <member><function>dbplus_freealllocks</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-getlock.xml b/reference/dbplus/functions/dbplus-getlock.xml
deleted file mode 100644
index 51e6b0b143..0000000000
--- a/reference/dbplus/functions/dbplus-getlock.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-getlock" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_getlock</refname>
-  <refpurpose>Get a write lock on a tuple</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_getlock</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>string</type><parameter>tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Requests a write lock on the specified <parameter>tuple</parameter>. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns zero on success or a non-zero error code, especially 
-   <constant>DBPLUS_ERR_WLOCKED</constant> on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_freelock</function></member>
-    <member><function>dbplus_freerlocks</function></member>
-    <member><function>dbplus_freealllocks</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-getunique.xml b/reference/dbplus/functions/dbplus-getunique.xml
deleted file mode 100644
index 28272797d0..0000000000
--- a/reference/dbplus/functions/dbplus-getunique.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-getunique" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_getunique</refname>
-  <refpurpose>Get an id number unique to a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_getunique</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>int</type><parameter>uniqueid</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Obtains a number guaranteed to be unique for the given
-   <parameter>relation</parameter> and will pass it back in the variable
-   given as <parameter>uniqueid</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>uniqueid</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <constant>DBPLUS_ERR_NOERR</constant> on success or a db++ error
-   code on failure. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-info.xml b/reference/dbplus/functions/dbplus-info.xml
deleted file mode 100644
index 3a3ce27460..0000000000
--- a/reference/dbplus/functions/dbplus-info.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_info</refname>
-  <refpurpose>Get information about a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_info</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">result</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-last.xml b/reference/dbplus/functions/dbplus-last.xml
deleted file mode 100644
index 13c64b69d6..0000000000
--- a/reference/dbplus/functions/dbplus-last.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-last" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_last</refname>
-  <refpurpose>Get last tuple from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_last</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads the data for the last tuple for the given
-   <parameter>relation</parameter>, makes it the current tuple and pass it
-   back as an associative array in <parameter>tuple</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <constant>DBPLUS_ERR_NOERR</constant> on success or a db++ error
-   code on failure. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_first</function></member>
-    <member><function>dbplus_curr</function></member>
-    <member><function>dbplus_prev</function></member>
-    <member><function>dbplus_next</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-lockrel.xml b/reference/dbplus/functions/dbplus-lockrel.xml
deleted file mode 100644
index ff35fa8772..0000000000
--- a/reference/dbplus/functions/dbplus-lockrel.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-lockrel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_lockrel</refname>
-  <refpurpose>Request write lock on relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_lockrel</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Requests a write lock on the given <parameter>relation</parameter>.
-  </para>
-  <para>
-   Other clients may still query the relation, but can't alter it while it is
-   locked.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-next.xml b/reference/dbplus/functions/dbplus-next.xml
deleted file mode 100644
index acd393e3aa..0000000000
--- a/reference/dbplus/functions/dbplus-next.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-next" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_next</refname>
-  <refpurpose>Get next tuple from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_next</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads the data for the next tuple for the given
-   <parameter>relation</parameter>, makes it the current tuple and will pass
-   it back as an associative array in <parameter>tuple</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <constant>DBPLUS_ERR_NOERR</constant> on success or a db++ error
-   code on failure. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_first</function></member>
-    <member><function>dbplus_curr</function></member>
-    <member><function>dbplus_prev</function></member>
-    <member><function>dbplus_last</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-open.xml b/reference/dbplus/functions/dbplus-open.xml
deleted file mode 100644
index 945e3cccaa..0000000000
--- a/reference/dbplus/functions/dbplus-open.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-open" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_open</refname>
-  <refpurpose>Open relation file</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbplus_open</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Opens the given relation file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Can be either a file name or a relative or absolute path name. This
-       will be mapped in any case to an absolute relation file path on a
-       specific host machine and server.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success a relation file resource (cursor) is returned which must
-   be used in any subsequent commands referencing the relation.
-   Failure leads to a zero return value, the actual error code may
-   be asked for by calling <function>dbplus_errno</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-prev.xml b/reference/dbplus/functions/dbplus-prev.xml
deleted file mode 100644
index 5834db9151..0000000000
--- a/reference/dbplus/functions/dbplus-prev.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-prev" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_prev</refname>
-  <refpurpose>Get previous tuple from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_prev</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads the data for the previous tuple for the given
-   <parameter>relation</parameter>, makes it the current tuple and will pass
-   it back as an associative array in <parameter>tuple</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <constant>DBPLUS_ERR_NOERR</constant> on success or a db++ error
-   code on failure. 
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_first</function></member>
-    <member><function>dbplus_curr</function></member>
-    <member><function>dbplus_next</function></member>
-    <member><function>dbplus_last</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rchperm.xml b/reference/dbplus/functions/dbplus-rchperm.xml
deleted file mode 100644
index 1b8efad20b..0000000000
--- a/reference/dbplus/functions/dbplus-rchperm.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rchperm" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rchperm</refname>
-  <refpurpose>Change relation permissions</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_rchperm</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mask</parameter></methodparam>
-   <methodparam><type>string</type><parameter>user</parameter></methodparam>
-   <methodparam><type>string</type><parameter>group</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes access permissions as specified by <parameter>mask</parameter>,
-   <parameter>user</parameter> and <parameter>group</parameter>. The
-   values for these are operating system specific.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mask</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>user</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>group</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rcreate.xml b/reference/dbplus/functions/dbplus-rcreate.xml
deleted file mode 100644
index ca25c9e35f..0000000000
--- a/reference/dbplus/functions/dbplus-rcreate.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rcreate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rcreate</refname>
-  <refpurpose>Creates a new DB++ relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbplus_rcreate</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>domlist</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new relation. Any existing relation sharing the same
-   <parameter>name</parameter> will be overwritten if the relation is
-   currently not in use and <parameter>overwrite</parameter> is set to TRUE.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>domlist</parameter></term>
-     <listitem>
-      <para>
-       A combination of domains. May be passed as a single domain name string
-       or as an array of domain names.
-      </para>
-      <para>
-       This parameter should contain the domain specification for the new
-       relation within an array of domain description strings. A domain
-       description string consists of a domain name unique to this
-       relation, a slash and a type specification character. See the
-       db++ documentation, especially the dbcreate(1) manpage, for a
-       description of available type specifiers and their meanings.
-      </para>
-      <note>
-       <para>
-        This function will also accept a string with space delimited domain
-        description strings, but it is recommended to use an array
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rcrtexact.xml b/reference/dbplus/functions/dbplus-rcrtexact.xml
deleted file mode 100644
index 172555401e..0000000000
--- a/reference/dbplus/functions/dbplus-rcrtexact.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rcrtexact" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rcrtexact</refname>
-  <refpurpose>Creates an exact but empty copy of a relation including indices</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>dbplus_rcrtexact</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rcrtexact</function> will create an exact but
-   empty copy of the given <parameter>relation</parameter> under a
-   new <parameter>name</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       The copied relation, opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-       An existing relation by the same <parameter>name</parameter> will only
-       be overwritten if this parameter is set to &true; and no other process
-       is currently using the relation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns resource on success or <constant>DBPLUS_ERR_UNKNOWN</constant> on
-   failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rcrtlike.xml b/reference/dbplus/functions/dbplus-rcrtlike.xml
deleted file mode 100644
index d06c7a4f92..0000000000
--- a/reference/dbplus/functions/dbplus-rcrtlike.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rcrtlike" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rcrtlike</refname>
-  <refpurpose>Creates an empty copy of a relation with default indices</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>dbplus_rcrtlike</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>overwrite</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rcrtexact</function> will create an  empty copy
-   of the given <parameter>relation</parameter> under a new
-   <parameter>name</parameter>, but with default indices.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       The copied relation, opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-       An existing relation by the same <parameter>name</parameter> will only
-       be overwritten if this parameter is set to &true; and no other process
-       is currently using the relation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns resource on success or <constant>DBPLUS_ERR_UNKNOWN</constant> on
-   failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-resolve.xml b/reference/dbplus/functions/dbplus-resolve.xml
deleted file mode 100644
index e349640509..0000000000
--- a/reference/dbplus/functions/dbplus-resolve.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-resolve" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_resolve</refname>
-  <refpurpose>Resolve host information for relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>dbplus_resolve</methodname>
-   <methodparam><type>string</type><parameter>relation_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_resolve</function> will try to resolve the given
-   <parameter>relation_name</parameter> and find out internal server
-   id, real hostname and the database path on this host. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation_name</parameter></term>
-     <listitem>
-      <para>
-       The relation name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing these values under the keys
-   <literal>sid</literal>, <literal>host</literal> and
-   <literal>host_path</literal> or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_tcl</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-restorepos.xml b/reference/dbplus/functions/dbplus-restorepos.xml
deleted file mode 100644
index 77b9e7e168..0000000000
--- a/reference/dbplus/functions/dbplus-restorepos.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-restorepos" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_restorepos</refname>
-  <refpurpose>Restore position</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_restorepos</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter>tuple</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rkeys.xml b/reference/dbplus/functions/dbplus-rkeys.xml
deleted file mode 100644
index 77f5bbdfce..0000000000
--- a/reference/dbplus/functions/dbplus-rkeys.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rkeys" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rkeys</refname>
-  <refpurpose>Specify new primary key for a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>dbplus_rkeys</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>domlist</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rkeys</function> will replace the current
-   primary key for <parameter>relation</parameter> with the
-   combination of domains specified by <parameter>domlist</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>domlist</parameter></term>
-     <listitem>
-      <para>
-        A combination of domains. May be passed as a single domain name
-        string or as an array of domain names.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns resource on success or <constant>DBPLUS_ERR_UNKNOWN</constant> on
-   failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-ropen.xml b/reference/dbplus/functions/dbplus-ropen.xml
deleted file mode 100644
index e6c6b94792..0000000000
--- a/reference/dbplus/functions/dbplus-ropen.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-ropen" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_ropen</refname>
-  <refpurpose>Open relation file local</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbplus_ropen</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_ropen</function> will open the relation
-   <parameter>file</parameter> locally for quick access without any
-   client/server overhead. Access is read only and only
-   <function>dbplus_curr</function> and
-   <function>dbplus_next</function> may be applied to the returned
-   relation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rquery.xml b/reference/dbplus/functions/dbplus-rquery.xml
deleted file mode 100644
index 5dc0b3126a..0000000000
--- a/reference/dbplus/functions/dbplus-rquery.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rquery" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rquery</refname>
-  <refpurpose>Perform local (raw) AQL query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbplus_rquery</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>dbpath</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rquery</function> performs a local (raw) AQL
-   query using an AQL interpreter embedded into the db++ client
-   library. <function>dbplus_rquery</function> is faster than
-   <function>dbplus_aql</function> but will work on local data only.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dbpath</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rrename.xml b/reference/dbplus/functions/dbplus-rrename.xml
deleted file mode 100644
index 470ef02a65..0000000000
--- a/reference/dbplus/functions/dbplus-rrename.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rrename" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rrename</refname>
-  <refpurpose>Rename a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_rrename</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rrename</function> will change the name of
-   <parameter>relation</parameter> to <parameter>name</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rsecindex.xml b/reference/dbplus/functions/dbplus-rsecindex.xml
deleted file mode 100644
index 7720181937..0000000000
--- a/reference/dbplus/functions/dbplus-rsecindex.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rsecindex" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rsecindex</refname>
-  <refpurpose>Create a new secondary index for a relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>dbplus_rsecindex</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>domlist</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rsecindex</function> will create a new secondary
-   index for <parameter>relation</parameter> with consists of the
-   domains specified by <parameter>domlist</parameter> and is of
-   type <parameter>type</parameter>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>domlist</parameter></term>
-     <listitem>
-      <para>
-       A combination of domains. May be passed as a single domain name
-       string or as an array of domain names.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns resource on success or <constant>DBPLUS_ERR_UNKNOWN</constant> on
-   failure.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-runlink.xml b/reference/dbplus/functions/dbplus-runlink.xml
deleted file mode 100644
index e35b2e6503..0000000000
--- a/reference/dbplus/functions/dbplus-runlink.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-runlink" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_runlink</refname>
-  <refpurpose>Remove relation from filesystem</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_runlink</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_runlink</function> will close and remove the
-   <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-rzap.xml b/reference/dbplus/functions/dbplus-rzap.xml
deleted file mode 100644
index 329eede6e5..0000000000
--- a/reference/dbplus/functions/dbplus-rzap.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-rzap" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_rzap</refname>
-  <refpurpose>Remove all tuples from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_rzap</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_rzap</function> will remove all tuples from
-   <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-savepos.xml b/reference/dbplus/functions/dbplus-savepos.xml
deleted file mode 100644
index af8e9dca2f..0000000000
--- a/reference/dbplus/functions/dbplus-savepos.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-savepos" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_savepos</refname>
-  <refpurpose>Save position</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_savepos</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-setindex.xml b/reference/dbplus/functions/dbplus-setindex.xml
deleted file mode 100644
index 10fc76b994..0000000000
--- a/reference/dbplus/functions/dbplus-setindex.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-setindex" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_setindex</refname>
-  <refpurpose>Set index</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_setindex</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>string</type><parameter>idx_name</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>idx_name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-setindexbynumber.xml b/reference/dbplus/functions/dbplus-setindexbynumber.xml
deleted file mode 100644
index efe4c7cb71..0000000000
--- a/reference/dbplus/functions/dbplus-setindexbynumber.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-setindexbynumber" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_setindexbynumber</refname>
-  <refpurpose>Set index by number</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_setindexbynumber</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>int</type><parameter>idx_number</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>idx_number</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-sql.xml b/reference/dbplus/functions/dbplus-sql.xml
deleted file mode 100644
index 2f34923765..0000000000
--- a/reference/dbplus/functions/dbplus-sql.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-sql" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_sql</refname>
-  <refpurpose>Perform SQL query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbplus_sql</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>server</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>dbpath</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>server</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dbpath</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-tcl.xml b/reference/dbplus/functions/dbplus-tcl.xml
deleted file mode 100644
index 4a0dad4c4a..0000000000
--- a/reference/dbplus/functions/dbplus-tcl.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-tcl" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_tcl</refname>
-  <refpurpose>Execute TCL code on server side</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>dbplus_tcl</methodname>
-   <methodparam><type>int</type><parameter>sid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A db++ server will prepare a TCL interpreter for each client
-   connection. This interpreter will enable the server to execute
-   TCL code provided by the client as a sort of stored procedures to
-   improve the performance of database operations by avoiding
-   client/server data transfers and context switches.
-  </para>
-  <para>
-   <function>dbplus_tcl</function> needs to pass the client
-   connection id the TCL <parameter>script</parameter> code should
-   be executed by. <function>dbplus_resolve</function> will provide
-   this connection id. The function will return whatever the TCL
-   code returns or a TCL error message if the TCL code fails.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sid</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>script</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_resolve</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-tremove.xml b/reference/dbplus/functions/dbplus-tremove.xml
deleted file mode 100644
index 1cc0a65c00..0000000000
--- a/reference/dbplus/functions/dbplus-tremove.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-tremove" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_tremove</refname>
-  <refpurpose>Remove tuple and return new current tuple</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_tremove</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter>tuple</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">current</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_tremove</function> removes
-   <parameter>tuple</parameter> from <parameter>relation</parameter>
-   if it perfectly matches a tuple within the
-   relation. <parameter>current</parameter>, if given, will contain
-   the data of the new current tuple after calling
-   <function>dbplus_tremove</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tuple</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>current</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-undo.xml b/reference/dbplus/functions/dbplus-undo.xml
deleted file mode 100644
index 9965d147c9..0000000000
--- a/reference/dbplus/functions/dbplus-undo.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-undo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_undo</refname>
-  <refpurpose>Undo</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_undo</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-undoprepare.xml b/reference/dbplus/functions/dbplus-undoprepare.xml
deleted file mode 100644
index 7e672cfce5..0000000000
--- a/reference/dbplus/functions/dbplus-undoprepare.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-undoprepare" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_undoprepare</refname>
-  <refpurpose>Prepare undo</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_undoprepare</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-unlockrel.xml b/reference/dbplus/functions/dbplus-unlockrel.xml
deleted file mode 100644
index 4857e5b8be..0000000000
--- a/reference/dbplus/functions/dbplus-unlockrel.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-unlockrel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_unlockrel</refname>
-  <refpurpose>Give up write lock on relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_unlockrel</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Release a write lock previously obtained by
-   <function>dbplus_lockrel</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-unselect.xml b/reference/dbplus/functions/dbplus-unselect.xml
deleted file mode 100644
index cc9a4c5014..0000000000
--- a/reference/dbplus/functions/dbplus-unselect.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-unselect" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_unselect</refname>
-  <refpurpose>Remove a constraint from relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_unselect</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calling <function>dbplus_unselect</function> will remove a
-   constraint previously set by <function>dbplus_find</function> on
-   <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-update.xml b/reference/dbplus/functions/dbplus-update.xml
deleted file mode 100644
index 95a8d72067..0000000000
--- a/reference/dbplus/functions/dbplus-update.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-update" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_update</refname>
-  <refpurpose>Update specified tuple in relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_update</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-   <methodparam><type>array</type><parameter>old</parameter></methodparam>
-   <methodparam><type>array</type><parameter>new</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbplus_update</function> replaces the <parameter>old</parameter>
-   tuple with the data from the <parameter>new</parameter> one, only if the
-   <parameter>old</parameter> completely matches a tuple within
-   <parameter>relation</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>old</parameter></term>
-     <listitem>
-      <para>
-       The old tuple.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new</parameter></term>
-     <listitem>
-      <para>
-       The new tuple.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-xlockrel.xml b/reference/dbplus/functions/dbplus-xlockrel.xml
deleted file mode 100644
index 1a385727ba..0000000000
--- a/reference/dbplus/functions/dbplus-xlockrel.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-xlockrel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_xlockrel</refname>
-  <refpurpose>Request exclusive lock on relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_xlockrel</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Request an exclusive lock on <parameter>relation</parameter> preventing
-   even read access from other clients.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbplus_xunlockrel</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/functions/dbplus-xunlockrel.xml b/reference/dbplus/functions/dbplus-xunlockrel.xml
deleted file mode 100644
index d43da04b04..0000000000
--- a/reference/dbplus/functions/dbplus-xunlockrel.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbplus-xunlockrel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbplus_xunlockrel</refname>
-  <refpurpose>Free exclusive lock on relation</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbplus_xunlockrel</methodname>
-   <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Releases an exclusive lock previously obtained by
-   <function>dbplus_xlockrel</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>relation</parameter></term>
-     <listitem>
-      <para>
-       A relation opened by <function>dbplus_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/reference.xml b/reference/dbplus/reference.xml
deleted file mode 100644
index 78b17a9524..0000000000
--- a/reference/dbplus/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.dbplus" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>DB++ &Functions;</title>
-  
- &reference.dbplus.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dbplus/setup.xml b/reference/dbplus/setup.xml
deleted file mode 100644
index eefe40d2fc..0000000000
--- a/reference/dbplus/setup.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="dbplus.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="dbplus.requirements">
-  &reftitle.required;
-  <para>
-   This extension relies on external client libraries so you have
-   to have a db++ client installed on the system you want to use
-   this extension on.
-  </para>
-  <para>
-   <link xlink:href="&url.dbplus.company;">Concept asa</link> provides
-   <link xlink:href="&url.dbplus.download;">db++ Demo versions</link>
-   and <link xlink:href="&url.dbplus.documentation;">documentation</link> 
-   for Linux, some other Unix versions. There is also a Windows 
-   version of db++, but this extension doesn't support it (yet).      
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.dbplus.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="dbplus.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="dbplus.resources">
-  &reftitle.resources;
-  <section xml:id="dbplus.resources.relation">
-   <title>dbplus_relation</title>
-   <para>
-    Most db++ functions operate on or return
-    <parameter>dbplus_relation</parameter> resources. A
-    <parameter>dbplus_relation</parameter> is a handle to a stored
-    relation or a relation generated as the result of a query.
-   </para>
-  </section>
- </section>
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/dbplus/versions.xml b/reference/dbplus/versions.xml
deleted file mode 100644
index 35365fa859..0000000000
--- a/reference/dbplus/versions.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions> 
- <function name='dbplus_add' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_aql' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_chdir' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_close' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_curr' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_errcode' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_errno' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_find' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_first' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_flush' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_freealllocks' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_freelock' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_freerlocks' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_getlock' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_getunique' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_info' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_last' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_lockrel' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_next' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_open' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_prev' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rchperm' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rcreate' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rcrtexact' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rcrtlike' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_resolve' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_restorepos' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rkeys' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_ropen' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rquery' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rrename' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rsecindex' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_runlink' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_rzap' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_savepos' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_setindex' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_setindexbynumber' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_sql' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_tcl' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_tremove' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_undo' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_undoprepare' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_unlockrel' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_unselect' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_update' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_xlockrel' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
- <function name='dbplus_xunlockrel' from='PHP 4 &lt;= 4.3.0, PECL dbplus &gt;= 0.9'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/dio/book.xml b/reference/dio/book.xml
index 473337172b..07c04ac323 100644
--- a/reference/dio/book.xml
+++ b/reference/dio/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.dio" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Direct IO</title>
  
  <!-- {{{ preface -->
@@ -17,11 +18,6 @@
    <link linkend="book.filesystem">filesystem</link> functions are more
    than adequate. 
   </para>
-  <note>
-   <para>
-    &pecl.moved-ver;5.1.0.
-   </para>
-  </note>
  </preface>
  <!-- }}} -->
  
diff --git a/reference/dir/constants.xml b/reference/dir/constants.xml
index c0cc9aefc8..5baaeaea8f 100644
--- a/reference/dir/constants.xml
+++ b/reference/dir/constants.xml
@@ -32,7 +32,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -43,7 +43,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -54,7 +54,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.4.0.
+
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/dir/functions/chroot.xml b/reference/dir/functions/chroot.xml
index 396ee466b9..270bb11807 100644
--- a/reference/dir/functions/chroot.xml
+++ b/reference/dir/functions/chroot.xml
@@ -23,6 +23,10 @@
    only when using the CLI, CGI or Embed SAPI. Also, this function
    requires root privileges.
   </para>
+  <para>
+   Calling this function does not change the values of the <literal>__DIR__</literal>
+   and <literal>__FILE__</literal> magic constants.
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/dir/functions/closedir.xml b/reference/dir/functions/closedir.xml
index d2b6bc28e8..fcff744b0c 100644
--- a/reference/dir/functions/closedir.xml
+++ b/reference/dir/functions/closedir.xml
@@ -39,6 +39,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/dir/functions/getcwd.xml b/reference/dir/functions/getcwd.xml
index 00cfe16735..1b412cb1e6 100644
--- a/reference/dir/functions/getcwd.xml
+++ b/reference/dir/functions/getcwd.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -33,18 +38,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  <caution>
-   <para>
-    If the PHP interpreter has been built with ZTS (Zend Thread Safety) enabled,
-    the current working directory returned by <function>getcwd</function>
-    may be different from that returned by operating system interfaces.
-    External libraries (invoked through <link linkend="book.ffi">FFI</link>)
-    which depend on the current working directory will be affected.
-   </para>
-  </caution>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -76,6 +69,18 @@ echo getcwd() . "\n";
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  <caution>
+   <para>
+    If the PHP interpreter has been built with ZTS (Zend Thread Safety) enabled,
+    the current working directory returned by <function>getcwd</function>
+    may be different from that returned by operating system interfaces.
+    External libraries (invoked through <link linkend="book.ffi">FFI</link>)
+    which depend on the current working directory will be affected.
+   </para>
+  </caution>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/dom/domattr/isid.xml b/reference/dom/domattr/isid.xml
index 01256deff4..f38451cc9e 100644
--- a/reference/dom/domattr/isid.xml
+++ b/reference/dom/domattr/isid.xml
@@ -23,6 +23,12 @@
    or <literal>DOMDocument::validateOnParse</literal> before using this function.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domdocument/createdocumentfragment.xml b/reference/dom/domdocument/createdocumentfragment.xml
index a26e762387..71260f12cc 100644
--- a/reference/dom/domdocument/createdocumentfragment.xml
+++ b/reference/dom/domdocument/createdocumentfragment.xml
@@ -16,6 +16,12 @@
    <classname>DOMDocumentFragment</classname>. &dom.node.inserted;
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domdocument/getelementsbytagnamens.xml b/reference/dom/domdocument/getelementsbytagnamens.xml
index 10a04a992b..2c6e44ff1b 100644
--- a/reference/dom/domdocument/getelementsbytagnamens.xml
+++ b/reference/dom/domdocument/getelementsbytagnamens.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>DOMNodeList</type><methodname>DOMDocument::getElementsByTagNameNS</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>namespace</parameter></methodparam>
    <methodparam><type>string</type><parameter>localName</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -51,6 +51,29 @@
    elements.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>namespace</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/dom/domdocument/loadhtml.xml b/reference/dom/domdocument/loadhtml.xml
index e3e62e9f69..e7822edb5f 100644
--- a/reference/dom/domdocument/loadhtml.xml
+++ b/reference/dom/domdocument/loadhtml.xml
@@ -39,7 +39,7 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       Since PHP 5.4.0 and Libxml 2.6.0, you may also use the
+       Since Libxml 2.6.0, you may also use the
        <parameter>options</parameter> parameter to specify <link linkend="libxml.constants">additional Libxml parameters</link>.
       </para>
      </listitem>
diff --git a/reference/dom/domdocument/loadhtmlfile.xml b/reference/dom/domdocument/loadhtmlfile.xml
index 6bd21be477..b0abdf4d4f 100644
--- a/reference/dom/domdocument/loadhtmlfile.xml
+++ b/reference/dom/domdocument/loadhtmlfile.xml
@@ -36,7 +36,7 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       Since PHP 5.4.0 and Libxml 2.6.0, you may also use the
+       Since Libxml 2.6.0, you may also use the
        <parameter>options</parameter> parameter to specify <link linkend="libxml.constants">additional Libxml parameters</link>.
       </para>
      </listitem>
diff --git a/reference/dom/domdocument/normalizedocument.xml b/reference/dom/domdocument/normalizedocument.xml
index 25434eec77..ed12e84e9d 100644
--- a/reference/dom/domdocument/normalizedocument.xml
+++ b/reference/dom/domdocument/normalizedocument.xml
@@ -17,6 +17,11 @@
    document in a "normal" form.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/dom/domdocument/schemavalidate.xml b/reference/dom/domdocument/schemavalidate.xml
index ea87005edb..214eb0751c 100644
--- a/reference/dom/domdocument/schemavalidate.xml
+++ b/reference/dom/domdocument/schemavalidate.xml
@@ -35,7 +35,7 @@
      <listitem>
       <para>
        A bitmask of Libxml schema validation flags. Currently the only supported value is <link
-        linkend="libxml.constants">LIBXML_SCHEMA_CREATE</link>. Available since PHP 5.5.2 and Libxml 2.6.14.
+        linkend="libxml.constants">LIBXML_SCHEMA_CREATE</link>. Available since Libxml 2.6.14.
       </para>
      </listitem>
     </varlistentry>
@@ -48,29 +48,7 @@
    &return.success;
   </para>
  </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.2</entry>
-       <entry>
-        Added the <parameter>flags</parameter> parameter
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/dom/domdocument/schemavalidatesource.xml b/reference/dom/domdocument/schemavalidatesource.xml
index 8b143754d7..eede54637c 100644
--- a/reference/dom/domdocument/schemavalidatesource.xml
+++ b/reference/dom/domdocument/schemavalidatesource.xml
@@ -34,7 +34,7 @@
      <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       A bitmask of Libxml schema validation flags. Currently the only supported value is <link linkend="libxml.constants">LIBXML_SCHEMA_CREATE</link>. Available since PHP 5.5.2 and Libxml 2.6.14.
+       A bitmask of Libxml schema validation flags. Currently the only supported value is <link linkend="libxml.constants">LIBXML_SCHEMA_CREATE</link>. Available since Libxml 2.6.14.
       </para>
      </listitem>
     </varlistentry>
@@ -47,29 +47,7 @@
    &return.success;
   </para>
  </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.2</entry>
-       <entry>
-        Added the <parameter>flags</parameter> parameter
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/dom/domdocument/validate.xml b/reference/dom/domdocument/validate.xml
index 68c885a8f8..1f0186b590 100644
--- a/reference/dom/domdocument/validate.xml
+++ b/reference/dom/domdocument/validate.xml
@@ -21,6 +21,12 @@
    <classname>DOMDocument</classname> to make a DTD validation.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domdocument/xinclude.xml b/reference/dom/domdocument/xinclude.xml
index ce15da4f02..0cdf30e0f0 100644
--- a/reference/dom/domdocument/xinclude.xml
+++ b/reference/dom/domdocument/xinclude.xml
@@ -32,7 +32,7 @@
      <listitem>
       <para>
        <link linkend="libxml.constants">libxml parameters</link>. Available
-       since PHP 5.1.0 and Libxml 2.6.7.
+       since Libxml 2.6.7.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/dom/domelement/getelementsbytagnamens.xml b/reference/dom/domelement/getelementsbytagnamens.xml
index 6ad757a34d..4d0fa6ed0d 100644
--- a/reference/dom/domelement/getelementsbytagnamens.xml
+++ b/reference/dom/domelement/getelementsbytagnamens.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>DOMNodeList</type><methodname>DOMElement::getElementsByTagNameNS</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>namespace</parameter></methodparam>
    <methodparam><type>string</type><parameter>localName</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -49,6 +49,29 @@
    which they are encountered in a preorder traversal of this element tree.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>namespace</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/dom/domimplementation/construct.xml b/reference/dom/domimplementation/construct.xml
index 4e2b839f1f..9fbdabdd88 100644
--- a/reference/dom/domimplementation/construct.xml
+++ b/reference/dom/domimplementation/construct.xml
@@ -17,6 +17,12 @@
    Creates a new <classname>DOMImplementation</classname> object.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/dom/domimplementation/createdocument.xml b/reference/dom/domimplementation/createdocument.xml
index e232ff3781..a4993ce3b4 100644
--- a/reference/dom/domimplementation/createdocument.xml
+++ b/reference/dom/domimplementation/createdocument.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>DOMDocument</type><type>false</type></type><methodname>DOMImplementation::createDocument</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>namespace</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>namespace</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>qualifiedName</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>DOMDocumentType</type><type>null</type></type><parameter>doctype</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
@@ -100,6 +100,12 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>8.0.3</entry>
+       <entry>
+        <parameter>namespace</parameter> is now nullable.
+       </entry>
+      </row>
       <row>
        <entry>8.0.0</entry>
        <entry>
diff --git a/reference/dom/domnode.xml b/reference/dom/domnode.xml
index e426dcf958..fdfc1cd1a8 100644
--- a/reference/dom/domnode.xml
+++ b/reference/dom/domnode.xml
@@ -223,7 +223,7 @@
     <varlistentry xml:id="domnode.props.ownerdocument">
      <term><varname>ownerDocument</varname></term>
      <listitem>
-      <para>The <classname>DOMDocument</classname> object associated with this node, or &null; if this node is a <classname>DOMDOcument</classname></para>
+      <para>The <classname>DOMDocument</classname> object associated with this node, or &null; if this node is a <classname>DOMDocument</classname></para>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="domnode.props.namespaceuri">
@@ -270,31 +270,6 @@
   </section>
 <!-- }}} -->
 
- <section role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.1</entry>
-       <entry>
-        The textContent property has been made writable (formerly it has been
-        readonly).
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </section>
-
 <!-- {{{ See also -->
   <section role="seealso">
    &reftitle.seealso;
diff --git a/reference/dom/domnode/hasattributes.xml b/reference/dom/domnode/hasattributes.xml
index b591131d3a..9509870ae7 100644
--- a/reference/dom/domnode/hasattributes.xml
+++ b/reference/dom/domnode/hasattributes.xml
@@ -18,6 +18,12 @@
    an <constant>XML_ELEMENT_NODE</constant>.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domnode/haschildnodes.xml b/reference/dom/domnode/haschildnodes.xml
index 7e7cf23766..65481964d1 100644
--- a/reference/dom/domnode/haschildnodes.xml
+++ b/reference/dom/domnode/haschildnodes.xml
@@ -17,6 +17,12 @@
    This function checks if the node has children.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domnode/normalize.xml b/reference/dom/domnode/normalize.xml
index 1e7748d8cc..b83af869c1 100644
--- a/reference/dom/domnode/normalize.xml
+++ b/reference/dom/domnode/normalize.xml
@@ -18,6 +18,12 @@
    its children.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domtext/iswhitespaceinelementcontent.xml b/reference/dom/domtext/iswhitespaceinelementcontent.xml
index 65bd207fbe..b6a5cd7829 100644
--- a/reference/dom/domtext/iswhitespaceinelementcontent.xml
+++ b/reference/dom/domtext/iswhitespaceinelementcontent.xml
@@ -19,6 +19,12 @@
    the load of the document.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/functions/dom-import-simplexml.xml b/reference/dom/functions/dom-import-simplexml.xml
index c12bf94684..7e3cffdfc1 100644
--- a/reference/dom/functions/dom-import-simplexml.xml
+++ b/reference/dom/functions/dom-import-simplexml.xml
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>DOMElement</type><type>null</type></type><methodname>dom_import_simplexml</methodname>
+   <type>DOMElement</type><methodname>dom_import_simplexml</methodname>
    <methodparam><type>object</type><parameter>node</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -39,9 +39,32 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The <classname>DOMElement</classname> node added or &false; if any errors occur.
+   The <classname>DOMElement</classname> node added.
   </para>
  </refsect1>
+ 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       This function no longer returns &null; on failure.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/dom/versions.xml b/reference/dom/versions.xml
index e8d0684eb4..945858152a 100644
--- a/reference/dom/versions.xml
+++ b/reference/dom/versions.xml
@@ -4,159 +4,159 @@
   Do NOT translate this file
 -->
 <versions> 
- <function name="domattr" from="PHP 5, PHP 7"/>
- <function name="domattr::__construct" from="PHP 5, PHP 7"/>
- <function name="domattr::isid" from="PHP 5, PHP 7"/>
+ <function name="domattr" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domattr::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domattr::isid" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domcdatasection" from="PHP 5, PHP 7"/>
- <function name="domcdatasection::__construct" from="PHP 5, PHP 7"/>
+ <function name="domcdatasection" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcdatasection::__construct" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domcharacterdata" from="PHP 5, PHP 7"/>
- <function name="domcharacterdata::appenddata" from="PHP 5, PHP 7"/>
- <function name="domcharacterdata::deletedata" from="PHP 5, PHP 7"/>
- <function name="domcharacterdata::insertdata" from="PHP 5, PHP 7"/>
- <function name="domcharacterdata::replacedata" from="PHP 5, PHP 7"/>
- <function name="domcharacterdata::substringdata" from="PHP 5, PHP 7"/>
+ <function name="domcharacterdata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcharacterdata::appenddata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcharacterdata::deletedata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcharacterdata::insertdata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcharacterdata::replacedata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcharacterdata::substringdata" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domcomment" from="PHP 5, PHP 7"/>
- <function name="domcomment::__construct" from="PHP 5, PHP 7"/>
+ <function name="domcomment" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domcomment::__construct" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domdocument" from="PHP 5, PHP 7"/>
- <function name="domdocument::__construct" from="PHP 5, PHP 7"/>
- <function name="domdocument::registernodeclass" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="domdocument::adoptnode" from="PHP 5, PHP 7"/>
- <function name="domdocument::createattribute" from="PHP 5, PHP 7"/>
- <function name="domdocument::createattributens" from="PHP 5, PHP 7"/>
- <function name="domdocument::createcdatasection" from="PHP 5, PHP 7"/>
- <function name="domdocument::createcomment" from="PHP 5, PHP 7"/>
- <function name="domdocument::createdocumentfragment" from="PHP 5, PHP 7"/>
- <function name="domdocument::createelement" from="PHP 5, PHP 7"/>
- <function name="domdocument::createelementns" from="PHP 5, PHP 7"/>
- <function name="domdocument::createentityreference" from="PHP 5, PHP 7"/>
- <function name="domdocument::createprocessinginstruction" from="PHP 5, PHP 7"/>
- <function name="domdocument::createtextnode" from="PHP 5, PHP 7"/>
- <function name="domdocument::getelementbyid" from="PHP 5, PHP 7"/>
- <function name="domdocument::getelementsbytagname" from="PHP 5, PHP 7"/>
- <function name="domdocument::getelementsbytagnamens" from="PHP 5, PHP 7"/>
- <function name="domdocument::importnode" from="PHP 5, PHP 7"/>
- <function name="domdocument::load" from="PHP 5, PHP 7"/>
- <function name="domdocument::loadhtml" from="PHP 5, PHP 7"/>
- <function name="domdocument::loadhtmlfile" from="PHP 5, PHP 7"/>
- <function name="domdocument::loadxml" from="PHP 5, PHP 7"/>
- <function name="domdocument::normalizedocument" from="PHP 5, PHP 7"/>
- <function name="domdocument::relaxngvalidate" from="PHP 5, PHP 7"/>
- <function name="domdocument::relaxngvalidatesource" from="PHP 5, PHP 7"/>
+ <function name="domdocument" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::registernodeclass" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="domdocument::adoptnode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createattribute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createattributens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createcdatasection" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createcomment" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createdocumentfragment" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createelement" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createelementns" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createentityreference" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createprocessinginstruction" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::createtextnode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::getelementbyid" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::getelementsbytagname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::getelementsbytagnamens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::importnode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::load" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::loadhtml" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::loadhtmlfile" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::loadxml" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::normalizedocument" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::relaxngvalidate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::relaxngvalidatesource" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domdocument::renamenode" from="PHP 5, PHP 7"/>
- <function name="domdocument::save" from="PHP 5, PHP 7"/>
- <function name="domdocument::savehtml" from="PHP 5, PHP 7"/>
- <function name="domdocument::savehtmlfile" from="PHP 5, PHP 7"/>
- <function name="domdocument::savexml" from="PHP 5, PHP 7"/>
- <function name="domdocument::schemavalidatesource" from="PHP 5, PHP 7"/>
- <function name="domdocument::schemavalidate" from="PHP 5, PHP 7"/>
- <function name="domdocument::validate" from="PHP 5, PHP 7"/>
- <function name="domdocument::xinclude" from="PHP 5, PHP 7"/>
+ <function name="domdocument::save" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::savehtml" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::savehtmlfile" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::savexml" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::schemavalidatesource" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::schemavalidate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::validate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocument::xinclude" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domdocumentfragment" from="PHP 5, PHP 7"/>
- <function name="domdocumentfragment::__construct" from="PHP 5, PHP 7"/>
- <function name="domdocumentfragment::appendxml" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="domdocumentfragment" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocumentfragment::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domdocumentfragment::appendxml" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="domdocumenttype" from="PHP 5, PHP 7"/>
+ <function name="domdocumenttype" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domelement" from="PHP 5, PHP 7"/>
- <function name="domelement::__construct" from="PHP 5, PHP 7"/>
- <function name="domelement::getattribute" from="PHP 5, PHP 7"/>
- <function name="domelement::getattributenode" from="PHP 5, PHP 7"/>
- <function name="domelement::getattributenodens" from="PHP 5, PHP 7"/>
- <function name="domelement::getattributens" from="PHP 5, PHP 7"/>
- <function name="domelement::getelementsbytagname" from="PHP 5, PHP 7"/>
- <function name="domelement::getelementsbytagnamens" from="PHP 5, PHP 7"/>
- <function name="domelement::hasattribute" from="PHP 5, PHP 7"/>
- <function name="domelement::hasattributens" from="PHP 5, PHP 7"/>
- <function name="domelement::removeattribute" from="PHP 5, PHP 7"/>
- <function name="domelement::removeattributenode" from="PHP 5, PHP 7"/>
- <function name="domelement::removeattributens" from="PHP 5, PHP 7"/>
- <function name="domelement::setattribute" from="PHP 5, PHP 7"/>
- <function name="domelement::setattributenode" from="PHP 5, PHP 7"/>
- <function name="domelement::setattributenodens" from="PHP 5, PHP 7"/>
- <function name="domelement::setattributens" from="PHP 5, PHP 7"/>
- <function name="domelement::setidattribute" from="PHP 5, PHP 7"/>
- <function name="domelement::setidattributenode" from="PHP 5, PHP 7"/>
- <function name="domelement::setidattributens" from="PHP 5, PHP 7"/>
+ <function name="domelement" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::getattribute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::getattributenode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::getattributenodens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::getattributens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::getelementsbytagname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::getelementsbytagnamens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::hasattribute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::hasattributens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::removeattribute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::removeattributenode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::removeattributens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setattribute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setattributenode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setattributenodens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setattributens" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setidattribute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setidattributenode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domelement::setidattributens" from="PHP 5, PHP 7, PHP 8"/>
  
-  <function name="domentity" from="PHP 5, PHP 7"/>
+  <function name="domentity" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domentityreference" from="PHP 5, PHP 7"/>
- <function name="domentityreference::__construct" from="PHP 5, PHP 7"/>
+ <function name="domentityreference" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domentityreference::__construct" from="PHP 5, PHP 7, PHP 8"/>
  
-  <function name="domexception" from="PHP 5, PHP 7"/>
+  <function name="domexception" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domimplementation" from="PHP 5, PHP 7"/>
+ <function name="domimplementation" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domimplementation::__construct" from="PHP 5, PHP 7"/>
- <function name="domimplementation::createdocument" from="PHP 5, PHP 7"/>
- <function name="domimplementation::createdocumenttype" from="PHP 5, PHP 7"/>
- <function name="domimplementation::getfeature" from="PHP 5, PHP 7"/>
- <function name="domimplementation::hasfeature" from="PHP 5, PHP 7"/>
+ <function name="domimplementation::createdocument" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domimplementation::createdocumenttype" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domimplementation::getfeature" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domimplementation::hasfeature" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domimplementation::listitem" from="PHP 5, PHP 7"/>
  <function name="domimplementation::source_get_domimplementation" from="PHP 5, PHP 7"/>
  <function name="domimplementation::source_get_domimplementations" from="PHP 5, PHP 7"/>
 
- <function name="domnamednodemap" from="PHP 5, PHP 7"/>
- <function name="domnamednodemap::count" from="PHP 7 &gt;= 7.2.0"/>
- <function name="domnamednodemap::getnameditem" from="PHP 5, PHP 7"/>
- <function name="domnamednodemap::getnameditemns" from="PHP 5, PHP 7"/>
- <function name="domnamednodemap::item" from="PHP 5, PHP 7"/>
+ <function name="domnamednodemap" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnamednodemap::count" from="PHP 7 &gt;= 7.2.0, PHP 8"/>
+ <function name="domnamednodemap::getnameditem" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnamednodemap::getnameditemns" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnamednodemap::item" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domnamednodemap::removenameditem" from="PHP 5, PHP 7"/>
  <function name="domnamednodemap::removenameditemns" from="PHP 5, PHP 7"/>
  <function name="domnamednodemap::setnameditem" from="PHP 5, PHP 7"/>
  <function name="domnamednodemap::setnameditemns" from="PHP 5, PHP 7"/>
 
- <function name="domnode" from="PHP 5, PHP 7"/>
- <function name="domnode::appendchild" from="PHP 5, PHP 7"/>
- <function name="domnode::c14n" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="domnode::c14nfile" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="domnode::clonenode" from="PHP 5, PHP 7"/>
+ <function name="domnode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::appendchild" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::c14n" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="domnode::c14nfile" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="domnode::clonenode" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domnode::comparedocumentposition" from="PHP 5, PHP 7"/>
  <function name="domnode::getfeature" from="PHP 5, PHP 7"/>
- <function name="domnode::getlineno" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="domnode::getnodepath" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
+ <function name="domnode::getlineno" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="domnode::getnodepath" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
  <function name="domnode::getuserdata" from="PHP 5, PHP 7"/>
- <function name="domnode::hasattributes" from="PHP 5, PHP 7"/>
- <function name="domnode::haschildnodes" from="PHP 5, PHP 7"/>
- <function name="domnode::insertbefore" from="PHP 5, PHP 7"/>
- <function name="domnode::isdefaultnamespace" from="PHP 5, PHP 7"/>
+ <function name="domnode::hasattributes" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::haschildnodes" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::insertbefore" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::isdefaultnamespace" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domnode::isequalnode" from="PHP 5, PHP 7"/>
- <function name="domnode::issamenode" from="PHP 5, PHP 7"/>
- <function name="domnode::issupported" from="PHP 5, PHP 7"/>
- <function name="domnode::lookupnamespaceuri" from="PHP 5, PHP 7"/>
- <function name="domnode::lookupprefix" from="PHP 5, PHP 7"/>
- <function name="domnode::normalize" from="PHP 5, PHP 7"/>
- <function name="domnode::removechild" from="PHP 5, PHP 7"/>
- <function name="domnode::replacechild" from="PHP 5, PHP 7"/>
+ <function name="domnode::issamenode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::issupported" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::lookupnamespaceuri" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::lookupprefix" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::normalize" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::removechild" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnode::replacechild" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domnode::setuserdata" from="PHP 5, PHP 7"/>
 
- <function name="domnodelist" from="PHP 5, PHP 7"/>
- <function name="domnodelist::count" from="PHP 7 &gt;= 7.2.0"/>
- <function name="domnodelist::item" from="PHP 5, PHP 7"/>
+ <function name="domnodelist" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domnodelist::count" from="PHP 7 &gt;= 7.2.0, PHP 8"/>
+ <function name="domnodelist::item" from="PHP 5, PHP 7, PHP 8"/>
  
- <function name="domnotation" from="PHP 5, PHP 7"/>
+ <function name="domnotation" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domprocessinginstruction" from="PHP 5, PHP 7"/>
- <function name="domprocessinginstruction::__construct" from="PHP 5, PHP 7"/>
+ <function name="domprocessinginstruction" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domprocessinginstruction::__construct" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domtext" from="PHP 5, PHP 7"/>
- <function name="domtext::__construct" from="PHP 5, PHP 7"/>
- <function name="domtext::iswhitespaceinelementcontent" from="PHP 5, PHP 7"/>
+ <function name="domtext" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domtext::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domtext::iswhitespaceinelementcontent" from="PHP 5, PHP 7, PHP 8"/>
  <function name="domtext::replacewholetext" from="PHP 5, PHP 7"/>
- <function name="domtext::splittext" from="PHP 5, PHP 7"/>
+ <function name="domtext::splittext" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="domxpath" from="PHP 5, PHP 7"/>
- <function name="domxpath::__construct" from="PHP 5, PHP 7"/>
- <function name="domxpath::evaluate" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domxpath::query" from="PHP 5, PHP 7"/>
- <function name="domxpath::registernamespace" from="PHP 5, PHP 7"/>
- <function name="domxpath::registerphpfunctions" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="domxpath" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domxpath::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domxpath::evaluate" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domxpath::query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domxpath::registernamespace" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="domxpath::registerphpfunctions" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="dom_import_simplexml" from="PHP 5, PHP 7"/>
+ <function name="dom_import_simplexml" from="PHP 5, PHP 7, PHP 8"/>
 
  <!-- Unsure -->
  <function name="dom_domconfigurationcansetparameter" from="PHP 5, PHP 7"/>
diff --git a/reference/ds/book.xml b/reference/ds/book.xml
index c2d3fff7cd..a5ff64cbf0 100644
--- a/reference/ds/book.xml
+++ b/reference/ds/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.ds" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Data Structures</title>
  <titleabbrev></titleabbrev>
 
diff --git a/reference/ds/ds/map/diff.xml b/reference/ds/ds/map/diff.xml
index 83e7370d7d..07f63ee640 100644
--- a/reference/ds/ds/map/diff.xml
+++ b/reference/ds/ds/map/diff.xml
@@ -48,7 +48,7 @@
   <title xmlns="http://docbook.org/ns/docbook">See Also</title>
   <para>
    <simplelist>
-    <member><link xlink:href="https://en.wikipedia.org/wiki/Complement_(set_theory)">Compliment</link> on Wikipedia</member>
+    <member><link xlink:href="https://en.wikipedia.org/wiki/Complement_(set_theory)">Complement</link> on Wikipedia</member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/ds/ds/set/construct.xml b/reference/ds/ds/set/construct.xml
index 6157581d45..a8701a7968 100644
--- a/reference/ds/ds/set/construct.xml
+++ b/reference/ds/ds/set/construct.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <constructorsynopsis>
    <modifier>public</modifier> <methodname>Ds\Set::__construct</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter><initializer>[]</initializer></methodparam>
   </constructorsynopsis>
   <para>
     Creates a new instance, using either a <classname>traversable</classname>
diff --git a/reference/ds/ds/set/diff.xml b/reference/ds/ds/set/diff.xml
index 38c12da196..431bd9063c 100644
--- a/reference/ds/ds/set/diff.xml
+++ b/reference/ds/ds/set/diff.xml
@@ -46,7 +46,7 @@
   <title xmlns="http://docbook.org/ns/docbook">See Also</title>
   <para>
    <simplelist>
-    <member><link xlink:href="https://en.wikipedia.org/wiki/Complement_(set_theory)">Compliment</link> on Wikipedia</member>
+    <member><link xlink:href="https://en.wikipedia.org/wiki/Complement_(set_theory)">Complement</link> on Wikipedia</member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/eio/book.xml b/reference/eio/book.xml
index 4222731bad..1172df96a7 100644
--- a/reference/eio/book.xml
+++ b/reference/eio/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.eio" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Eio</title>
  <titleabbrev>Eio</titleabbrev>
 <!--{{{ preface -->
diff --git a/reference/eio/functions/eio-busy.xml b/reference/eio/functions/eio-busy.xml
index bab6bef9c3..96a162124e 100644
--- a/reference/eio/functions/eio-busy.xml
+++ b/reference/eio/functions/eio-busy.xml
@@ -66,7 +66,7 @@
  <refsect1 role="returnvalues">
  &reftitle.returnvalues;
   <para>
-   <function>eio_busy</function> returns request resource on success or &false; on error.
+   <function>eio_busy</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-chmod.xml b/reference/eio/functions/eio-chmod.xml
index 6d6e0ad251..6d8538bf50 100644
--- a/reference/eio/functions/eio-chmod.xml
+++ b/reference/eio/functions/eio-chmod.xml
@@ -73,7 +73,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_chmod</function> returns request resource on success or &false; on error.
+   <function>eio_chmod</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-chown.xml b/reference/eio/functions/eio-chown.xml
index 8c2d883f91..9909c9f668 100644
--- a/reference/eio/functions/eio-chown.xml
+++ b/reference/eio/functions/eio-chown.xml
@@ -81,7 +81,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_chown</function> returns request resource on success or &false; on error.
+   <function>eio_chown</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-close.xml b/reference/eio/functions/eio-close.xml
index 109ae60e1b..0c15afe386 100644
--- a/reference/eio/functions/eio-close.xml
+++ b/reference/eio/functions/eio-close.xml
@@ -63,7 +63,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_close</function> returns request resource on success or &false; on error.
+   <function>eio_close</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-custom.xml b/reference/eio/functions/eio-custom.xml
index ef7b9c63db..d833642d8a 100644
--- a/reference/eio/functions/eio-custom.xml
+++ b/reference/eio/functions/eio-custom.xml
@@ -76,7 +76,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_custom</function> returns request resource on success or &false; on error.
+   <function>eio_custom</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-dup2.xml b/reference/eio/functions/eio-dup2.xml
index e2a79505c6..c68f970d31 100644
--- a/reference/eio/functions/eio-dup2.xml
+++ b/reference/eio/functions/eio-dup2.xml
@@ -72,7 +72,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_dup2</function> returns request resource on success or &false; on error.
+   <function>eio_dup2</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-event-loop.xml b/reference/eio/functions/eio-event-loop.xml
index bb0905c994..f25bb5f6da 100644
--- a/reference/eio/functions/eio-event-loop.xml
+++ b/reference/eio/functions/eio-event-loop.xml
@@ -27,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_event_loop</function> returns &true; on success or &false; on error.
+   <function>eio_event_loop</function> returns &true; on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-fallocate.xml b/reference/eio/functions/eio-fallocate.xml
index d97982f6d4..ad42c0c658 100644
--- a/reference/eio/functions/eio-fallocate.xml
+++ b/reference/eio/functions/eio-fallocate.xml
@@ -104,7 +104,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_fallocate</function> returns request resource on success or &false; on error.
+   <function>eio_fallocate</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-fchmod.xml b/reference/eio/functions/eio-fchmod.xml
index 8463398930..a129e6f55d 100644
--- a/reference/eio/functions/eio-fchmod.xml
+++ b/reference/eio/functions/eio-fchmod.xml
@@ -72,7 +72,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_fchmod</function> returns request resource on success or &false; on error.
+   <function>eio_fchmod</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-fchown.xml b/reference/eio/functions/eio-fchown.xml
index e12e0fc72e..c037e9b792 100644
--- a/reference/eio/functions/eio-fchown.xml
+++ b/reference/eio/functions/eio-fchown.xml
@@ -78,6 +78,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   <function>eio_chmod</function> returns request resource on success,&return.falseforfailure;.
+  </para>
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/eio/functions/eio-fdatasync.xml b/reference/eio/functions/eio-fdatasync.xml
index d9f70b7961..6f3d7f6d14 100644
--- a/reference/eio/functions/eio-fdatasync.xml
+++ b/reference/eio/functions/eio-fdatasync.xml
@@ -62,7 +62,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_fdatasync</function> returns request resource on success or &false; on error.
+   <function>eio_fdatasync</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-fstat.xml b/reference/eio/functions/eio-fstat.xml
index b97ac78443..71a73b6a39 100644
--- a/reference/eio/functions/eio-fstat.xml
+++ b/reference/eio/functions/eio-fstat.xml
@@ -60,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_busy</function> returns request resource on success or &false; on error.
+   <function>eio_busy</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-fstatvfs.xml b/reference/eio/functions/eio-fstatvfs.xml
index 2b3a59459a..a73afcda60 100644
--- a/reference/eio/functions/eio-fstatvfs.xml
+++ b/reference/eio/functions/eio-fstatvfs.xml
@@ -60,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_fstatvfs</function> returns request resource on success or &false; on error.
+   <function>eio_fstatvfs</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-fsync.xml b/reference/eio/functions/eio-fsync.xml
index a73cfb28ed..b099e16883 100644
--- a/reference/eio/functions/eio-fsync.xml
+++ b/reference/eio/functions/eio-fsync.xml
@@ -62,7 +62,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_fsync</function> returns request resource on success or &false; on error.
+   <function>eio_fsync</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-ftruncate.xml b/reference/eio/functions/eio-ftruncate.xml
index 662e32fff0..f38be23666 100644
--- a/reference/eio/functions/eio-ftruncate.xml
+++ b/reference/eio/functions/eio-ftruncate.xml
@@ -73,7 +73,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_ftruncate</function> returns request resource on success or &false; on error.
+   <function>eio_ftruncate</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-futime.xml b/reference/eio/functions/eio-futime.xml
index 61401ff033..70cc60ece0 100644
--- a/reference/eio/functions/eio-futime.xml
+++ b/reference/eio/functions/eio-futime.xml
@@ -82,7 +82,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_futime</function> returns request resource on success or &false; on error.
+   <function>eio_futime</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-grp-add.xml b/reference/eio/functions/eio-grp-add.xml
index 52620886e3..144ed69c50 100644
--- a/reference/eio/functions/eio-grp-add.xml
+++ b/reference/eio/functions/eio-grp-add.xml
@@ -45,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  <function>eio_grp_add</function> doesn't return a value.
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-grp.xml b/reference/eio/functions/eio-grp.xml
index 64a0c21208..bc70b58bec 100644
--- a/reference/eio/functions/eio-grp.xml
+++ b/reference/eio/functions/eio-grp.xml
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_grp</function> returns request group resource on success or &false; on error.
+   <function>eio_grp</function> returns request group resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-init.xml b/reference/eio/functions/eio-init.xml
index f18b8e76c8..d113190a97 100644
--- a/reference/eio/functions/eio-init.xml
+++ b/reference/eio/functions/eio-init.xml
@@ -16,14 +16,11 @@
   <para>
    <function>eio_init</function> (re-)initializes Eio. It allocates memory for internal structures of libeio and Eio itself. You may call <function>eio_init</function> before using Eio functions. Otherwise it will be called internally first time you invoke an Eio function in a process.
   </para>
-  <para>
-   <warning>
-    <simpara>
-     &removed.php.future;
-     Since Eio <emphasis>1.1.0</emphasis> <function>eio_init</function> is deprecated. In Eio <emphasis>1.0.0</emphasis> because of <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libeio/eio.pod#FORK_SUPPORT"><emphasis>libeio</emphasis>'s restrictions</link> you <emphasis>must</emphasis> call <function>eio_init</function> in child process, if you fork one by any means. You have to avoid using Eio in parent process, if you use it in childs.
-    </simpara>
-   </warning>
-  </para>
+  <note>
+   <para>
+    This function was removed in version 3.0.0RC1 of the eio extension for PHP version 8 and higher.
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/eio/functions/eio-mkdir.xml b/reference/eio/functions/eio-mkdir.xml
index 600878e2c7..eb87f64578 100644
--- a/reference/eio/functions/eio-mkdir.xml
+++ b/reference/eio/functions/eio-mkdir.xml
@@ -72,7 +72,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_mkdir</function> returns request resource on success or &false; on error.
+   <function>eio_mkdir</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-mknod.xml b/reference/eio/functions/eio-mknod.xml
index 7dcb41a7b2..40c4165a70 100644
--- a/reference/eio/functions/eio-mknod.xml
+++ b/reference/eio/functions/eio-mknod.xml
@@ -98,7 +98,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_mknod</function> returns request resource on success or &false; on error.
+   <function>eio_mknod</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-nop.xml b/reference/eio/functions/eio-nop.xml
index c280dd25df..46f887eb33 100644
--- a/reference/eio/functions/eio-nop.xml
+++ b/reference/eio/functions/eio-nop.xml
@@ -54,7 +54,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_nop</function> returns request resource on success or &false; on error.
+   <function>eio_nop</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-readahead.xml b/reference/eio/functions/eio-readahead.xml
index ae9781e1a9..a16dfde1c7 100644
--- a/reference/eio/functions/eio-readahead.xml
+++ b/reference/eio/functions/eio-readahead.xml
@@ -81,7 +81,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_readahead</function> returns request resource on success or &false; on error.
+   <function>eio_readahead</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-readdir.xml b/reference/eio/functions/eio-readdir.xml
index 3f7fe1c861..23c4a90c29 100644
--- a/reference/eio/functions/eio-readdir.xml
+++ b/reference/eio/functions/eio-readdir.xml
@@ -72,8 +72,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_readdir</function> returns request resource on success, or
-   &false; on error. Sets <parameter>result</parameter> argument of
+   <function>eio_readdir</function> returns request resource on success,&return.falseforfailure;. 
+   Sets <parameter>result</parameter> argument of
    <parameter>callback</parameter> function according to
    <parameter>flags</parameter>:
   </para>
diff --git a/reference/eio/functions/eio-readlink.xml b/reference/eio/functions/eio-readlink.xml
index 8e029c69fe..1e83fd452f 100644
--- a/reference/eio/functions/eio-readlink.xml
+++ b/reference/eio/functions/eio-readlink.xml
@@ -60,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_readlink</function> returns request resource on success or &false; on error.
+   <function>eio_readlink</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-rename.xml b/reference/eio/functions/eio-rename.xml
index d0991174d5..8e0d88e6b4 100644
--- a/reference/eio/functions/eio-rename.xml
+++ b/reference/eio/functions/eio-rename.xml
@@ -71,7 +71,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_rename</function> returns request resource on success or &false; on error.
+   <function>eio_rename</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-rmdir.xml b/reference/eio/functions/eio-rmdir.xml
index 45660de688..6af9e4ae9a 100644
--- a/reference/eio/functions/eio-rmdir.xml
+++ b/reference/eio/functions/eio-rmdir.xml
@@ -62,7 +62,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_rmdir</function> returns request resource on success or &false; on error.
+   <function>eio_rmdir</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-seek.xml b/reference/eio/functions/eio-seek.xml
index 2abecc289c..3e2f39b8d9 100644
--- a/reference/eio/functions/eio-seek.xml
+++ b/reference/eio/functions/eio-seek.xml
@@ -85,7 +85,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_seek</function> returns request resource on success or &false; on error.
+   <function>eio_seek</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-sendfile.xml b/reference/eio/functions/eio-sendfile.xml
index 2251e7c142..eb3a7dc7aa 100644
--- a/reference/eio/functions/eio-sendfile.xml
+++ b/reference/eio/functions/eio-sendfile.xml
@@ -87,7 +87,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_sendfile</function> returns request resource on success or &false; on error.
+   <function>eio_sendfile</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-statvfs.xml b/reference/eio/functions/eio-statvfs.xml
index 79e852f675..91d4ddf1ba 100644
--- a/reference/eio/functions/eio-statvfs.xml
+++ b/reference/eio/functions/eio-statvfs.xml
@@ -59,8 +59,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  <function>eio_statvfs</function> returns request resource on success or
-  &false; on error. On success assigns <parameter>result</parameter> argument of
+  <function>eio_statvfs</function> returns request resource on success,&return.falseforfailure;. 
+   On success assigns <parameter>result</parameter> argument of
   <parameter>callback</parameter> to an array.
   </para>
  </refsect1>
diff --git a/reference/eio/functions/eio-symlink.xml b/reference/eio/functions/eio-symlink.xml
index 5447da7a64..a929345ebc 100644
--- a/reference/eio/functions/eio-symlink.xml
+++ b/reference/eio/functions/eio-symlink.xml
@@ -73,7 +73,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_symlink</function> returns request resource on success or &false; on error.
+   <function>eio_symlink</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-sync-file-range.xml b/reference/eio/functions/eio-sync-file-range.xml
index 90a5ce6590..186b1c9ab7 100644
--- a/reference/eio/functions/eio-sync-file-range.xml
+++ b/reference/eio/functions/eio-sync-file-range.xml
@@ -97,7 +97,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_sync_file_range</function> returns request resource on success or &false; on error.
+   <function>eio_sync_file_range</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-sync.xml b/reference/eio/functions/eio-sync.xml
index 6e9a54cc3e..124dda28ea 100644
--- a/reference/eio/functions/eio-sync.xml
+++ b/reference/eio/functions/eio-sync.xml
@@ -29,7 +29,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_sync</function> returns request resource on success or &false; on error.
+   <function>eio_sync</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-syncfs.xml b/reference/eio/functions/eio-syncfs.xml
index 8cb959b556..2db4610a15 100644
--- a/reference/eio/functions/eio-syncfs.xml
+++ b/reference/eio/functions/eio-syncfs.xml
@@ -63,7 +63,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_syncfs</function> returns request resource on success or &false; on error.
+   <function>eio_syncfs</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-truncate.xml b/reference/eio/functions/eio-truncate.xml
index 320dacad31..0f0ad4da24 100644
--- a/reference/eio/functions/eio-truncate.xml
+++ b/reference/eio/functions/eio-truncate.xml
@@ -72,7 +72,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_busy</function> returns request resource on success or &false; on error.
+   <function>eio_busy</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-unlink.xml b/reference/eio/functions/eio-unlink.xml
index 4eee0f6046..043ea2e0a8 100644
--- a/reference/eio/functions/eio-unlink.xml
+++ b/reference/eio/functions/eio-unlink.xml
@@ -62,7 +62,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_unlink</function> returns request resource on success or &false; on error.
+   <function>eio_unlink</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-utime.xml b/reference/eio/functions/eio-utime.xml
index b6e38f7af3..e312897735 100644
--- a/reference/eio/functions/eio-utime.xml
+++ b/reference/eio/functions/eio-utime.xml
@@ -80,7 +80,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_utime</function> returns request resource on success or &false; on error.
+   <function>eio_utime</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/eio/functions/eio-write.xml b/reference/eio/functions/eio-write.xml
index 4fc3cde0ee..98323450ad 100644
--- a/reference/eio/functions/eio-write.xml
+++ b/reference/eio/functions/eio-write.xml
@@ -91,7 +91,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>eio_write</function> returns request resource on success or &false; on error.
+   <function>eio_write</function> returns request resource on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/enchant/configure.xml b/reference/enchant/configure.xml
index 003d55340a..92c452e8e3 100644
--- a/reference/enchant/configure.xml
+++ b/reference/enchant/configure.xml
@@ -14,6 +14,26 @@
   <option role="configure">--with-enchant[=dir]</option> option when compiling
   PHP.
  </para>
+ <para>
+  Windows users must enable <filename>php_enchant.dll</filename>
+  in order to use this extension.
+ </para>
+ <note>
+  <title>Additional setup on Windows</title>
+  <para>
+   &ext.windows.path.dll;
+   <filename>libenchant.dll</filename>,
+   <filename>glib-2.dll</filename>,
+   <filename>gmodule-2.dll</filename>.
+  </para>
+  <para>
+   Furthermore, it is necessary to copy at least one of the shipped providers in
+   <filename>lib/enchant/</filename> to <filename>C:\enchant_plugins</filename>.
+   This path can be customized by creating the registry value
+   <literal>HKEY_CURRENT_USER\SOFTWARE\Enchant\Config\Module_Dir</literal>
+   and setting it to the desired path.
+  </para>
+ </note>
 </section>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/errorfunc/functions/debug-backtrace.xml b/reference/errorfunc/functions/debug-backtrace.xml
index 4b07e44a56..c10cae2fe8 100644
--- a/reference/errorfunc/functions/debug-backtrace.xml
+++ b/reference/errorfunc/functions/debug-backtrace.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>debug_backtrace</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>DEBUG_BACKTRACE_PROVIDE_OBJECT</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer><constant>DEBUG_BACKTRACE_PROVIDE_OBJECT</constant></initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -26,7 +26,7 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       As of 5.3.6, this parameter is a bitmask for the following options:
+       This parameter is a bitmask for the following options:
        <table>
         <title><function>debug_backtrace</function> options</title>
         <tgroup cols="2">
@@ -47,8 +47,6 @@
          </tbody>
         </tgroup>
        </table>
-       Before 5.3.6, the only values recognized are &true; or &false;, which are the same as 
-       setting or not setting the <constant>DEBUG_BACKTRACE_PROVIDE_OBJECT</constant> option respectively.
       </para>
      </listitem>
     </varlistentry>
@@ -56,7 +54,7 @@
      <term><parameter>limit</parameter></term>
      <listitem>
       <para>
-       As of 5.4.0, this parameter can be used to limit the number of stack frames returned.
+       This parameter can be used to limit the number of stack frames returned.
        By default (<parameter>limit</parameter>=<literal>0</literal>) it returns all stack frames.
       </para>
      </listitem>
@@ -126,7 +124,7 @@
        <entry>type</entry>
        <entry><type>string</type></entry>
        <entry>
-        The current call type. If a method call, "->" is returned. If a static
+        The current call type. If a method call, "-&gt;" is returned. If a static
         method call, "::" is returned. If a function call, nothing is returned.
        </entry>
       </row>
@@ -214,7 +212,6 @@ array(4) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/errorfunc/functions/debug-print-backtrace.xml b/reference/errorfunc/functions/debug-print-backtrace.xml
index 9322fa2e6b..587549b9ed 100644
--- a/reference/errorfunc/functions/debug-print-backtrace.xml
+++ b/reference/errorfunc/functions/debug-print-backtrace.xml
@@ -30,7 +30,7 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       As of 5.3.6, this parameter is a bitmask for the following options:
+       This parameter is a bitmask for the following options:
        <table>
         <title><function>debug_print_backtrace</function> options</title>
         <tgroup cols="2">
@@ -52,7 +52,7 @@
      <term><parameter>limit</parameter></term>
      <listitem>
       <para>
-       As of 5.4.0, this parameter can be used to limit the number of stack frames printed.
+       This parameter can be used to limit the number of stack frames printed.
        By default (<parameter>limit</parameter>=<literal>0</literal>) it prints all stack frames.
       </para>
      </listitem>
diff --git a/reference/errorfunc/functions/error-clear-last.xml b/reference/errorfunc/functions/error-clear-last.xml
index 99a2d6596b..5c8c7518a8 100644
--- a/reference/errorfunc/functions/error-clear-last.xml
+++ b/reference/errorfunc/functions/error-clear-last.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/errorfunc/functions/error-get-last.xml b/reference/errorfunc/functions/error-get-last.xml
index c357d0aaaf..f111c43516 100644
--- a/reference/errorfunc/functions/error-get-last.xml
+++ b/reference/errorfunc/functions/error-get-last.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/errorfunc/functions/error-log.xml b/reference/errorfunc/functions/error-log.xml
index 3eda4d0687..7b44a4b798 100644
--- a/reference/errorfunc/functions/error-log.xml
+++ b/reference/errorfunc/functions/error-log.xml
@@ -122,20 +122,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <simpara>
-    <function>error_log</function> is not binary safe. <parameter>message</parameter> will be truncated by null character.
-   </simpara>
-  </warning>
-  <tip>
-   <simpara>
-    <parameter>message</parameter> should not contain null character. Note that <parameter>message</parameter> may be sent to file, mail, syslog, etc. Use appropriate conversion/escape function, <function>base64_encode</function>, <function>rawurlencode</function> or <function>addslashes</function> before calling <function>error_log</function>.
-   </simpara>
-  </tip>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -165,6 +151,20 @@ error_log("You messed up!", 3, "/var/tmp/my-errors.log");
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <warning>
+   <simpara>
+    <function>error_log</function> is not binary safe. <parameter>message</parameter> will be truncated by null character.
+   </simpara>
+  </warning>
+  <tip>
+   <simpara>
+    <parameter>message</parameter> should not contain null character. Note that <parameter>message</parameter> may be sent to file, mail, syslog, etc. Use appropriate conversion/escape function, <function>base64_encode</function>, <function>rawurlencode</function> or <function>addslashes</function> before calling <function>error_log</function>.
+   </simpara>
+  </tip>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/errorfunc/functions/error-reporting.xml b/reference/errorfunc/functions/error-reporting.xml
index 6c7d10a50c..7e8ad9d8b5 100644
--- a/reference/errorfunc/functions/error-reporting.xml
+++ b/reference/errorfunc/functions/error-reporting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.error-reporting">
+<refentry xml:id="function.error-reporting" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>error_reporting</refname>
   <refpurpose>Sets which PHP errors are reported</refpurpose>
@@ -10,14 +10,14 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>error_reporting</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>level</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>error_level</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    The <function>error_reporting</function> function sets the
    <link linkend="ini.error-reporting">error_reporting</link>
    directive at runtime.  PHP has many levels of errors, using
    this function sets that level for the duration (runtime) of
-   your script. If the optional <parameter>level</parameter> is
+   your script. If the optional <parameter>error_level</parameter> is
    not set, <function>error_reporting</function> will just return
    the current error reporting level.
   </para>
@@ -28,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>level</parameter></term>
+     <term><parameter>error_level</parameter></term>
      <listitem>
       <para>
        The new <link linkend="ini.error-reporting">error_reporting</link>
@@ -52,11 +52,33 @@
   &reftitle.returnvalues;
   <para>
    Returns the old <link linkend="ini.error-reporting">error_reporting</link>
-   level or the current level if no <parameter>level</parameter> parameter is
+   level or the current level if no <parameter>error_level</parameter> parameter is
    given.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>error_level</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -126,7 +148,6 @@ ini_set('error_reporting', E_ALL);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/errorfunc/functions/restore-error-handler.xml b/reference/errorfunc/functions/restore-error-handler.xml
index 3903005905..5563d1b434 100644
--- a/reference/errorfunc/functions/restore-error-handler.xml
+++ b/reference/errorfunc/functions/restore-error-handler.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/errorfunc/functions/restore-exception-handler.xml b/reference/errorfunc/functions/restore-exception-handler.xml
index 7ec1090b3c..4ccb1c3a4d 100644
--- a/reference/errorfunc/functions/restore-exception-handler.xml
+++ b/reference/errorfunc/functions/restore-exception-handler.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/errorfunc/functions/set-error-handler.xml b/reference/errorfunc/functions/set-error-handler.xml
index 8420d63649..876c3a6158 100644
--- a/reference/errorfunc/functions/set-error-handler.xml
+++ b/reference/errorfunc/functions/set-error-handler.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>set_error_handler</methodname>
-   <methodparam><type>callable</type><parameter>error_handler</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>error_types</parameter><initializer>E_ALL | E_STRICT</initializer></methodparam>
+   <type class="union"><type>string</type><type>array</type><type>object</type><type>null</type></type><methodname>set_error_handler</methodname>
+   <methodparam><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>error_levels</parameter><initializer><constant>E_ALL</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   Sets a user function (<parameter>error_handler</parameter>) to handle
+   Sets a user function (<parameter>callback</parameter>) to handle
    errors in a script.
   </para>
   <para>
@@ -26,7 +26,7 @@
   </para>
   <para>
    It is important to remember that the standard PHP error handler is completely
-   bypassed for the error types specified by <parameter>error_types</parameter> 
+   bypassed for the error types specified by <parameter>error_levels</parameter> 
    unless the callback function returns &false;.
    <function>error_reporting</function> settings will have no effect and your
    error handler will be called regardless - however you are still able to read 
@@ -70,7 +70,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>error_handler</parameter></term>
+     <term><parameter>callback</parameter></term>
      <listitem>
       <para>
        A callback with the following signature.
@@ -153,16 +153,14 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>error_types</parameter></term>
+     <term><parameter>error_levels</parameter></term>
      <listitem>
       <para>
        Can be used to mask the triggering of the
-       <parameter>error_handler</parameter> function just like the <link
-       linkend="ini.error-reporting">error_reporting</link> ini setting 
+       <parameter>callback</parameter> function just like the <link linkend="ini.error-reporting">error_reporting</link> ini setting 
        controls which errors are shown. Without this mask set the
-       <parameter>error_handler</parameter> will be called for every error
-       regardless to the setting of the <link
-       linkend="ini.error-reporting">error_reporting</link> setting.
+       <parameter>callback</parameter> will be called for every error
+       regardless to the setting of the <link linkend="ini.error-reporting">error_reporting</link> setting.
       </para>
      </listitem>
     </varlistentry>
@@ -173,7 +171,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a string containing the previously defined error handler (if any). If
+   Returns the previously defined error handler (if any). If
    the built-in error handler is used &null; is returned. &null; is also returned
    in case of an error such as an invalid callback. If the previous error handler
    was a class method, this function will return an indexed array with the class
@@ -373,7 +371,6 @@ Aborting...<br />
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/errorfunc/functions/set-exception-handler.xml b/reference/errorfunc/functions/set-exception-handler.xml
index ebe96dd8fd..4c1c19b2bf 100644
--- a/reference/errorfunc/functions/set-exception-handler.xml
+++ b/reference/errorfunc/functions/set-exception-handler.xml
@@ -11,13 +11,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>callable</type><methodname>set_exception_handler</methodname>
-   <methodparam><type>callable</type><parameter>exception_handler</parameter></methodparam>
+   <type class="union"><type>string</type><type>array</type><type>object</type><type>null</type></type><methodname>set_exception_handler</methodname>
+   <methodparam><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets the default exception handler if an exception is not caught within a
    try/catch block. Execution will stop after the
-   <parameter>exception_handler</parameter> is called.
+   <parameter>callback</parameter> is called.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>exception_handler</parameter></term>
+     <term><parameter>callback</parameter></term>
      <listitem>
       <para>
        Name of the function to be called when an uncaught exception occurs.
@@ -71,43 +71,11 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the name of the previously defined exception handler, or &null; on error. If
+   Returns the previously defined exception handler, or &null; on error. If
    no previous handler was defined, &null; is also returned.
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        The type of parameter passed into <parameter>exception_handler</parameter> changed
-        from <classname>Exception</classname> to <classname>Throwable</classname>
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        Previously, if &null; was passed then this function returned &true;.
-        It returns the previous handler since PHP 5.5.0.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -144,7 +112,6 @@ echo "Not Executed\n";
  </refsect1><!-- }}} -->
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/errorfunc/functions/trigger-error.xml b/reference/errorfunc/functions/trigger-error.xml
index dc61ae01c5..f4823c52f1 100644
--- a/reference/errorfunc/functions/trigger-error.xml
+++ b/reference/errorfunc/functions/trigger-error.xml
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>trigger_error</methodname>
-   <methodparam><type>string</type><parameter>error_msg</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>error_type</parameter><initializer>E_USER_NOTICE</initializer></methodparam>
+   <methodparam><type>string</type><parameter>message</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>error_level</parameter><initializer><constant>E_USER_NOTICE</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Used to trigger a user error condition, it can be used in conjunction
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>error_msg</parameter></term>
+     <term><parameter>message</parameter></term>
      <listitem>
       <para>
        The designated error message for this error. It's limited to 1024 
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>error_type</parameter></term>
+     <term><parameter>error_level</parameter></term>
      <listitem>
       <para>
        The designated error type for this error. It only works with the E_USER
@@ -55,7 +55,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   This function returns &false; if wrong <parameter>error_type</parameter> is
+   This function returns &false; if wrong <parameter>error_level</parameter> is
    specified, &true; otherwise.
   </para>
  </refsect1>
@@ -85,7 +85,7 @@ if ($divisor == 0) {
   &reftitle.notes;
   <warning>
    <para>
-     HTML entities in <parameter>error_msg</parameter> are not
+     HTML entities in <parameter>message</parameter> are not
      escaped. Use <function>htmlentities</function> on the message if
      the error is to be displayed in a browser.
    </para>
@@ -104,7 +104,6 @@ if ($divisor == 0) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/errorfunc/ini.xml b/reference/errorfunc/ini.xml
index a85ffc1a1c..cc97a749c9 100644
--- a/reference/errorfunc/ini.xml
+++ b/reference/errorfunc/ini.xml
@@ -526,21 +526,39 @@
      <para>
       Specifies the filter type to filter the logged messages. Allowed
       characters are passed unmodified; all others are written in their
-      hexadecimal representation prefixed with <literal>\x</literal>. There are
-      three supported filter types:
+      hexadecimal representation prefixed with <literal>\x</literal>. 
       <itemizedlist>
        <listitem>
-        <simpara><literal>all</literal> – all characters</simpara>
+        <simpara><literal>all</literal> – the logged string will be split 
+         at newline characters, and all characters are passed unaltered
+        </simpara>
        </listitem>
        <listitem>
-        <simpara><literal>no-ctrl</literal> – all characters except control characters</simpara>
+        <simpara><literal>ascii</literal> – the logged string will be split 
+         at newline characters, and any non-printable 7-bit ASCII characters will be escaped
+        </simpara>
        </listitem>
        <listitem>
-        <simpara><literal>ascii</literal> – all printable ASCII characters and <literal>NL</literal></simpara>
+        <simpara><literal>no-ctrl</literal> – the logged string will be split 
+         at newline characters, and any non-printable characters will be escaped
+        </simpara>
+       </listitem>
+       <listitem>
+        <simpara><literal>raw</literal> – all characters are passed to the system 
+         logger unaltered, without splitting at newlines (identical to PHP before 7.3)
+        </simpara>
        </listitem>
       </itemizedlist>
-      Only effective if <link linkend="ini.error-log">error_log</link> is set to "syslog".
+      This setting will affect logging via <link linkend="ini.error-log">error_log</link> set to "syslog" and calls to <function>syslog</function>.
      </para>
+     <note>
+      <para>
+       The <literal>raw</literal> filter type is available as of PHP 7.3.8 and PHP 7.4.0.
+      </para>
+     </note>
+     <simpara>
+      This directive is not supported on Windows.
+     </simpara>
     </listitem>
    </varlistentry>
 
diff --git a/reference/ev/book.xml b/reference/ev/book.xml
index 49bff4284e..a65cb93e8a 100644
--- a/reference/ev/book.xml
+++ b/reference/ev/book.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <book xml:id="book.ev" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Ev</title>
  <titleabbrev>Ev</titleabbrev>
  <preface xml:id="intro.ev">
diff --git a/reference/ev/evwatcher/construct.xml b/reference/ev/evwatcher/construct.xml
index 324da96323..0024700cf6 100644
--- a/reference/ev/evwatcher/construct.xml
+++ b/reference/ev/evwatcher/construct.xml
@@ -19,6 +19,12 @@
    classes.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/event/book.xml b/reference/event/book.xml
index 9a605d54f9..c81678a83e 100644
--- a/reference/event/book.xml
+++ b/reference/event/book.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <book xml:id="book.event" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Event</title>
  <titleabbrev>Event</titleabbrev>
  <preface xml:id="intro.event">
diff --git a/reference/event/event.xml b/reference/event/event.xml
index e98f6644cf..1ce039fab2 100644
--- a/reference/event/event.xml
+++ b/reference/event/event.xml
@@ -11,7 +11,7 @@
     <classname>Event</classname>
     class represents and event firing on a file descriptor being ready to read
     from or write to; a file descriptor becoming ready to read from or write
-    to(edge-triggered I/O only); a timeout expiring; a signal occuring; a
+    to(edge-triggered I/O only); a timeout expiring; a signal occurring; a
     user-triggered event.
    </para>
    <para>
diff --git a/reference/event/event/add.xml b/reference/event/event/add.xml
index 44c4f0624f..81bc4fdc11 100644
--- a/reference/event/event/add.xml
+++ b/reference/event/event/add.xml
@@ -50,7 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/event/del.xml b/reference/event/event/del.xml
index dfb5d18caf..575446872f 100644
--- a/reference/event/event/del.xml
+++ b/reference/event/event/del.xml
@@ -25,7 +25,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/event/set.xml b/reference/event/event/set.xml
index 99baad5a02..f2604ede0a 100644
--- a/reference/event/event/set.xml
+++ b/reference/event/event/set.xml
@@ -105,7 +105,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/event/setpriority.xml b/reference/event/event/setpriority.xml
index 047cf8de6e..8de04b48c6 100644
--- a/reference/event/event/setpriority.xml
+++ b/reference/event/event/setpriority.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/event/settimer.xml b/reference/event/event/settimer.xml
index e3edac60f6..4da62cd8f9 100644
--- a/reference/event/event/settimer.xml
+++ b/reference/event/event/settimer.xml
@@ -74,7 +74,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbase/dispatch.xml b/reference/event/eventbase/dispatch.xml
index 16c33cc22c..1bdf12924c 100644
--- a/reference/event/eventbase/dispatch.xml
+++ b/reference/event/eventbase/dispatch.xml
@@ -33,7 +33,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbase/exit.xml b/reference/event/eventbase/exit.xml
index f1c2bcfa43..ef05e72fe0 100644
--- a/reference/event/eventbase/exit.xml
+++ b/reference/event/eventbase/exit.xml
@@ -39,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbase/getfeatures.xml b/reference/event/eventbase/getfeatures.xml
index f45deb9d00..3e97dc27ea 100644
--- a/reference/event/eventbase/getfeatures.xml
+++ b/reference/event/eventbase/getfeatures.xml
@@ -40,7 +40,7 @@
 // Avoiding "select" method
 $cfg = new EventConfig();
 if ($cfg->avoidMethod("select")) {
-    echo "`select' method avoided\n";
+    echo "'select' method avoided\n";
 }
 
 $base = new EventBase($cfg);
diff --git a/reference/event/eventbase/getmethod.xml b/reference/event/eventbase/getmethod.xml
index 48188b9279..85ba688275 100644
--- a/reference/event/eventbase/getmethod.xml
+++ b/reference/event/eventbase/getmethod.xml
@@ -35,7 +35,7 @@
 <?php
 $cfg = new EventConfig();
 if ($cfg->avoidMethod("select")) {
-    echo "`select' method avoided\n";
+    echo "'select' method avoided\n";
 }
 
 // Create event_base associated with the config
diff --git a/reference/event/eventbase/loop.xml b/reference/event/eventbase/loop.xml
index 06b012d890..a4545f81f0 100644
--- a/reference/event/eventbase/loop.xml
+++ b/reference/event/eventbase/loop.xml
@@ -48,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbase/priorityinit.xml b/reference/event/eventbase/priorityinit.xml
index 19cea85788..466f0e408a 100644
--- a/reference/event/eventbase/priorityinit.xml
+++ b/reference/event/eventbase/priorityinit.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success, otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbase/reinit.xml b/reference/event/eventbase/reinit.xml
index 279b7c8895..ddbb9f8083 100644
--- a/reference/event/eventbase/reinit.xml
+++ b/reference/event/eventbase/reinit.xml
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventbase/stop.xml b/reference/event/eventbase/stop.xml
index 5e864b7aff..b466e9e492 100644
--- a/reference/event/eventbase/stop.xml
+++ b/reference/event/eventbase/stop.xml
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/add.xml b/reference/event/eventbuffer/add.xml
index 8e86d9a1c8..ac232c362d 100644
--- a/reference/event/eventbuffer/add.xml
+++ b/reference/event/eventbuffer/add.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/addbuffer.xml b/reference/event/eventbuffer/addbuffer.xml
index ffdac1123c..591b1fb9f5 100644
--- a/reference/event/eventbuffer/addbuffer.xml
+++ b/reference/event/eventbuffer/addbuffer.xml
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/drain.xml b/reference/event/eventbuffer/drain.xml
index 630c961257..dc6e7fdaea 100644
--- a/reference/event/eventbuffer/drain.xml
+++ b/reference/event/eventbuffer/drain.xml
@@ -42,7 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/expand.xml b/reference/event/eventbuffer/expand.xml
index 3b95234c69..e0fcec65e8 100644
--- a/reference/event/eventbuffer/expand.xml
+++ b/reference/event/eventbuffer/expand.xml
@@ -41,7 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventbuffer/freeze.xml b/reference/event/eventbuffer/freeze.xml
index 303da0d800..d93a047051 100644
--- a/reference/event/eventbuffer/freeze.xml
+++ b/reference/event/eventbuffer/freeze.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/prepend.xml b/reference/event/eventbuffer/prepend.xml
index aee45706d7..5984c6d073 100644
--- a/reference/event/eventbuffer/prepend.xml
+++ b/reference/event/eventbuffer/prepend.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/prependbuffer.xml b/reference/event/eventbuffer/prependbuffer.xml
index 77fdecf5ca..a5409dda19 100644
--- a/reference/event/eventbuffer/prependbuffer.xml
+++ b/reference/event/eventbuffer/prependbuffer.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/search.xml b/reference/event/eventbuffer/search.xml
index c535e01956..bec82794ff 100644
--- a/reference/event/eventbuffer/search.xml
+++ b/reference/event/eventbuffer/search.xml
@@ -81,7 +81,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns numeric position of the first occurance of the string in the
+   Returns numeric position of the first occurrence of the string in the
    buffer, or &false; if string is not found.
   </para>
   &return.falseproblem;
@@ -94,7 +94,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-// Count total occurances of 'str' in 'buf'
+// Count total occurrences of 'str' in 'buf'
 function count_instances($buf, $str) {
     $total = 0;
     $p     = 0;
diff --git a/reference/event/eventbuffer/searcheol.xml b/reference/event/eventbuffer/searcheol.xml
index 04de8ae54b..629485967f 100644
--- a/reference/event/eventbuffer/searcheol.xml
+++ b/reference/event/eventbuffer/searcheol.xml
@@ -71,7 +71,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns numeric position of the first occurance of end-of-line symbol in
+   Returns numeric position of the first occurrence of end-of-line symbol in
    the buffer, or &false; if not found.
   </para>
   &return.falseproblem;
diff --git a/reference/event/eventbuffer/unfreeze.xml b/reference/event/eventbuffer/unfreeze.xml
index 182c9642e2..4e09c071e3 100644
--- a/reference/event/eventbuffer/unfreeze.xml
+++ b/reference/event/eventbuffer/unfreeze.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbuffer/unlock.xml b/reference/event/eventbuffer/unlock.xml
index e335c4e30f..0cf1f84a66 100644
--- a/reference/event/eventbuffer/unlock.xml
+++ b/reference/event/eventbuffer/unlock.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbufferevent/connect.xml b/reference/event/eventbufferevent/connect.xml
index db5d814a2d..7595999cee 100644
--- a/reference/event/eventbufferevent/connect.xml
+++ b/reference/event/eventbufferevent/connect.xml
@@ -63,7 +63,7 @@ unix:path
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventbufferevent/connecthost.xml b/reference/event/eventbufferevent/connecthost.xml
index dae098ec36..524f6c32fc 100644
--- a/reference/event/eventbufferevent/connecthost.xml
+++ b/reference/event/eventbufferevent/connecthost.xml
@@ -137,7 +137,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventbufferevent/disable.xml b/reference/event/eventbufferevent/disable.xml
index e775fc0d29..0b95587767 100644
--- a/reference/event/eventbufferevent/disable.xml
+++ b/reference/event/eventbufferevent/disable.xml
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbufferevent/enable.xml b/reference/event/eventbufferevent/enable.xml
index a832c07d33..515db6b2fe 100644
--- a/reference/event/eventbufferevent/enable.xml
+++ b/reference/event/eventbufferevent/enable.xml
@@ -53,7 +53,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbufferevent/readbuffer.xml b/reference/event/eventbufferevent/readbuffer.xml
index aa23526313..c11a91fd6d 100644
--- a/reference/event/eventbufferevent/readbuffer.xml
+++ b/reference/event/eventbufferevent/readbuffer.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success; Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbufferevent/setpriority.xml b/reference/event/eventbufferevent/setpriority.xml
index 9f359fe463..55b7549bad 100644
--- a/reference/event/eventbufferevent/setpriority.xml
+++ b/reference/event/eventbufferevent/setpriority.xml
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventbufferevent/settimeouts.xml b/reference/event/eventbufferevent/settimeouts.xml
index f7c8501e59..1436c22e39 100644
--- a/reference/event/eventbufferevent/settimeouts.xml
+++ b/reference/event/eventbufferevent/settimeouts.xml
@@ -52,7 +52,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventbufferevent/sslerror.xml b/reference/event/eventbufferevent/sslerror.xml
index 257bbd4bcb..0ae350d82f 100644
--- a/reference/event/eventbufferevent/sslerror.xml
+++ b/reference/event/eventbufferevent/sslerror.xml
@@ -44,7 +44,7 @@
 <![CDATA[
 <?php
 // This callback is invoked when some even occurs on the event listener,
-// e.g. connection closed, or an error occured
+// e.g. connection closed, or an error occurred
 function ssl_event_cb($bev, $events, $ctx) {
     if ($events & EventBufferEvent::ERROR) {
         // Fetch errors from the SSL error stack
diff --git a/reference/event/eventbufferevent/write.xml b/reference/event/eventbufferevent/write.xml
index 3d267ec9c5..c900eac279 100644
--- a/reference/event/eventbufferevent/write.xml
+++ b/reference/event/eventbufferevent/write.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventbufferevent/writebuffer.xml b/reference/event/eventbufferevent/writebuffer.xml
index 3cd10187bb..59e364feb5 100644
--- a/reference/event/eventbufferevent/writebuffer.xml
+++ b/reference/event/eventbufferevent/writebuffer.xml
@@ -41,7 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventconfig/avoidmethod.xml b/reference/event/eventconfig/avoidmethod.xml
index 00caa3c6c8..4566e41a88 100644
--- a/reference/event/eventconfig/avoidmethod.xml
+++ b/reference/event/eventconfig/avoidmethod.xml
@@ -45,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success, otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
@@ -58,7 +58,7 @@
 <?php
 $cfg = new EventConfig();
 if ($cfg->avoidMethod("select")) {
-    echo "`select' method avoided\n";
+    echo "'select' method avoided\n";
 }
 ?>
 ]]>
diff --git a/reference/event/eventconfig/construct.xml b/reference/event/eventconfig/construct.xml
index f55ad7121d..6c25ada340 100644
--- a/reference/event/eventconfig/construct.xml
+++ b/reference/event/eventconfig/construct.xml
@@ -41,7 +41,7 @@
 // Avoiding "select" method
 $cfg = new EventConfig();
 if ($cfg->avoidMethod("select")) {
-    echo "`select' method avoided\n";
+    echo "'select' method avoided\n";
 }
 
 // Create event_base associated with the config
diff --git a/reference/event/eventconfig/requirefeatures.xml b/reference/event/eventconfig/requirefeatures.xml
index 6c899de75b..092445499d 100644
--- a/reference/event/eventconfig/requirefeatures.xml
+++ b/reference/event/eventconfig/requirefeatures.xml
@@ -40,7 +40,9 @@
  </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para></para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/event/eventconfig/setflags.xml b/reference/event/eventconfig/setflags.xml
new file mode 100644
index 0000000000..2b082f34ca
--- /dev/null
+++ b/reference/event/eventconfig/setflags.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+<refentry xml:id="eventconfig.setflags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>EventConfig::setFlags</refname>
+  <refpurpose>Sets one or more flags to configure the eventual EventBase will be initialized</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier>
+   <type>bool</type>
+   <methodname>EventConfig::setFlags</methodname>
+   <methodparam>
+    <type>int</type>
+    <parameter>flags</parameter>
+   </methodparam>
+  </methodsynopsis>
+  <para>
+   Sets one or more flags to configure what parts of 
+   the eventual EventBase will be initialized, and how they'll work.
+  </para>
+ </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term>
+     <parameter>flags</parameter>
+    </term>
+    <listitem>
+     <para>
+      One of <literal>EventBase::LOOP_*</literal> constants. 
+      See <link linkend="eventbase.constants">EventBase constants</link>.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+<refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member>
+    <methodname>EventBase::getFeatures</methodname>
+   </member>
+  </simplelist>
+ </refsect1>
+</refentry>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/event/eventconfig/setmaxdispatchinterval.xml b/reference/event/eventconfig/setmaxdispatchinterval.xml
index 9ccb3592d7..9afb177760 100644
--- a/reference/event/eventconfig/setmaxdispatchinterval.xml
+++ b/reference/event/eventconfig/setmaxdispatchinterval.xml
@@ -90,7 +90,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success, otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventdnsbase/addnameserverip.xml b/reference/event/eventdnsbase/addnameserverip.xml
index c6044e667e..845068efc3 100644
--- a/reference/event/eventdnsbase/addnameserverip.xml
+++ b/reference/event/eventdnsbase/addnameserverip.xml
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventdnsbase/loadhosts.xml b/reference/event/eventdnsbase/loadhosts.xml
index ee79cc465f..008e56d333 100644
--- a/reference/event/eventdnsbase/loadhosts.xml
+++ b/reference/event/eventdnsbase/loadhosts.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventdnsbase/parseresolvconf.xml b/reference/event/eventdnsbase/parseresolvconf.xml
index 73be1dda7f..d4b96eda07 100644
--- a/reference/event/eventdnsbase/parseresolvconf.xml
+++ b/reference/event/eventdnsbase/parseresolvconf.xml
@@ -81,7 +81,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventdnsbase/setoption.xml b/reference/event/eventdnsbase/setoption.xml
index d1b5c916d1..9502a3be4e 100644
--- a/reference/event/eventdnsbase/setoption.xml
+++ b/reference/event/eventdnsbase/setoption.xml
@@ -62,7 +62,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventdnsbase/setsearchndots.xml b/reference/event/eventdnsbase/setsearchndots.xml
index ec23fe2e11..257df8baa9 100644
--- a/reference/event/eventdnsbase/setsearchndots.xml
+++ b/reference/event/eventdnsbase/setsearchndots.xml
@@ -41,7 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventhttp/accept.xml b/reference/event/eventhttp/accept.xml
index 71725185de..0c0195da3d 100644
--- a/reference/event/eventhttp/accept.xml
+++ b/reference/event/eventhttp/accept.xml
@@ -57,7 +57,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventhttp/addserveralias.xml b/reference/event/eventhttp/addserveralias.xml
index 2370cca2d2..46cbeeedd0 100644
--- a/reference/event/eventhttp/addserveralias.xml
+++ b/reference/event/eventhttp/addserveralias.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventhttp/bind.xml b/reference/event/eventhttp/bind.xml
index cdcd8c579c..741958ee3c 100644
--- a/reference/event/eventhttp/bind.xml
+++ b/reference/event/eventhttp/bind.xml
@@ -58,7 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventhttp/removeserveralias.xml b/reference/event/eventhttp/removeserveralias.xml
index f452662524..efe300a196 100644
--- a/reference/event/eventhttp/removeserveralias.xml
+++ b/reference/event/eventhttp/removeserveralias.xml
@@ -39,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventhttp/setcallback.xml b/reference/event/eventhttp/setcallback.xml
index ce3aa763cc..5bb97465ed 100644
--- a/reference/event/eventhttp/setcallback.xml
+++ b/reference/event/eventhttp/setcallback.xml
@@ -111,7 +111,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventhttp/setdefaultcallback.xml b/reference/event/eventhttp/setdefaultcallback.xml
index 1de8512aee..031f3e84de 100644
--- a/reference/event/eventhttp/setdefaultcallback.xml
+++ b/reference/event/eventhttp/setdefaultcallback.xml
@@ -96,7 +96,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventhttpconnection/makerequest.xml b/reference/event/eventhttpconnection/makerequest.xml
index b24b3d91a2..f6fb05bc85 100644
--- a/reference/event/eventhttpconnection/makerequest.xml
+++ b/reference/event/eventhttpconnection/makerequest.xml
@@ -73,7 +73,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/event/eventhttprequest/addheader.xml b/reference/event/eventhttprequest/addheader.xml
index 519e0a8428..7a46aefc90 100644
--- a/reference/event/eventhttprequest/addheader.xml
+++ b/reference/event/eventhttprequest/addheader.xml
@@ -69,7 +69,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventlistener/disable.xml b/reference/event/eventlistener/disable.xml
index 8ddef4e068..e39fe8efb4 100644
--- a/reference/event/eventlistener/disable.xml
+++ b/reference/event/eventlistener/disable.xml
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventlistener/enable.xml b/reference/event/eventlistener/enable.xml
index e6020f03d5..7ccfad89f1 100644
--- a/reference/event/eventlistener/enable.xml
+++ b/reference/event/eventlistener/enable.xml
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/eventlistener/getsocketname.xml b/reference/event/eventlistener/getsocketname.xml
index aa2d54fea2..96900c135d 100644
--- a/reference/event/eventlistener/getsocketname.xml
+++ b/reference/event/eventlistener/getsocketname.xml
@@ -54,7 +54,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventutil/getsocketname.xml b/reference/event/eventutil/getsocketname.xml
index 412a86a265..f7828b4637 100644
--- a/reference/event/eventutil/getsocketname.xml
+++ b/reference/event/eventutil/getsocketname.xml
@@ -72,7 +72,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/event/eventutil/setsocketoption.xml b/reference/event/eventutil/setsocketoption.xml
index a98e7ed741..aca1846d2a 100644
--- a/reference/event/eventutil/setsocketoption.xml
+++ b/reference/event/eventutil/setsocketoption.xml
@@ -103,7 +103,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success. Otherwise &false;.
+   &return.success;
   </para>
  </refsect1>
  <refsect1 role="seealso">
diff --git a/reference/event/examples.xml b/reference/event/examples.xml
index 497cf5429f..6656d8320b 100644
--- a/reference/event/examples.xml
+++ b/reference/event/examples.xml
@@ -590,7 +590,7 @@ foreach (Event::getSupportedMethods() as $m) {
 // Avoiding "select" method
 $cfg = new EventConfig();
 if ($cfg->avoidMethod("select")) {
-    echo "`select' method avoided\n";
+    echo "'select' method avoided\n";
 }
 
 // Create event_base associated with the config
diff --git a/reference/event/versions.xml b/reference/event/versions.xml
index 5fc02869ec..99ee6a823e 100644
--- a/reference/event/versions.xml
+++ b/reference/event/versions.xml
@@ -39,6 +39,8 @@
  <function name="eventconfig::__construct" from="PECL event &gt;= 1.2.6-beta"/>
  <function name="eventconfig::avoidmethod" from="PECL event &gt;= 1.2.6-beta"/>
  <function name="eventconfig::requirefeatures" from="PECL event &gt;= 1.2.6-beta"/>
+ <function name="eventconfig::setflags" from="PECL event &gt;= 2.0.2-alpha"/>
+ <function name="eventconfig::setmaxdispatchinterval" from="PECL event &gt;= 2.1.0-alpha"/>
  <function name='eventbufferevent' from='PECL event &gt;= 1.2.6-beta'/>
  <function name="eventbufferevent::__construct" from="PECL event &gt;= 1.2.6-beta"/>
  <function name="eventbufferevent::free" from="PECL event &gt;= 1.2.6-beta"/>
diff --git a/reference/exec/functions/escapeshellcmd.xml b/reference/exec/functions/escapeshellcmd.xml
index 08a65fe8b4..53a7d0082c 100644
--- a/reference/exec/functions/escapeshellcmd.xml
+++ b/reference/exec/functions/escapeshellcmd.xml
@@ -86,6 +86,20 @@ system($escaped_command);
      <function>escapeshellarg</function> should be used instead.
     </para>
    </warning>
+   <warning xmlns="http://docbook.org/ns/docbook">
+    <para>
+     Spaces will not be escaped by <function>escapeshellcmd</function>
+     which can be problematic on Windows with paths like:
+     <literal>C:\Program Files\ProgramName\program.exe</literal>.
+     This can be mitigated using the following code snippet:
+    <programlisting role="php">
+<![CDATA[
+<?php
+$cmd = preg_replace('`(?<!^) `', '^ ', escapeshellcmd($cmd));
+]]>
+    </programlisting>
+    </para>
+   </warning>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/exec/functions/proc-nice.xml b/reference/exec/functions/proc-nice.xml
index b80c971613..d4a7d8975b 100644
--- a/reference/exec/functions/proc-nice.xml
+++ b/reference/exec/functions/proc-nice.xml
@@ -101,24 +101,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>proc_nice</function> to set the process priority to high</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Highest priority
-proc_nice(-20);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -143,6 +125,24 @@ proc_nice(-20);
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>Using <function>proc_nice</function> to set the process priority to high</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// Highest priority
+proc_nice(-20);
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/exec/functions/shell-exec.xml b/reference/exec/functions/shell-exec.xml
index 5595f01c24..faf4d5b8a4 100644
--- a/reference/exec/functions/shell-exec.xml
+++ b/reference/exec/functions/shell-exec.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>shell_exec</methodname>
+   <type class="union"><type>string</type><type>false</type><type>null</type></type><methodname>shell_exec</methodname>
    <methodparam><type>string</type><parameter>cmd</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -45,8 +45,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The output from the executed command or &null; if an error occurred or the
-   command produces no output.
+   A &string; containing the output from the executed command, &false; if the pipe
+   cannot be established or &null; if an error occurs or the command produces no output.
   </para>
   <note>
    <para>
@@ -57,6 +57,14 @@
    </para>
   </note>
  </refsect1>
+ 
+ <refsect1 role="errors">
+  &reftitle.errors; 
+  <para>
+   An <constant>E_WARNING</constant> level error is generated
+   when the pipe cannot be established.
+  </para>
+ </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/exif/functions/exif-imagetype.xml b/reference/exif/functions/exif-imagetype.xml
index 8518be4cb5..07f96afa3d 100644
--- a/reference/exif/functions/exif-imagetype.xml
+++ b/reference/exif/functions/exif-imagetype.xml
@@ -46,42 +46,6 @@
     same value that <function>getimagesize</function> returns in index 2 but
     <function>exif_imagetype</function> is much faster.
    </para>
-
-   <note>
-    <para>
-     <function>exif_imagetype</function> will emit an <constant>E_NOTICE</constant>
-     and return &false; if it is unable to read enough bytes from the file to
-     determine the image type.
-     <!-- If the function finds an incomplete PNG header then it may emit an
-     <constant>E_WARNING</constant> instead. - Is this worth including? -->
-    </para>
-   </note>
-  </refsect1>
-  <refsect1 role="changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>7.1.0</entry>
-        <entry>
-         Added WebP support.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </refsect1>
-  <refsect1 role="constants">
-   &reftitle.constants;
    <para>
     The following constants are defined, and represent possible 
     <function>exif_imagetype</function> return values:
@@ -173,7 +137,42 @@
      </tgroup>     
     </table>       
    </para>
+
+   <note>
+    <para>
+     <function>exif_imagetype</function> will emit an <constant>E_NOTICE</constant>
+     and return &false; if it is unable to read enough bytes from the file to
+     determine the image type.
+     <!-- If the function finds an incomplete PNG header then it may emit an
+     <constant>E_WARNING</constant> instead. - Is this worth including? -->
+    </para>
+   </note>
+
   </refsect1>
+  <refsect1 role="changelog">
+   &reftitle.changelog;
+   <para>
+    <informaltable>
+     <tgroup cols="2">
+      <thead>
+       <row>
+        <entry>&Version;</entry>
+        <entry>&Description;</entry>
+       </row>
+      </thead>
+      <tbody>
+       <row>
+        <entry>7.1.0</entry>
+        <entry>
+         Added WebP support.
+        </entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </informaltable>
+   </para>
+  </refsect1>
+
   <refsect1 role="examples">
    &reftitle.examples;
    <para>
diff --git a/reference/exif/functions/exif-read-data.xml b/reference/exif/functions/exif-read-data.xml
index 956316c578..48097b62d7 100644
--- a/reference/exif/functions/exif-read-data.xml
+++ b/reference/exif/functions/exif-read-data.xml
@@ -59,11 +59,6 @@
    to the EXIF specification (<link
    xlink:href="&url.exifspec;">&url.exifspec;</link>, page 20).
   </para>
-  <note>
-   <para>
-    Windows Me/XP can both wipe the Exif headers when connecting to a camera.
-   </para>
-  </note>
  </refsect1>
  <refsect1 role="parameters">
   &reftitle.parameters;
diff --git a/reference/exif/functions/exif-thumbnail.xml b/reference/exif/functions/exif-thumbnail.xml
index d7cfa151c0..42f7a02856 100644
--- a/reference/exif/functions/exif-thumbnail.xml
+++ b/reference/exif/functions/exif-thumbnail.xml
@@ -77,6 +77,32 @@
    thumbnail.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>7.2.0</entry>
+       <entry>
+        The <parameter>file</parameter> parameter now supports both local files
+        and stream resources.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -101,30 +127,7 @@ if ($image!==false) {
    </example>
   </para>
  </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.2.0</entry>
-       <entry>
-        The <parameter>file</parameter> parameter now supports both local files 
-        and stream resources.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/expect/book.xml b/reference/expect/book.xml
index 4246652b46..89fc0c6744 100644
--- a/reference/expect/book.xml
+++ b/reference/expect/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.expect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Expect</title>
  
  <!-- {{{ preface -->
diff --git a/reference/fann/book.xml b/reference/fann/book.xml
index 59ccfc8d43..2f0a021684 100644
--- a/reference/fann/book.xml
+++ b/reference/fann/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.fann" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>FANN (Fast Artificial Neural Network)</title>
  <titleabbrev>FANN</titleabbrev>
 
diff --git a/reference/fann/functions/fann-get-activation-steepness.xml b/reference/fann/functions/fann-get-activation-steepness.xml
index 686b03aec6..144202bc5f 100644
--- a/reference/fann/functions/fann-get-activation-steepness.xml
+++ b/reference/fann/functions/fann-get-activation-steepness.xml
@@ -24,7 +24,7 @@
   </para>
   <para>
    The steepness of an activation function says something about how fast the activation function goes
-   from the minimum to the maximum.  A high value for the activation function will also give a more agressive training.
+   from the minimum to the maximum.  A high value for the activation function will also give a more aggressive training.
   </para>
   <para>
    When training neural networks where the output values should be at the extremes
diff --git a/reference/fann/functions/fann-read-train-from-file.xml b/reference/fann/functions/fann-read-train-from-file.xml
index 562a603f3a..4780e144ed 100644
--- a/reference/fann/functions/fann-read-train-from-file.xml
+++ b/reference/fann/functions/fann-read-train-from-file.xml
@@ -30,15 +30,15 @@
      <programlisting role="txt">
 <![CDATA[
 num_train_data num_input num_output
-inputdata seperated by space
-outputdata seperated by space
+inputdata separated by space
+outputdata separated by space
 
 .
 .
 .
 
-inputdata seperated by space
-outputdata seperated by space
+inputdata separated by space
+outputdata separated by space
 ]]>
      </programlisting>
     </listitem>
diff --git a/reference/fann/functions/fann-set-activation-steepness.xml b/reference/fann/functions/fann-set-activation-steepness.xml
index 305dd3002a..098dc48dcb 100644
--- a/reference/fann/functions/fann-set-activation-steepness.xml
+++ b/reference/fann/functions/fann-set-activation-steepness.xml
@@ -25,7 +25,7 @@
   </para>
   <para>
    The steepness of an activation function says something about how fast the activation function goes from
-   the minimum to the maximum. A high value for the activation function will also give a more agressive training.
+   the minimum to the maximum. A high value for the activation function will also give a more aggressive training.
   </para>
   <para>
    When training neural networks where the output values should be at the extremes
diff --git a/reference/fdf/book.xml b/reference/fdf/book.xml
index 028bd3e352..3aac7c4c16 100644
--- a/reference/fdf/book.xml
+++ b/reference/fdf/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.fdf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Forms Data Format</title>
  <titleabbrev>FDF</titleabbrev>
  
diff --git a/reference/fdf/configure.xml b/reference/fdf/configure.xml
index 2d04cc8f46..ae724f9f32 100644
--- a/reference/fdf/configure.xml
+++ b/reference/fdf/configure.xml
@@ -7,7 +7,7 @@
   <link xlink:href="&url.pecl.vcs;fdf">&url.pecl.vcs;fdf</link>.
  </para>
  <para>
-  This extension is no longer bundled with PHP as of PHP 5.3.0.
+  This extension is no longer bundled with PHP.
  </para>
  <note>
   <simpara>
diff --git a/reference/fdf/functions/fdf-create.xml b/reference/fdf/functions/fdf-create.xml
index d8057698e1..bbf0f8458d 100644
--- a/reference/fdf/functions/fdf-create.xml
+++ b/reference/fdf/functions/fdf-create.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/fdf/functions/fdf-errno.xml b/reference/fdf/functions/fdf-errno.xml
index dbe1e5590d..e659316365 100644
--- a/reference/fdf/functions/fdf-errno.xml
+++ b/reference/fdf/functions/fdf-errno.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/fdf/functions/fdf-header.xml b/reference/fdf/functions/fdf-header.xml
index 76f4d65eb9..8b83c600dd 100644
--- a/reference/fdf/functions/fdf-header.xml
+++ b/reference/fdf/functions/fdf-header.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/fdf/functions/fdf-set-value.xml b/reference/fdf/functions/fdf-set-value.xml
index 06494a26d9..4ba87927fd 100644
--- a/reference/fdf/functions/fdf-set-value.xml
+++ b/reference/fdf/functions/fdf-set-value.xml
@@ -61,8 +61,8 @@
        </para>
        <para>
         The value is no longer used in the current toolkit version 5.0. For
-        compatibility reasons it is still supported as an optional parameter
-        beginning with PHP 4.3, but ignored internally.
+        compatibility reasons it is still supported as an optional parameter,
+        but ignored internally.
        </para>
       </note>
      </listitem>
@@ -78,31 +78,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>4.3.0</entry>
-       <entry>
-        Support for arrays in the <parameter>value</parameter> parameter was
-        added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/ffi/book.xml b/reference/ffi/book.xml
index c92bf86f94..1bd9da7985 100644
--- a/reference/ffi/book.xml
+++ b/reference/ffi/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.ffi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="bundled" ?>
  <title>Foreign Function Interface</title>
  <titleabbrev>FFI</titleabbrev>
 
diff --git a/reference/ffi/ffi/cast.xml b/reference/ffi/ffi/cast.xml
index ecffb6882c..eb781cc257 100644
--- a/reference/ffi/ffi/cast.xml
+++ b/reference/ffi/ffi/cast.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="ffi.cast" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>FFI::cast</refname>
@@ -15,7 +14,7 @@
    <methodparam><type class="union"><type>FFI\CData</type><type>int</type><type>float</type><type>bool</type><type>null</type></type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>FFI\CData</type><type>null</type></type><methodname>FFI::cast</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>FFI\CData</type><type>null</type></type><methodname>FFI::cast</methodname>
    <methodparam><type class="union"><type>FFI\CType</type><type>string</type></type><parameter>type</parameter></methodparam>
    <methodparam><type class="union"><type>FFI\CData</type><type>int</type><type>float</type><type>bool</type><type>null</type></type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
@@ -62,7 +61,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ffi/ffi/new.xml b/reference/ffi/ffi/new.xml
index 6ef6b4ce09..3206dc87ac 100644
--- a/reference/ffi/ffi/new.xml
+++ b/reference/ffi/ffi/new.xml
@@ -15,7 +15,7 @@
    <methodparam choice="opt"><type>bool</type><parameter>persistent</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>FFI\CData</type><type>null</type></type><methodname>FFI::new</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>FFI\CData</type><type>null</type></type><methodname>FFI::new</methodname>
    <methodparam><type class="union"><type>FFI\CType</type><type>string</type></type><parameter>type</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>owned</parameter><initializer>&true;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>persistent</parameter><initializer>&false;</initializer></methodparam>
diff --git a/reference/ffi/ffi/type.xml b/reference/ffi/ffi/type.xml
index fc595fe48e..134870fbe1 100644
--- a/reference/ffi/ffi/type.xml
+++ b/reference/ffi/ffi/type.xml
@@ -13,7 +13,7 @@
    <methodparam><type>string</type><parameter>type</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>FFI\CType</type><type>null</type></type><methodname>FFI::type</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>FFI\CType</type><type>null</type></type><methodname>FFI::type</methodname>
    <methodparam><type>string</type><parameter>type</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/ffi/versions.xml b/reference/ffi/versions.xml
index 89204a3a93..87ef652714 100644
--- a/reference/ffi/versions.xml
+++ b/reference/ffi/versions.xml
@@ -7,32 +7,32 @@
 <versions>
   <!-- Classes and Methods -->
 
- <function name='ffi\exception' from='PHP 7 &gt;= 7.4.0'/>
+ <function name='ffi\exception' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
 
- <function name='ffi\parserexception' from='PHP 7 &gt;= 7.4.0'/>
+ <function name='ffi\parserexception' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
 
- <function name='ffi' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::addr' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::alignof' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::arraytype' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::cast' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::cdef' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::free' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::isnull' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::load' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::memcmp' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::memcpy' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::memset' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::new' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::scope' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::string' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::sizeof' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::type' from='PHP 7 &gt;= 7.4.0'/>
- <function name='ffi::typeof' from='PHP 7 &gt;= 7.4.0'/>
+ <function name='ffi' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::addr' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::alignof' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::arraytype' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::cast' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::cdef' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::free' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::isnull' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::load' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::memcmp' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::memcpy' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::memset' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::new' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::scope' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::string' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::sizeof' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::type' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
+ <function name='ffi::typeof' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
 
- <function name='ffi\cdata' from='PHP 7 &gt;= 7.4.0'/>
+ <function name='ffi\cdata' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
 
- <function name='ffi\ctype' from='PHP 7 &gt;= 7.4.0'/>
+ <function name='ffi\ctype' from='PHP 7 &gt;= 7.4.0, PHP 8'/>
 </versions>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/fileinfo/configure.xml b/reference/fileinfo/configure.xml
index 0fa2e071be..eb2e87516a 100644
--- a/reference/fileinfo/configure.xml
+++ b/reference/fileinfo/configure.xml
@@ -3,10 +3,7 @@
 <section xml:id="fileinfo.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  This extension is enabled by default as of PHP 5.3.0. Before this time,
-  fileinfo was a PECL extension but is no longer maintained there.
-  However, versions prior to 5.3+ may use the
-  <link xlink:href="&url.pecl.package;fileinfo">discontinued PECL extension</link>.
+  This extension is enabled by default.
  </para>
  <para>
   Windows users must include the bundled <filename>php_fileinfo.dll</filename>
@@ -17,32 +14,6 @@
   A patch against libmagic named <filename>libmagic.patch</filename> is maintained
   and may be found within the PHP fileinfo extensions source.
  </para>
- <para>
-  <table>
-   <title>Upgrade history of the bundled libmagic library</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>PHP &Version;</entry>
-      <entry>Updated libmagic &Version;</entry>
-      <entry>Notes</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>5.3.2</entry>
-      <entry>5.03</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry>5.3.0</entry>
-      <entry>5.02</entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
 </section>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/fileinfo/constants.xml b/reference/fileinfo/constants.xml
index cc22fa18d1..200a6b7a71 100644
--- a/reference/fileinfo/constants.xml
+++ b/reference/fileinfo/constants.xml
@@ -36,9 +36,6 @@
     <simpara>
      Return the mime type.
     </simpara>
-    <simpara>
-     Available since PHP 5.3.0.
-    </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.fileinfo-mime-encoding">
@@ -50,9 +47,6 @@
     <simpara>
      Return the mime encoding of the file.
     </simpara>
-    <simpara>
-     Available since PHP 5.3.0.
-    </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.fileinfo-mime">
@@ -76,7 +70,7 @@
      Decompress compressed files.
     </simpara>
     <simpara>
-     Disabled since PHP 5.3.0 due to thread safety issues.
+     Disabled due to thread safety issues.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/fileinfo/finfo/construct.xml b/reference/fileinfo/finfo/construct.xml
index 15269104a3..f73822fad7 100644
--- a/reference/fileinfo/finfo/construct.xml
+++ b/reference/fileinfo/finfo/construct.xml
@@ -11,12 +11,34 @@
   <constructorsynopsis role="oop">
    <modifier>public</modifier> <methodname>finfo::__construct</methodname>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>magic_database</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    &info.function.alias; <function>finfo_open</function>
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>magic_database</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/fileinfo/functions/finfo-open.xml b/reference/fileinfo/functions/finfo-open.xml
index 270e02bfa2..e888355d31 100644
--- a/reference/fileinfo/functions/finfo-open.xml
+++ b/reference/fileinfo/functions/finfo-open.xml
@@ -13,13 +13,13 @@
   <methodsynopsis role="procedural">
    <type class="union"><type>resource</type><type>false</type></type><methodname>finfo_open</methodname>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>magic_database</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.oop; (constructor):</para>
   <constructorsynopsis role="oop">
    <modifier>public</modifier> <methodname>finfo::__construct</methodname>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>magic_database</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    This function opens a magic database and returns its resource.
@@ -67,6 +67,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>magic_database</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <warning>
diff --git a/reference/fileinfo/setup.xml b/reference/fileinfo/setup.xml
index a0bc35b3b1..01082aafc7 100644
--- a/reference/fileinfo/setup.xml
+++ b/reference/fileinfo/setup.xml
@@ -7,10 +7,7 @@
  <!-- {{{ Requirements -->
  <section xml:id="fileinfo.requirements">
   &reftitle.required;
-  <para>
-   Before PHP 5.3.0, the <literal>magic_open</literal> library is needed to build
-   this extension.
-  </para>
+  &no.requirement;
  </section>
  <!-- }}} -->
 
diff --git a/reference/filepro/book.xml b/reference/filepro/book.xml
deleted file mode 100644
index 585b4b7016..0000000000
--- a/reference/filepro/book.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
- 
-<book xml:id="book.filepro" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>filePro</title>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.filepro">
-  &reftitle.intro;
-  <simpara>
-   These functions allow read-only access to data stored in filePro databases.
-  </simpara>
-  <simpara>
-   filePro is a registered trademark of fP Technologies, Inc. You can find more
-   information about filePro at <link xlink:href="&url.filepro;">&url.filepro;</link>.
-  </simpara>
-  <note>
-   <para>
-    &pecl.moved-ver;5.2.0.
-   </para>
-  </note>
- </preface>
- <!-- }}} -->
- 
- &reference.filepro.setup;
- &reference.filepro.constants;
- &reference.filepro.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/filepro/configure.xml b/reference/filepro/configure.xml
deleted file mode 100644
index 8af52dd4aa..0000000000
--- a/reference/filepro/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="filepro.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.moved-ver;5.2.0
- </para>
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;filepro">&url.pecl.package;filepro</link>.
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/constants.xml b/reference/filepro/constants.xml
deleted file mode 100644
index 49d24ee824..0000000000
--- a/reference/filepro/constants.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="filepro.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &no.constants;
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/filepro/functions/filepro-fieldcount.xml b/reference/filepro/functions/filepro-fieldcount.xml
deleted file mode 100644
index 15a1a0f922..0000000000
--- a/reference/filepro/functions/filepro-fieldcount.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro-fieldcount" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro_fieldcount</refname>
-  <refpurpose>Find out how many fields are in a filePro database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>filepro_fieldcount</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of fields (columns) in the opened filePro
-   database.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of fields in the opened filePro database, or &false; on
-   errors.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>filepro</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/functions/filepro-fieldname.xml b/reference/filepro/functions/filepro-fieldname.xml
deleted file mode 100644
index f31e7f87c1..0000000000
--- a/reference/filepro/functions/filepro-fieldname.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro-fieldname" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro_fieldname</refname>
-  <refpurpose>Gets the name of a field</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>filepro_fieldname</methodname>
-   <methodparam><type>int</type><parameter>field_number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the name of the field corresponding to 
-   <parameter>field_number</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_number</parameter></term>
-     <listitem>
-      <para>
-       The field number.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the name of the field as a string, or &false; on errors.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/functions/filepro-fieldtype.xml b/reference/filepro/functions/filepro-fieldtype.xml
deleted file mode 100644
index bfb594e38b..0000000000
--- a/reference/filepro/functions/filepro-fieldtype.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro-fieldtype" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro_fieldtype</refname>
-  <refpurpose>Gets the type of a field</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>filepro_fieldtype</methodname>
-   <methodparam><type>int</type><parameter>field_number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the edit type of the field corresponding to <parameter>field_number</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_number</parameter></term>
-     <listitem>
-      <para>
-       The field number.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the edit type of the field as a string, or &false; on errors.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/functions/filepro-fieldwidth.xml b/reference/filepro/functions/filepro-fieldwidth.xml
deleted file mode 100644
index 330d5706f4..0000000000
--- a/reference/filepro/functions/filepro-fieldwidth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro-fieldwidth" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro_fieldwidth</refname>
-  <refpurpose>Gets the width of a field</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>filepro_fieldwidth</methodname>
-   <methodparam><type>int</type><parameter>field_number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the width of the field corresponding to <parameter>field_number</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_number</parameter></term>
-     <listitem>
-      <para>
-       The field number.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the width of the field as a integer, or &false; on errors.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/functions/filepro-retrieve.xml b/reference/filepro/functions/filepro-retrieve.xml
deleted file mode 100644
index 55251bd8ae..0000000000
--- a/reference/filepro/functions/filepro-retrieve.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro-retrieve" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro_retrieve</refname>
-  <refpurpose>Retrieves data from a filePro database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>filepro_retrieve</methodname>
-   <methodparam><type>int</type><parameter>row_number</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the data from the specified location in the database.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>row_number</parameter></term>
-     <listitem>
-      <para>
-       The row number. Must be between zero and the total number of rows
-       minus one (0..<function>filepro_rowcount</function> - 1)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_number</parameter></term>
-     <listitem>
-      <para>
-       The field number. Accepts values between zero and the total number of
-       fields minus one (0..<function>filepro_fieldcount</function> - 1)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the specified data, or &false; on errors.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/functions/filepro-rowcount.xml b/reference/filepro/functions/filepro-rowcount.xml
deleted file mode 100644
index f8898ddc79..0000000000
--- a/reference/filepro/functions/filepro-rowcount.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro-rowcount" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro_rowcount</refname>
-  <refpurpose>Find out how many rows are in a filePro database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>filepro_rowcount</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of rows in the opened filePro database.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of rows in the opened filePro database, or &false; on
-   errors.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>filepro</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/functions/filepro.xml b/reference/filepro/functions/filepro.xml
deleted file mode 100644
index d05a2e4608..0000000000
--- a/reference/filepro/functions/filepro.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.filepro" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>filepro</refname>
-  <refpurpose>Read and verify the map file</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>filepro</methodname>
-   <methodparam><type>string</type><parameter>directory</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This reads and verifies the map file, storing the field count
-   and info.
-  </para>
-  <para>
-   No locking is done, so you should avoid modifying your filePro
-   database while it may be opened in PHP.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>directory</parameter></term>
-     <listitem>
-      <para>
-       The map directory.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filepro/reference.xml b/reference/filepro/reference.xml
deleted file mode 100644
index 9a9f25672a..0000000000
--- a/reference/filepro/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <reference xml:id="ref.filepro" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>filePro &Functions;</title>
-
-&reference.filepro.entities.functions;
-
- </reference>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/filepro/setup.xml b/reference/filepro/setup.xml
deleted file mode 100644
index 766344eb9b..0000000000
--- a/reference/filepro/setup.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="filepro.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="filepro.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.filepro.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="filepro.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="filepro.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/filepro/versions.xml b/reference/filepro/versions.xml
deleted file mode 100644
index d524b3a63a..0000000000
--- a/reference/filepro/versions.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions> 
- <function name='filepro' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
- <function name='filepro_fieldcount' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
- <function name='filepro_fieldname' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
- <function name='filepro_fieldtype' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
- <function name='filepro_fieldwidth' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
- <function name='filepro_retrieve' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
- <function name='filepro_rowcount' from='PHP 4, PHP 5 &lt; 5.2.0, PECL filepro SVN'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/filesystem/constants.xml b/reference/filesystem/constants.xml
index 4e08337aca..25982f7b10 100644
--- a/reference/filesystem/constants.xml
+++ b/reference/filesystem/constants.xml
@@ -198,7 +198,7 @@
    </term>
    <listitem>
     <simpara>
-    Since PHP 5.2.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -265,7 +265,7 @@
    </term>
    <listitem>
     <para>
-     Binary mode (since PHP 5.2.7).
+     Binary mode.
      <note>
       <para>
        This constant has no effect, and is only available for 
@@ -283,7 +283,7 @@
    </term>
    <listitem>
     <para>
-     Text mode (since PHP 5.2.7).
+     Text mode.
      <note>
       <para>
        This constant has no effect, and is only available for 
@@ -301,7 +301,7 @@
    </term>
    <listitem>
     <simpara>
-     Normal INI scanner mode (since PHP 5.3).
+     Normal INI scanner mode.
     </simpara>
    </listitem>
   </varlistentry>
@@ -313,7 +313,7 @@
    </term>
    <listitem>
     <simpara>
-     Raw INI scanner mode (since PHP 5.3).
+     Raw INI scanner mode.
     </simpara>
    </listitem>
   </varlistentry>
@@ -325,7 +325,7 @@
    </term>
    <listitem>
     <simpara>
-     Typed INI scanner mode (since PHP 5.6.1).
+     Typed INI scanner mode.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/filesystem/functions/fgetcsv.xml b/reference/filesystem/functions/fgetcsv.xml
index 3bb9734ab8..a27a7621b8 100644
--- a/reference/filesystem/functions/fgetcsv.xml
+++ b/reference/filesystem/functions/fgetcsv.xml
@@ -65,7 +65,7 @@
      <term><parameter>separator</parameter></term>
      <listitem>
       <para>
-       The optional <parameter>separator</parameter> parameter sets the field separator (one character only).
+       The optional <parameter>separator</parameter> parameter sets the field separator (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -73,7 +73,7 @@
      <term><parameter>enclosure</parameter></term>
      <listitem>
       <para>
-       The optional <parameter>enclosure</parameter> parameter sets the field enclosure character (one character only).
+       The optional <parameter>enclosure</parameter> parameter sets the field enclosure character (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -81,7 +81,7 @@
      <term><parameter>escape</parameter></term>
      <listitem>
       <para>
-       The optional <parameter>escape</parameter> parameter sets the escape character (at most one character).
+       The optional <parameter>escape</parameter> parameter sets the escape character (at most one single-byte character).
        An empty string (<literal>""</literal>) disables the proprietary escape mechanism.
       </para>
       <note>
diff --git a/reference/filesystem/functions/file-exists.xml b/reference/filesystem/functions/file-exists.xml
index cd6616c819..31831206da 100644
--- a/reference/filesystem/functions/file-exists.xml
+++ b/reference/filesystem/functions/file-exists.xml
@@ -58,6 +58,11 @@
   &fs.file.32bit;
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -80,11 +85,6 @@ if (file_exists($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/file-get-contents.xml b/reference/filesystem/functions/file-get-contents.xml
index 773eee5234..42be2fa387 100644
--- a/reference/filesystem/functions/file-get-contents.xml
+++ b/reference/filesystem/functions/file-get-contents.xml
@@ -14,13 +14,13 @@
    <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
    <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>maxlen</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
   </methodsynopsis>
   <para> 
    This function is similar to <function>file</function>, except that
    <function>file_get_contents</function> returns the file in a 
    <type>string</type>, starting at the specified <parameter>offset</parameter> 
-   up to <parameter>maxlen</parameter> bytes. On failure, 
+   up to <parameter>length</parameter> bytes. On failure, 
    <function>file_get_contents</function> will return &false;.
   </para>
   <para>
@@ -89,7 +89,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>maxlen</parameter></term>
+     <term><parameter>length</parameter></term>
      <listitem>
       <para>
        Maximum length of data read. The default is to read until end
@@ -113,7 +113,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   An <constant>E_WARNING</constant> level error is generated if <parameter>filename</parameter> cannot be found, <parameter>maxlength</parameter>
+   An <constant>E_WARNING</constant> level error is generated if <parameter>filename</parameter> cannot be found, <parameter>length</parameter>
    is less than zero, or if seeking to the specified <parameter>offset</parameter> in the stream fails.
   </para>
   <para>
@@ -123,6 +123,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>7.1.0</entry>
+       <entry>
+        Support for negative <parameter>offset</parameter>s has been added.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -192,30 +216,6 @@ $file = file_get_contents('http://www.example.com/', false, $context);
    </example>
   </para>
  </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.1.0</entry>
-       <entry>
-        Support for negative <parameter>offset</parameter>s has been added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
 
  <refsect1 role="notes">
   &reftitle.notes;
diff --git a/reference/filesystem/functions/file.xml b/reference/filesystem/functions/file.xml
index 2be3e227fc..d0aae99e72 100644
--- a/reference/filesystem/functions/file.xml
+++ b/reference/filesystem/functions/file.xml
@@ -137,10 +137,7 @@ foreach ($lines as $line_num => $line) {
     echo "Line #<b>{$line_num}</b> : " . htmlspecialchars($line) . "<br />\n";
 }
 
-// Another example, let's get a web page into a string.  See also file_get_contents().
-$html = implode('', file('http://www.example.com/'));
-
-// Using the optional flags parameter since PHP 5
+// Using the optional flags parameter
 $trimmed = file('somefile.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 ?>
 ]]>
@@ -158,11 +155,11 @@ $trimmed = file('somefile.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>file_get_contents</function></member>
     <member><function>readfile</function></member>
     <member><function>fopen</function></member>
     <member><function>fsockopen</function></member>
     <member><function>popen</function></member>
-    <member><function>file_get_contents</function></member>
     <member><function>include</function></member>
     <member><function>stream_context_create</function></member>
    </simplelist>
diff --git a/reference/filesystem/functions/fileatime.xml b/reference/filesystem/functions/fileatime.xml
index 78e36ac51a..f2aeb5cafb 100644
--- a/reference/filesystem/functions/fileatime.xml
+++ b/reference/filesystem/functions/fileatime.xml
@@ -41,6 +41,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -64,11 +69,6 @@ if (file_exists($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/filesystem/functions/filectime.xml b/reference/filesystem/functions/filectime.xml
index fa9c02a67f..b97af1ee59 100644
--- a/reference/filesystem/functions/filectime.xml
+++ b/reference/filesystem/functions/filectime.xml
@@ -41,6 +41,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -64,11 +69,6 @@ if (file_exists($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/filesystem/functions/filegroup.xml b/reference/filesystem/functions/filegroup.xml
index 42aa65b4e9..63ac863d73 100644
--- a/reference/filesystem/functions/filegroup.xml
+++ b/reference/filesystem/functions/filegroup.xml
@@ -44,6 +44,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Upon failure, an <constant>E_WARNING</constant> is emitted.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -61,13 +68,6 @@ print_r(posix_getgrgid(filegroup($filename)));
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Upon failure, an <constant>E_WARNING</constant> is emitted.
-  </para>
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/fileinode.xml b/reference/filesystem/functions/fileinode.xml
index 924ccfe236..6ec8d09dc9 100644
--- a/reference/filesystem/functions/fileinode.xml
+++ b/reference/filesystem/functions/fileinode.xml
@@ -40,6 +40,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -59,11 +64,6 @@ if (getmyinode() == fileinode($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/filemtime.xml b/reference/filesystem/functions/filemtime.xml
index 66862bc8ee..1f702de7f0 100644
--- a/reference/filesystem/functions/filemtime.xml
+++ b/reference/filesystem/functions/filemtime.xml
@@ -43,6 +43,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -64,11 +69,6 @@ if (file_exists($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.filesystem-time-res;
diff --git a/reference/filesystem/functions/fileowner.xml b/reference/filesystem/functions/fileowner.xml
index 7ecc9a8e31..0828a5fc2d 100644
--- a/reference/filesystem/functions/fileowner.xml
+++ b/reference/filesystem/functions/fileowner.xml
@@ -42,6 +42,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -59,11 +64,6 @@ print_r(posix_getpwuid(fileowner($filename)));
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/fileperms.xml b/reference/filesystem/functions/fileperms.xml
index 1b861a23d3..d7f14d9892 100644
--- a/reference/filesystem/functions/fileperms.xml
+++ b/reference/filesystem/functions/fileperms.xml
@@ -56,6 +56,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -145,11 +150,6 @@ echo $info;
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/filesize.xml b/reference/filesystem/functions/filesize.xml
index ea9c104723..e7c14236be 100644
--- a/reference/filesystem/functions/filesize.xml
+++ b/reference/filesystem/functions/filesize.xml
@@ -42,6 +42,11 @@
   &fs.file.32bit;
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -63,11 +68,6 @@ echo $filename . ': ' . filesize($filename) . ' bytes';
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/filetype.xml b/reference/filesystem/functions/filetype.xml
index 6ac4e41e8c..edb4d86525 100644
--- a/reference/filesystem/functions/filetype.xml
+++ b/reference/filesystem/functions/filetype.xml
@@ -46,6 +46,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -65,11 +70,6 @@ echo filetype('/etc/');        // dir
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/flock.xml b/reference/filesystem/functions/flock.xml
index 625ecb0523..d6eedaca2c 100644
--- a/reference/filesystem/functions/flock.xml
+++ b/reference/filesystem/functions/flock.xml
@@ -20,9 +20,8 @@
    derivatives and even Windows).
   </para>
   <para>
-   On versions of PHP before 5.3.2, the lock is released also by
-   <function>fclose</function> (which is also called automatically when script
-   finished).
+   The lock is released also by <function>fclose</function>,
+   or when <parameter>stream</parameter> is garbage collected.
   </para>
   <para>
    PHP supports a portable way of locking complete files in an advisory way
@@ -190,6 +189,12 @@ fclose($fp);
     return &false; under these environments.
    </para>
   </warning>
+  <note>
+   <para>
+    On Windows, if the locking process opens the file a second time, it cannot
+    access the file through this second handle until it unlocks the file.
+   </para>
+  </note>
  </refsect1>
  
 </refentry>
diff --git a/reference/filesystem/functions/fopen.xml b/reference/filesystem/functions/fopen.xml
index 5fb9c2b399..b7da18d2fe 100644
--- a/reference/filesystem/functions/fopen.xml
+++ b/reference/filesystem/functions/fopen.xml
@@ -123,9 +123,8 @@ $handle = fopen("c:\\folder\\resource.txt", "r");
           <row>
            <entry><literal>'w+'</literal></entry>
            <entry>
-            Open for reading and writing; place the file pointer at
-            the beginning of the file and truncate the file to zero
-            length.  If the file does not exist, attempt to create it.
+            Open for reading and writing; otherwise it has the
+            same behavior as <literal>'w'</literal>.
            </entry>
           </row>
           <row>
diff --git a/reference/filesystem/functions/fpassthru.xml b/reference/filesystem/functions/fpassthru.xml
index 8e3ae01dcb..b94c116f74 100644
--- a/reference/filesystem/functions/fpassthru.xml
+++ b/reference/filesystem/functions/fpassthru.xml
@@ -46,9 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   If an error occurs, <function>fpassthru</function> returns
-   &false;.  Otherwise, <function>fpassthru</function> returns
-   the number of characters read from <parameter>stream</parameter>
+   Returns the number of characters read from <parameter>stream</parameter>
    and passed through to the output.
   </para>
  </refsect1>
diff --git a/reference/filesystem/functions/fputcsv.xml b/reference/filesystem/functions/fputcsv.xml
index 145b64781c..f6298697cf 100644
--- a/reference/filesystem/functions/fputcsv.xml
+++ b/reference/filesystem/functions/fputcsv.xml
@@ -12,7 +12,7 @@
    <type class="union"><type>int</type><type>false</type></type><methodname>fputcsv</methodname>
    <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
    <methodparam><type>array</type><parameter>fields</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>","</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>separator</parameter><initializer>","</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>enclosure</parameter><initializer>'"'</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>escape_char</parameter><initializer>"\\"</initializer></methodparam>
   </methodsynopsis>
@@ -42,11 +42,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>delimiter</parameter></term>
+     <term><parameter>separator</parameter></term>
      <listitem>
       <para>
-       The optional <parameter>delimiter</parameter> parameter sets the field
-       delimiter (one character only).
+       The optional <parameter>separator</parameter> parameter sets the field
+       delimiter (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -55,7 +55,7 @@
      <listitem>
       <para>
        The optional <parameter>enclosure</parameter> parameter sets the field
-       enclosure (one character only).
+       enclosure (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -64,7 +64,7 @@
      <listitem>
       <para>
        The optional <parameter>escape_char</parameter> parameter sets the
-       escape character (at most one character).
+       escape character (at most one single-byte character).
        An empty string (<literal>""</literal>) disables the proprietary escape mechanism.
       </para>
      </listitem>
@@ -106,12 +106,6 @@
         string to disable the proprietary escape mechanism.
        </entry>
       </row>
-      <row>
-       <entry>5.5.4</entry>
-       <entry>
-        The <parameter>escape_char</parameter> parameter was added
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/filesystem/functions/fread.xml b/reference/filesystem/functions/fread.xml
index 05ac6b0e18..f0d0619ab3 100644
--- a/reference/filesystem/functions/fread.xml
+++ b/reference/filesystem/functions/fread.xml
@@ -132,7 +132,6 @@ fclose($handle);
     <programlisting role="php">
 <![CDATA[
 <?php
-// For PHP 5 and up
 $handle = fopen("http://www.example.com/", "rb");
 $contents = stream_get_contents($handle);
 fclose($handle);
diff --git a/reference/filesystem/functions/fwrite.xml b/reference/filesystem/functions/fwrite.xml
index b0649eecf5..b7cd9870ad 100644
--- a/reference/filesystem/functions/fwrite.xml
+++ b/reference/filesystem/functions/fwrite.xml
@@ -48,13 +48,6 @@
        the end of <parameter>string</parameter> is reached, whichever comes
        first.
       </para>
-      <para>
-       Note that if the <parameter>length</parameter> argument is given,
-       then the <link
-       linkend="ini.magic-quotes-runtime">magic_quotes_runtime</link>
-       configuration option will be ignored and no slashes will be
-       stripped from <parameter>string</parameter>.
-      </para>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -69,68 +62,6 @@
   </simpara>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Writing to a network stream may end before the whole string is written.
-    Return value of <function>fwrite</function> may be checked:
-    <programlisting role="php">
-<![CDATA[
-<?php
-function fwrite_stream($fp, $string) {
-    for ($written = 0; $written < strlen($string); $written += $fwrite) {
-        $fwrite = fwrite($fp, substr($string, $written));
-        if ($fwrite === false) {
-            return $written;
-        }
-    }
-    return $written;
-}
-?>
-]]>
-    </programlisting>
-   </para>
-  </note>
-  
-  <note>
-   <para>
-    On systems which differentiate between binary and text files
-    (i.e. Windows) the file must be opened with 'b' included in
-    <function>fopen</function> mode parameter.
-   </para>
-  </note>
-  <note>
-   <para>
-    If <parameter>handle</parameter> was <function>fopen</function>ed in
-    append mode, <function>fwrite</function>s are atomic (unless the size of
-    <parameter>string</parameter> exceeds the filesystem's block size, on some
-    platforms, and as long as the file is on a local filesystem). That is,
-    there is no need to <function>flock</function> a resource before calling
-    <function>fwrite</function>; all of the data will be written without
-    interruption.
-   </para>
-  </note>
-  <note>
-   <para>
-    If writing twice to the file pointer, then the data will be appended to 
-    the end of the file content:
-        <programlisting role="php">
-<![CDATA[
-<?php
-$fp = fopen('data.txt', 'w');
-fwrite($fp, '1');
-fwrite($fp, '23');
-fclose($fp);
-
-// the content of 'data.txt' is now 123 and not 23!
-?>
-]]>
-        </programlisting>
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -173,6 +104,68 @@ if (is_writable($filename)) {
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Writing to a network stream may end before the whole string is written.
+    Return value of <function>fwrite</function> may be checked:
+    <programlisting role="php">
+     <![CDATA[
+<?php
+function fwrite_stream($fp, $string) {
+    for ($written = 0; $written < strlen($string); $written += $fwrite) {
+        $fwrite = fwrite($fp, substr($string, $written));
+        if ($fwrite === false) {
+            return $written;
+        }
+    }
+    return $written;
+}
+?>
+]]>
+    </programlisting>
+   </para>
+  </note>
+
+  <note>
+   <para>
+    On systems which differentiate between binary and text files
+    (i.e. Windows) the file must be opened with 'b' included in
+    <function>fopen</function> mode parameter.
+   </para>
+  </note>
+  <note>
+   <para>
+    If <parameter>handle</parameter> was <function>fopen</function>ed in
+    append mode, <function>fwrite</function>s are atomic (unless the size of
+    <parameter>string</parameter> exceeds the filesystem's block size, on some
+    platforms, and as long as the file is on a local filesystem). That is,
+    there is no need to <function>flock</function> a resource before calling
+    <function>fwrite</function>; all of the data will be written without
+    interruption.
+   </para>
+  </note>
+  <note>
+   <para>
+    If writing twice to the file pointer, then the data will be appended to
+    the end of the file content:
+    <programlisting role="php">
+     <![CDATA[
+<?php
+$fp = fopen('data.txt', 'w');
+fwrite($fp, '1');
+fwrite($fp, '23');
+fclose($fp);
+
+// the content of 'data.txt' is now 123 and not 23!
+?>
+]]>
+    </programlisting>
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/filesystem/functions/is-dir.xml b/reference/filesystem/functions/is-dir.xml
index fd557caf8c..8657c1a1fd 100644
--- a/reference/filesystem/functions/is-dir.xml
+++ b/reference/filesystem/functions/is-dir.xml
@@ -46,6 +46,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -73,11 +78,6 @@ bool(true)
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/is-executable.xml b/reference/filesystem/functions/is-executable.xml
index 2edf1f49b5..75c6518567 100644
--- a/reference/filesystem/functions/is-executable.xml
+++ b/reference/filesystem/functions/is-executable.xml
@@ -41,6 +41,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -65,11 +70,6 @@ if (is_executable($file)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/is-file.xml b/reference/filesystem/functions/is-file.xml
index 426e4a5d46..5c578ac02d 100644
--- a/reference/filesystem/functions/is-file.xml
+++ b/reference/filesystem/functions/is-file.xml
@@ -42,6 +42,11 @@
   &fs.file.32bit;
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -66,11 +71,6 @@ bool(false)
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/is-link.xml b/reference/filesystem/functions/is-link.xml
index 6e0cb851f6..e97dc083ac 100644
--- a/reference/filesystem/functions/is-link.xml
+++ b/reference/filesystem/functions/is-link.xml
@@ -41,6 +41,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -63,11 +68,6 @@ if (is_link($link)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/is-readable.xml b/reference/filesystem/functions/is-readable.xml
index 17f1f37c77..375790ed1e 100644
--- a/reference/filesystem/functions/is-readable.xml
+++ b/reference/filesystem/functions/is-readable.xml
@@ -41,6 +41,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -62,17 +67,11 @@ if (is_readable($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   <para>
    Keep in mind that PHP may be accessing the file as the user
-   id that the web server runs as (often 'nobody'). Safe mode
-   limitations are not taken into account before PHP 5.1.5.
+   id that the web server runs as (often 'nobody').
   </para>
   &note.clearstatcache;
   &tip.fopen-wrapper.stat;
diff --git a/reference/filesystem/functions/is-writable.xml b/reference/filesystem/functions/is-writable.xml
index 423005626f..7eac0d6ed5 100644
--- a/reference/filesystem/functions/is-writable.xml
+++ b/reference/filesystem/functions/is-writable.xml
@@ -48,6 +48,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -69,11 +74,6 @@ if (is_writable($filename)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   
diff --git a/reference/filesystem/functions/lstat.xml b/reference/filesystem/functions/lstat.xml
index 2e6ecc74a6..3c3b6561fa 100644
--- a/reference/filesystem/functions/lstat.xml
+++ b/reference/filesystem/functions/lstat.xml
@@ -49,6 +49,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &fs.emits.warning.on.failure;
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -86,11 +91,6 @@ Array
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  &fs.emits.warning.on.failure;
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   &note.clearstatcache;
diff --git a/reference/filesystem/functions/mkdir.xml b/reference/filesystem/functions/mkdir.xml
index f188296c1d..230204e1e2 100644
--- a/reference/filesystem/functions/mkdir.xml
+++ b/reference/filesystem/functions/mkdir.xml
@@ -10,13 +10,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>mkdir</methodname>
-   <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0777</initializer></methodparam>
+   <methodparam><type>string</type><parameter>directory</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>permissions</parameter><initializer>0777</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&false;</initializer></methodparam>
    <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Attempts to create the directory specified by pathname. 
+   Attempts to create the directory specified by <parameter>directory</parameter>.
   </para>
  </refsect1>
 
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>pathname</parameter></term>
+     <term><parameter>directory</parameter></term>
      <listitem>
       <para>
        The directory path.
@@ -33,21 +33,21 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode</parameter></term>
+     <term><parameter>permissions</parameter></term>
      <listitem>
       <para>
-       The mode is 0777 by default, which means the widest possible
-       access. For more information on modes, read the details
+       The permissions are 0777 by default, which means the widest possible
+       access. For more information on permissions, read the details
        on the <function>chmod</function> page.
       </para>
       <note>
        <para>
-        <parameter>mode</parameter> is ignored on Windows.
+        <parameter>permissions</parameter> is ignored on Windows.
        </para>
       </note>
       <para>
-       Note that you probably want to specify the mode as an octal number,
-       which means it should have a leading zero. The mode is also modified
+       Note that you probably want to specify the <parameter>permissions</parameter> as an octal number,
+       which means it should have a leading zero. The <parameter>permissions</parameter> is also modified
        by the current umask, which you can change using
        <function>umask</function>.
       </para>
@@ -58,7 +58,7 @@
      <listitem>
       <para>
        Allows the creation of nested directories specified in the 
-       <parameter>pathname</parameter>.
+       <parameter>directory</parameter>.
       </para>
      </listitem>
     </varlistentry>
@@ -79,6 +79,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Emits an <constant>E_WARNING</constant> level error if the directory
+   already exists.
+  </para>
+  <para>
+   Emits an <constant>E_WARNING</constant> level error if the relevant
+   permissions prevent creating the directory.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -99,14 +111,14 @@ mkdir("/path/to/my/dir", 0700);
     <programlisting role="php">
 <![CDATA[
 <?php
-// Desired folder structure
+// Desired directory structure
 $structure = './depth1/depth2/depth3/';
 
 // To create the nested structure, the $recursive parameter 
 // to mkdir() must be specified.
 
 if (!mkdir($structure, 0777, true)) {
-    die('Failed to create folders...');
+    die('Failed to create directories...');
 }
 
 // ...
@@ -117,18 +129,6 @@ if (!mkdir($structure, 0777, true)) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Emits an <constant>E_WARNING</constant> level error if the directory
-   already exists.
-  </para>
-  <para>
-   Emits an <constant>E_WARNING</constant> level error if the relevant
-   permissions prevent creating the directory.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/filesystem/functions/parse-ini-file.xml b/reference/filesystem/functions/parse-ini-file.xml
index ce592c3ac5..b0b5fe3a68 100644
--- a/reference/filesystem/functions/parse-ini-file.xml
+++ b/reference/filesystem/functions/parse-ini-file.xml
@@ -203,8 +203,7 @@ function yesno($expression)
     return($expression ? 'Yes' : 'No');
 }
 
-// Get the path to php.ini using the php_ini_loaded_file() 
-// function available as of PHP 5.2.4
+// Get the path to php.ini using the php_ini_loaded_file() function
 $ini_path = php_ini_loaded_file();
 
 // Parse php.ini
@@ -296,7 +295,7 @@ also_five = ${five}
     Values <literal>null</literal>, <literal>off</literal>, <literal>no</literal> and
     <literal>false</literal> result in <literal>""</literal>, and values
     <literal>on</literal>, <literal>yes</literal> and <literal>true</literal> result
-    in <literal>"1"</literal>, unless <constant>INI_SCANNER_TYPED</constant> mode is used (as of PHP 5.6.1).
+    in <literal>"1"</literal>, unless <constant>INI_SCANNER_TYPED</constant> mode is used.
     Characters <literal>?{}|&amp;~!()^"</literal> must not be used anywhere in
     the key and have a special meaning in the value.
    </simpara>
diff --git a/reference/filesystem/functions/pathinfo.xml b/reference/filesystem/functions/pathinfo.xml
index 403fd7b157..da328a319f 100644
--- a/reference/filesystem/functions/pathinfo.xml
+++ b/reference/filesystem/functions/pathinfo.xml
@@ -25,6 +25,13 @@
     predefined reserved variables</link>.
    </para>
   </note>
+  <note>
+   <para>
+    <function>pathinfo</function> operates naively on the input string,
+    and is not aware of the actual filesystem, or path components such
+    as "<literal>..</literal>".
+   </para>
+  </note>
   <caution>
    <para>
     <function>pathinfo</function> is locale aware, so for it to parse a path
@@ -116,7 +123,7 @@ $path_parts = pathinfo('/www/htdocs/inc/lib.inc.php');
 echo $path_parts['dirname'], "\n";
 echo $path_parts['basename'], "\n";
 echo $path_parts['extension'], "\n";
-echo $path_parts['filename'], "\n"; // since PHP 5.2.0
+echo $path_parts['filename'], "\n";
 ?>
 ]]>
     </programlisting>
diff --git a/reference/filesystem/functions/realpath-cache-get.xml b/reference/filesystem/functions/realpath-cache-get.xml
index e9e0839bac..64a0b0d3e4 100644
--- a/reference/filesystem/functions/realpath-cache-get.xml
+++ b/reference/filesystem/functions/realpath-cache-get.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/filesystem/functions/realpath-cache-size.xml b/reference/filesystem/functions/realpath-cache-size.xml
index c65c6a8a36..a14d8bfc48 100644
--- a/reference/filesystem/functions/realpath-cache-size.xml
+++ b/reference/filesystem/functions/realpath-cache-size.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/filesystem/functions/rmdir.xml b/reference/filesystem/functions/rmdir.xml
index d5e82d332f..8e51b21a64 100644
--- a/reference/filesystem/functions/rmdir.xml
+++ b/reference/filesystem/functions/rmdir.xml
@@ -10,11 +10,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>rmdir</methodname>
-   <methodparam><type>string</type><parameter>dirname</parameter></methodparam>
+   <methodparam><type>string</type><parameter>directory</parameter></methodparam>
    <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Attempts to remove the directory named by <parameter>dirname</parameter>.
+   Attempts to remove the directory named by <parameter>directory</parameter>.
    The directory must be empty, and the relevant permissions must permit this.
    A <constant>E_WARNING</constant> level error will be generated on failure.
   </para>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>dirname</parameter></term>
+     <term><parameter>directory</parameter></term>
      <listitem>
       <para>
        Path to the directory.
diff --git a/reference/filesystem/functions/stat.xml b/reference/filesystem/functions/stat.xml
index 02f9764262..6e3bbd5e7a 100644
--- a/reference/filesystem/functions/stat.xml
+++ b/reference/filesystem/functions/stat.xml
@@ -70,7 +70,7 @@
       <row>
        <entry>2</entry>
        <entry>mode</entry>
-       <entry>inode protection mode</entry>
+       <entry>inode protection mode *****</entry>
       </row>
       <row>
        <entry>3</entry>
@@ -145,6 +145,11 @@
    which is a 64-bit <emphasis>unsigned</emphasis> integer, so may overflow.
    Previously, it was always <literal>0</literal>.
   </para>
+  <para>
+   ***** On Windows, the writable permission bit is set according to the read-only
+   file attribute, and the same value is reported for all users, group and owner.
+   The ACL is not taken into account, contrary to <function>is_writable</function>.
+  </para>
   <para>
   The value of <literal>mode</literal> contains information read by several functions. 
   When written in octal, starting from the right, the first three digits are returned by
diff --git a/reference/filesystem/functions/tmpfile.xml b/reference/filesystem/functions/tmpfile.xml
index ca3c9ba262..ee559e993c 100644
--- a/reference/filesystem/functions/tmpfile.xml
+++ b/reference/filesystem/functions/tmpfile.xml
@@ -29,6 +29,11 @@
   </caution>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/filesystem/functions/touch.xml b/reference/filesystem/functions/touch.xml
index 0d91f6095a..9cb0c9fa5e 100644
--- a/reference/filesystem/functions/touch.xml
+++ b/reference/filesystem/functions/touch.xml
@@ -112,12 +112,6 @@ if (!touch('some_file.txt', $time)) {
  <refsect1 role="notes">
   &reftitle.notes;
   &note.filesystem-time-res;
-  <warning>
-   <para>
-    Prior to PHP 5.3.0 it was not possible to change the modification time 
-    of a directory with this function under Windows.
-   </para>
-  </warning>
  </refsect1>
  
 </refentry>
diff --git a/reference/filesystem/ini.xml b/reference/filesystem/ini.xml
index f36d265143..0b480bd107 100644
--- a/reference/filesystem/ini.xml
+++ b/reference/filesystem/ini.xml
@@ -26,7 +26,7 @@
       <entry><link linkend="ini.allow-url-include">allow_url_include</link></entry>
       <entry>"0"</entry>
       <entry>PHP_INI_SYSTEM</entry>
-      <entry>Available since PHP 5.2.0. Deprecated as of PHP 7.4.0.</entry>
+      <entry>Deprecated as of PHP 7.4.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.user-agent">user_agent</link></entry>
@@ -56,7 +56,7 @@
       <entry><link linkend="ini.sys-temp-dir">sys_temp_dir</link></entry>
       <entry>""</entry>
       <entry>PHP_INI_SYSTEM</entry>
-      <entry>Available since PHP 5.5.0.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/filter/configure.xml b/reference/filter/configure.xml
index f3400942d8..1ee2e82213 100644
--- a/reference/filter/configure.xml
+++ b/reference/filter/configure.xml
@@ -3,12 +3,8 @@
 <section xml:id="filter.installation" xmlns="http://docbook.org/ns/docbook">
  &reftitle.install;
  <para>
-  The filter extension is enabled by default as of PHP 5.2.0.
+  The filter extension is enabled by default.
   To disable the filter extension, use <option role="configure">--disable-filter</option>.
- </para> 
- <para> 
-  Before PHP 5.2 an experimental PECL extension was used, however, the PECL version
-  is no longer recommended or updated.
  </para>
 </section>
 
diff --git a/reference/filter/constants.xml b/reference/filter/constants.xml
index 669e71730f..82beb19e09 100644
--- a/reference/filter/constants.xml
+++ b/reference/filter/constants.xml
@@ -150,6 +150,17 @@
     </simpara>
    </listitem>
   </varlistentry>
+  <varlistentry xml:id="constant.filter-validate-bool">
+   <term>
+    <constant>FILTER_VALIDATE_BOOL</constant>
+     (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Alias of <constant>FILTER_VALIDATE_BOOLEAN</constant>.
+    </simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry xml:id="constant.filter-validate-boolean">
    <term>
     <constant>FILTER_VALIDATE_BOOLEAN</constant>
@@ -236,7 +247,6 @@
    <listitem>
     <simpara>
      ID of "validate_mac_address" filter.
-     (Available as of PHP 5.5.0)
     </simpara>
    </listitem>
   </varlistentry>
@@ -359,7 +369,9 @@
    <listitem>
     <simpara>
      ID of "magic_quotes" filter.
-     (Deprecated per PHP 7.3.0, use FILTER_SANITIZE_ADD_SLASHES instead.)
+     (<emphasis>DEPRECATED</emphasis> as of PHP 7.3.0 and
+     <emphasis>REMOVED</emphasis> as of  PHP 8.0.0,
+     use <constant>FILTER_SANITIZE_ADD_SLASHES</constant> instead.)
     </simpara>
    </listitem>
   </varlistentry>
@@ -438,7 +450,6 @@
    <listitem>
     <simpara>
      Strips backtick characters.
-     (Available as of PHP 5.3.2)
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/filter/filters.xml b/reference/filter/filters.xml
index fb90bfe713..8f87672f34 100644
--- a/reference/filter/filters.xml
+++ b/reference/filter/filters.xml
@@ -21,7 +21,10 @@
       </thead>
       <tbody>
        <row>
-        <entry><constant>FILTER_VALIDATE_BOOLEAN</constant></entry>
+        <entry>
+         <constant>FILTER_VALIDATE_BOOLEAN</constant>,
+         <constant>FILTER_VALIDATE_BOOL</constant>
+        </entry>
         <entry>"boolean"</entry>
         <entry>
          <parameter>default</parameter>
@@ -48,7 +51,8 @@
          <parameter>default</parameter>
         </entry>
         <entry>
-         <constant>FILTER_FLAG_HOSTNAME</constant>
+         <constant>FILTER_FLAG_HOSTNAME</constant>,
+         <constant>FILTER_NULL_ON_FAILURE</constant>
         </entry>
         <entry>
          <para>
@@ -71,15 +75,16 @@
          <parameter>default</parameter>
         </entry>
         <entry>
-         <constant>FILTER_FLAG_EMAIL_UNICODE</constant>
+         <constant>FILTER_FLAG_EMAIL_UNICODE</constant>,
+         <constant>FILTER_NULL_ON_FAILURE</constant>
         </entry>
         <entry>
          <para>
           Validates whether the value is a valid e-mail address.
          </para>
          <para>
-          In general, this validates e-mail addresses against the syntax in
-          RFC 822, with the exceptions that comments and whitespace folding
+          In general, this validates e-mail addresses against the <literal>addr-spec</literal>syntax in
+          <link xlink:href="&url.rfc;822">RFC 822</link>, with the exceptions that comments and whitespace folding
           and dotless domain names
           are not supported.
          </para>
@@ -95,7 +100,8 @@
          <parameter>max_range</parameter>
         </entry>
         <entry>
-         <constant>FILTER_FLAG_ALLOW_THOUSAND</constant>
+         <constant>FILTER_FLAG_ALLOW_THOUSAND</constant>,
+         <constant>FILTER_NULL_ON_FAILURE</constant>
         </entry>
         <entry>Validates value as float, optionally from the specified range, and converts to float on success.</entry>
        </row>
@@ -109,7 +115,8 @@
         </entry>
         <entry>
          <constant>FILTER_FLAG_ALLOW_OCTAL</constant>,
-         <constant>FILTER_FLAG_ALLOW_HEX</constant>
+         <constant>FILTER_FLAG_ALLOW_HEX</constant>,
+         <constant>FILTER_NULL_ON_FAILURE</constant>
         </entry>
         <entry>Validates value as integer, optionally from the specified range, and converts to int on success.</entry>
        </row>
@@ -123,7 +130,8 @@
          <constant>FILTER_FLAG_IPV4</constant>,
          <constant>FILTER_FLAG_IPV6</constant>,
          <constant>FILTER_FLAG_NO_PRIV_RANGE</constant>,
-         <constant>FILTER_FLAG_NO_RES_RANGE</constant>
+         <constant>FILTER_FLAG_NO_RES_RANGE</constant>,
+         <constant>FILTER_NULL_ON_FAILURE</constant>
         </entry>
         <entry>
          Validates value as IP address, optionally only IPv4 or IPv6 or not
@@ -136,7 +144,9 @@
         <entry>
          <parameter>default</parameter>
         </entry>
-        <entry></entry>
+        <entry>
+         <constant>FILTER_NULL_ON_FAILURE</constant>
+        </entry>
         <entry>Validates value as MAC address.</entry>
        </row>
        <row>
@@ -146,7 +156,9 @@
          <parameter>default</parameter>,
          <parameter>regexp</parameter>
         </entry>
-        <entry></entry>
+        <entry>
+         <constant>FILTER_NULL_ON_FAILURE</constant>
+        </entry>
         <entry>
          Validates value against <parameter>regexp</parameter>, a
          <link linkend="book.pcre">Perl-compatible</link> regular expression.
@@ -162,7 +174,8 @@
          <constant>FILTER_FLAG_SCHEME_REQUIRED</constant>,
          <constant>FILTER_FLAG_HOST_REQUIRED</constant>,
          <constant>FILTER_FLAG_PATH_REQUIRED</constant>,
-         <constant>FILTER_FLAG_QUERY_REQUIRED</constant>
+         <constant>FILTER_FLAG_QUERY_REQUIRED</constant>,
+         <constant>FILTER_NULL_ON_FAILURE</constant>
         </entry>
         <entry>Validates value as URL (according to <link xlink:href="&url.rfc;2396">&url.rfc;2396</link>), optionally with required components. Beware a valid URL may not specify the HTTP protocol <literal>http://</literal> so further validation may be required to determine the URL uses an expected protocol, e.g. <literal>ssh://</literal> or <literal>mailto:</literal>. Note that the function will only find ASCII URLs to be valid; internationalized domain names (containing non-ASCII characters) will fail.</entry>
        </row>
@@ -172,13 +185,8 @@
    </para>
    <note>
     <para>
-     As of PHP 5.4.11, the numbers +0 and -0 validate as both integers as well
-     as floats (using <constant>FILTER_VALIDATE_FLOAT</constant> and
-     <constant>FILTER_VALIDATE_INT</constant>). Before PHP 5.4.11 they only
-     validated as floats (using <constant>FILTER_VALIDATE_FLOAT</constant>).
-    </para>
-    <para>
-     When <parameter>default</parameter> is set to option, <parameter>default</parameter>'s value is used if value is not validated.
+     When <parameter>default</parameter> is set to option,
+     <parameter>default</parameter>'s value is used if value is not validated.
     </para>
    </note>
 
@@ -194,6 +202,13 @@
        </row>
       </thead>
       <tbody>
+       <row>
+        <entry>8.0.0</entry>
+        <entry>
+         Added <constant>FILTER_VALIDATE_BOOL</constant> as an alias for <constant>FILTER_VALIDATE_BOOLEAN</constant>.
+         Using <constant>FILTER_VALIDATE_BOOL</constant> is preferred.
+        </entry>
+       </row>
        <row>
         <entry>7.4.0</entry>
         <entry>
@@ -207,20 +222,6 @@
          Added <constant>FILTER_FLAG_HOSTNAME</constant> and <constant>FILTER_VALIDATE_DOMAIN</constant>.
         </entry>
        </row>
-       <row>
-        <entry>5.5.0</entry>
-        <entry>
-         Added <constant>FILTER_VALIDATE_MAC</constant>.
-        </entry>
-       </row>
-       <row>
-        <entry>5.2.1</entry>
-        <entry>
-         <constant>FILTER_VALIDATE_URL</constant> now implicitly uses
-         <constant>FILTER_FLAG_SCHEME_REQUIRED</constant> and
-         <constant>FILTER_FLAG_HOST_REQUIRED</constant>.
-        </entry>
-       </row>
       </tbody>
      </tgroup>
     </informaltable>
@@ -271,7 +272,18 @@
         <entry><constant>FILTER_SANITIZE_MAGIC_QUOTES</constant></entry>
         <entry>"magic_quotes"</entry>
         <entry></entry>
-        <entry>Apply <function>addslashes</function>.</entry>
+        <entry>
+         Apply <function>addslashes</function>.
+         (<emphasis>DEPRECATED</emphasis> as of PHP 7.3.0 and
+         <emphasis>REMOVED</emphasis> as of  PHP 8.0.0,
+         use <constant>FILTER_SANITIZE_ADD_SLASHES</constant> instead.)
+        </entry>
+       </row>
+       <row>
+        <entry><constant>FILTER_SANITIZE_ADD_SLASHES</constant></entry>
+        <entry>"add_slashes"</entry>
+        <entry></entry>
+        <entry>Apply <function>addslashes</function>. (Available as of PHP 7.3.0)</entry>
        </row>
        <row>
         <entry><constant>FILTER_SANITIZE_NUMBER_FLOAT</constant></entry>
@@ -304,7 +316,7 @@
          <constant>FILTER_FLAG_ENCODE_HIGH</constant>
         </entry>
         <entry>
-         HTML-escape <literal>'"&lt;&gt;&amp;</literal> and characters with
+         HTML-encode <literal>'"&lt;&gt;&amp;</literal> and characters with
          ASCII value less than 32, optionally strip or encode other special
          characters.
         </entry>
@@ -335,7 +347,11 @@
          <constant>FILTER_FLAG_ENCODE_HIGH</constant>,
          <constant>FILTER_FLAG_ENCODE_AMP</constant>
         </entry>
-        <entry>Strip tags, optionally strip or encode special characters.</entry>
+        <entry>
+         Strip tags and HTML-encode double and single quotes, optionally strip
+         or encode special characters. Encoding quotes can be
+         disabled by setting <constant>FILTER_FLAG_NO_ENCODE_QUOTES</constant>.
+        </entry>
        </row>
        <row>
         <entry><constant>FILTER_SANITIZE_STRIPPED</constant></entry>
@@ -403,10 +419,22 @@ filter.default_flags = 0
       </thead>
       <tbody>
        <row>
-        <entry>5.2.11/5.3.1</entry>
+        <entry>8.0.0</entry>
         <entry>
-         Slashes (<literal>/</literal>) are removed by
-         <constant>FILTER_SANITIZE_EMAIL</constant>. Prior they were retained.
+         <constant>FILTER_SANITIZE_MAGIC_QUOTES</constant> has been removed.
+        </entry>
+       </row>
+       <row>
+        <entry>7.3.0</entry>
+        <entry>
+         <constant>FILTER_SANITIZE_ADD_SLASHES</constant> was added as a
+         replacement for <constant>FILTER_SANITIZE_MAGIC_QUOTES</constant>
+        </entry>
+       </row>
+       <row>
+        <entry>7.3.0</entry>
+        <entry>
+         <constant>FILTER_SANITIZE_MAGIC_QUOTES</constant> has been deprecated.
         </entry>
        </row>
       </tbody>
@@ -578,10 +606,10 @@ filter.default_flags = 0
       <row>
        <entry><constant>FILTER_NULL_ON_FAILURE</constant></entry>
        <entry>
-        <constant>FILTER_VALIDATE_BOOLEAN</constant>
+        any <link linkend="filter.filters.validate"><constant>FILTER_VALIDATE_*</constant></link>
        </entry>
        <entry>
-        Returns &null; for unrecognized boolean values.
+        Returns &null; for unrecognized values.
        </entry>
       </row>
       <row>
@@ -666,6 +694,10 @@ filter.default_flags = 0
          <literal>::1/128</literal>, <literal>::/128</literal>,
          <literal>::ffff:0:0/96</literal> and <literal>fe80::/10</literal>.
         </para>
+        <para>
+         These are the ranges that are marked as Reserved-By-Protocol in
+         <link xlink:href="&url.rfc;6890">RFC 6890</link>.
+        </para>
        </entry>
       </row>
       <row>
@@ -759,18 +791,6 @@ filter.default_flags = 0
          <constant>FILTER_FLAG_EMAIL_UNICODE</constant> has been added.
         </entry>
        </row>
-       <row>
-        <entry>5.3.2</entry>
-        <entry>
-         <constant>FILTER_FLAG_STRIP_BACKTICK</constant> has been added.
-        </entry>
-       </row>
-       <row>
-        <entry>5.2.10</entry>
-        <entry>
-         <constant>FILTER_FLAG_NO_RES_RANGE</constant> supports also IPv6 addresses.
-        </entry>
-       </row>
       </tbody>
      </tgroup>
     </informaltable>
diff --git a/reference/filter/functions/filter-list.xml b/reference/filter/functions/filter-list.xml
index 0345c35da6..a6561efa39 100644
--- a/reference/filter/functions/filter-list.xml
+++ b/reference/filter/functions/filter-list.xml
@@ -14,6 +14,12 @@
   </methodsynopsis>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/filter/ini.xml b/reference/filter/ini.xml
index 771943b719..bdac02248c 100644
--- a/reference/filter/ini.xml
+++ b/reference/filter/ini.xml
@@ -20,13 +20,13 @@
       <entry><link linkend="ini.filter.default">filter.default</link></entry>
       <entry>"unsafe_raw"</entry>
       <entry>PHP_INI_PERDIR</entry>
-      <entry>PHP_INI_ALL in filter &lt;= 0.9.4. Available since PHP 5.2.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.filter.default-flags">filter.default_flags</link></entry>
       <entry>NULL</entry>
       <entry>PHP_INI_PERDIR</entry>
-      <entry>PHP_INI_ALL in filter &lt;= 0.9.4. Available since PHP 5.2.0.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/fpm/book.xml b/reference/fpm/book.xml
index 0748549b12..613b36d31e 100644
--- a/reference/fpm/book.xml
+++ b/reference/fpm/book.xml
@@ -12,7 +12,7 @@
    with some additional features (mostly) useful for heavy-loaded sites.
   </para>
   <para>
-   This SAPI is bundled with PHP 5.3.3 and later.
+   This SAPI is bundled with PHP.
   </para>
  </preface>
 
diff --git a/reference/fpm/functions/fastcgi-finish-request.xml b/reference/fpm/functions/fastcgi-finish-request.xml
index 683b4167ea..04e9c38153 100644
--- a/reference/fpm/functions/fastcgi-finish-request.xml
+++ b/reference/fpm/functions/fastcgi-finish-request.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/ftp/configure.xml b/reference/ftp/configure.xml
index 81cf5789e2..a386e6bf12 100644
--- a/reference/ftp/configure.xml
+++ b/reference/ftp/configure.xml
@@ -8,11 +8,7 @@
   installing PHP.
  </para>
  <para>
-  The Windows version of PHP 5 has built-in support for this extension. You do
-  not need to load any additional extensions in order to use these functions.
- </para>
- <para>
-  As of PHP 7.0.0 on Windows this extension is always built as shared extension
+  On Windows this extension is always built as shared extension
   and as such has to be enabled in &php.ini;.
  </para>
 </section>
diff --git a/reference/ftp/constants.xml b/reference/ftp/constants.xml
index 629feaafda..b9f3701c15 100644
--- a/reference/ftp/constants.xml
+++ b/reference/ftp/constants.xml
@@ -115,7 +115,6 @@
    <listitem>
     <para>
      See <function>ftp_set_option</function> for information.
-     Available as of PHP 5.6.0.
     </para>
    </listitem>
   </varlistentry>
diff --git a/reference/funchand/functions/call-user-func-array.xml b/reference/funchand/functions/call-user-func-array.xml
index 2d54fb6c74..e3ff3e274c 100644
--- a/reference/funchand/functions/call-user-func-array.xml
+++ b/reference/funchand/functions/call-user-func-array.xml
@@ -99,10 +99,8 @@ class Foo {
     }
 }
 
-// As of PHP 5.3.0
 call_user_func_array(__NAMESPACE__ .'\Foo::test', array('Hannes'));
 
-// As of PHP 5.3.0
 call_user_func_array(array(__NAMESPACE__ .'\Foo', 'test'), array('Philip'));
 
 ?>
@@ -126,7 +124,7 @@ $func = function($arg1, $arg2) {
     return $arg1 * $arg2;
 };
 
-var_dump(call_user_func_array($func, array(2, 4))); /* As of PHP 5.3.0 */
+var_dump(call_user_func_array($func, array(2, 4)));
 
 ?>
 ]]>
@@ -168,24 +166,6 @@ global $bar=55
 
  <refsect1 role="notes">
   &reftitle.notes;
-  <note>
-   <para>
-    Before PHP 5.4, referenced variables in <parameter>args</parameter>
-    are passed to the function by reference, regardless of whether the function
-    expects the respective parameter to be passed by reference. This form of
-    call-time pass by reference does not emit a deprecation notice, but it is
-    nonetheless deprecated, and has been removed in PHP 5.4.
-    Furthermore, this does not apply to internal functions, for which
-    the function signature is honored. Passing by value when the function
-    expects a parameter by reference results in a warning and having
-    <function>call_user_func</function> return &false; (there is, however, an
-    exception for passed values with reference count = 1, such as in literals,
-    as these can be turned into references without ill effects — but also
-    without writes to that value having any effect —; do not rely
-    in this behavior, though, as the reference count is an implementation
-    detail and the soundness of this behavior is questionable).
-   </para>
-  </note>
   &note.func-callback-exceptions;
  </refsect1>
 
diff --git a/reference/funchand/functions/call-user-func.xml b/reference/funchand/functions/call-user-func.xml
index 0a553e0ddd..608452babb 100644
--- a/reference/funchand/functions/call-user-func.xml
+++ b/reference/funchand/functions/call-user-func.xml
@@ -125,8 +125,8 @@ class Foo {
     }
 }
 
-call_user_func(__NAMESPACE__ .'\Foo::test'); // As of PHP 5.3.0
-call_user_func(array(__NAMESPACE__ .'\Foo', 'test')); // As of PHP 5.3.0
+call_user_func(__NAMESPACE__ .'\Foo::test');
+call_user_func(array(__NAMESPACE__ .'\Foo', 'test'));
 
 ?>
 ]]>
@@ -155,7 +155,7 @@ class myclass {
 $classname = "myclass";
 
 call_user_func(array($classname, 'say_hello'));
-call_user_func($classname .'::say_hello'); // As of 5.2.3
+call_user_func($classname .'::say_hello');
 
 $myobject = new myclass();
 
@@ -178,7 +178,7 @@ Hello!
     <programlisting role="php">
 <![CDATA[
 <?php
-call_user_func(function($arg) { print "[$arg]\n"; }, 'test'); /* As of PHP 5.3.0 */
+call_user_func(function($arg) { print "[$arg]\n"; }, 'test');
 ?>
 ]]>
     </programlisting>
diff --git a/reference/funchand/functions/create-function.xml b/reference/funchand/functions/create-function.xml
index 6f85c9a595..e68786033c 100644
--- a/reference/funchand/functions/create-function.xml
+++ b/reference/funchand/functions/create-function.xml
@@ -28,7 +28,7 @@
     and memory usage characteristics.
    </para>
    <para>
-    If you are using PHP 5.3.0 or newer a native
+    A native
     <link linkend="functions.anonymous">anonymous function</link> should be used instead.
    </para>
   </caution>
diff --git a/reference/funchand/functions/func-get-arg.xml b/reference/funchand/functions/func-get-arg.xml
index ec83247a56..3e55ab2bb8 100644
--- a/reference/funchand/functions/func-get-arg.xml
+++ b/reference/funchand/functions/func-get-arg.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>mixed</type><methodname>func_get_arg</methodname>
-   <methodparam><type>int</type><parameter>arg_num</parameter></methodparam>
+   <methodparam><type>int</type><parameter>position</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the specified argument from a user-defined function's argument list.
@@ -27,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>arg_num</parameter></term>
+     <term><parameter>position</parameter></term>
      <listitem>
       <para>
        The argument offset. Function arguments are counted starting from
@@ -50,7 +50,7 @@
   &reftitle.errors;
   <para>
    Generates a warning if called from outside of a user-defined function, or
-   if <parameter>arg_num</parameter> is greater than the number of arguments
+   if <parameter>position</parameter> is greater than the number of arguments
    actually passed.
   </para>
  </refsect1>
@@ -81,50 +81,6 @@ foo(1, 2, 3);
 <![CDATA[
 Number of arguments: 3
 Second argument is: 2
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title><function>func_get_arg</function> example before and
-    after PHP 5.3</title>
-    <programlisting role="php">
-<![CDATA[
-test.php
-<?php
-function foo() {
-    include './fga.inc';
-}
-
-foo('First arg', 'Second arg');
-?>
-
-fga.inc
-<?php
-
-$arg = func_get_arg(1);
-var_export($arg);
-
-?>
-]]>
-    </programlisting>
-    <para>
-     Output previous to PHP 5.3:
-    </para>
-    <screen>
-<![CDATA[
-'Second arg'
-]]>
-    </screen>
-    <para>
-     Output in PHP 5.3 and later:
-    </para>
-    <screen>
-<![CDATA[
-Warning: func_get_arg():  Called from the global scope - no function
-context in /home/torben/Desktop/code/ml/fga.inc on line 3
-false
 ]]>
     </screen>
    </example>
@@ -154,18 +110,11 @@ byRef($arg);
 ?>
 ]]>
     </programlisting>
-    &example.outputs.7;
+    &example.outputs;
     <screen>
 As passed     : 'bar'
 After change  : 'baz'
 As passed     : 'bar'
-After change  : 'baz'
-    </screen>
-    &example.outputs.5;
-    <screen>
-As passed     : 'bar'
-After change  : 'bar'
-As passed     : 'bar'
 After change  : 'baz'
     </screen>
    </example>
@@ -175,7 +124,6 @@ After change  : 'baz'
 
  <refsect1 role="notes">
   &reftitle.notes;
-  &note.funcnoparam;
   &note.funcbyref;
   <note>
    <simpara>
@@ -189,7 +137,7 @@ After change  : 'baz'
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><link linkend="functions.variable-arg-list"><literal>...</literal> syntax in PHP 5.6+</link></member>
+    <member><link linkend="functions.variable-arg-list"><literal>...</literal> syntax</link></member>
     <member><function>func_get_args</function></member>
     <member><function>func_num_args</function></member>
    </simplelist>
@@ -197,7 +145,6 @@ After change  : 'baz'
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/funchand/functions/func-get-args.xml b/reference/funchand/functions/func-get-args.xml
index 4b5b28bfd5..3b8790ce67 100644
--- a/reference/funchand/functions/func-get-args.xml
+++ b/reference/funchand/functions/func-get-args.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -74,53 +79,7 @@ Argument 2 is: 3
     </screen>
    </example>
   </para>
-  <para>
-   <example>
-    <title><function>func_get_args</function> example before and
-    after PHP 5.3</title>
-    <programlisting role="php">
-<![CDATA[
-test.php
-<?php
-function foo() {
-    include './fga.inc';
-}
 
-foo('First arg', 'Second arg');
-?>
-
-fga.inc
-<?php
-
-$args = func_get_args();
-var_export($args);
-
-?>
-]]>
-    </programlisting>
-    <para>
-     Output previous to PHP 5.3:
-    </para>
-    <screen>
-<![CDATA[
-array (
-  0 => 'First arg',
-  1 => 'Second arg',
-)
-]]>
-    </screen>
-    <para>
-     Output in PHP 5.3 and later:
-    </para>
-    <screen>
-<![CDATA[
-Warning: func_get_args():  Called from the global scope - no function
-context in /home/torben/Desktop/code/ml/fga.inc on line 3
-false
-]]>
-    </screen>
-   </example>
-  </para>
   <para>
    <example>
     <title><function>func_get_args</function> example of byref and byval arguments</title>
@@ -145,7 +104,7 @@ byRef($arg);
 ?>
 ]]>
     </programlisting>
-    &example.outputs.7;
+    &example.outputs;
     <screen>
 As passed     : array (
   0 => 'bar',
@@ -156,21 +115,6 @@ After change  : array (
 As passed     : array (
   0 => 'bar',
 )
-After change  : array (
-  0 => 'baz',
-)
-    </screen>
-    &example.outputs.5;
-    <screen>
-As passed     : array (
-  0 => 'bar',
-)
-After change  : array (
-  0 => 'bar',
-)
-As passed     : array (
-  0 => 'bar',
-)
 After change  : array (
   0 => 'baz',
 )
@@ -182,7 +126,6 @@ After change  : array (
 
  <refsect1 role="notes">
   &reftitle.notes;
-  &note.funcnoparam;
   &note.funcbyref;
   <note>
    <simpara>
@@ -196,7 +139,7 @@ After change  : array (
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><link linkend="functions.variable-arg-list"><literal>...</literal> syntax in PHP 5.6+</link></member>
+    <member><link linkend="functions.variable-arg-list"><literal>...</literal> syntax</link></member>
     <member><function>func_get_arg</function></member>
     <member><function>func_num_args</function></member>
     <member><methodname>ReflectionFunctionAbstract::getParameters</methodname></member>
diff --git a/reference/funchand/functions/func-num-args.xml b/reference/funchand/functions/func-num-args.xml
index 239c2f41ad..fffb606179 100644
--- a/reference/funchand/functions/func-num-args.xml
+++ b/reference/funchand/functions/func-num-args.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -63,62 +68,13 @@ Number of arguments: 3
     </screen>
    </example>
   </para>
-  <para>
-   <example>
-    <title><function>func_num_args</function> example before and
-    after PHP 5.3</title>
-    <programlisting role="php">
-<![CDATA[
-test.php
-<?php
-function foo() {
-    include './fna.php';
-}
-
-foo('First arg', 'Second arg');
-?>
-
-fna.php
-<?php
-
-$num_args = func_num_args();
-var_export($num_args);
-
-?>
-]]>
-    </programlisting>
-    <para>
-     Output previous to PHP 5.3:
-    </para>
-    <screen>
-<![CDATA[
-2
-]]>
-    </screen>
-    <para>
-     Output in PHP 5.3 and later will be something similar to:
-    </para>
-    <screen>
-<![CDATA[
-Warning: func_num_args():  Called from the global scope - no function
-context in /home/torben/Desktop/code/ml/fna.php on line 3
--1
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.funcnoparam;
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><link linkend="functions.variable-arg-list"><literal>...</literal> syntax in PHP 5.6+</link></member>
+    <member><link linkend="functions.variable-arg-list"><literal>...</literal> syntax</link></member>
     <member><function>func_get_arg</function></member>
     <member><function>func_get_args</function></member>
     <member><methodname>ReflectionFunctionAbstract::getNumberOfParameters</methodname></member>
diff --git a/reference/funchand/functions/function-exists.xml b/reference/funchand/functions/function-exists.xml
index 73a0df14aa..ec8f8a11d3 100644
--- a/reference/funchand/functions/function-exists.xml
+++ b/reference/funchand/functions/function-exists.xml
@@ -10,11 +10,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>function_exists</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>function</parameter></methodparam>
   </methodsynopsis>
   <para>
    Checks the list of defined functions, both built-in (internal) and
-   user-defined, for <parameter>function_name</parameter>. 
+   user-defined, for <parameter>function</parameter>. 
   </para>
  </refsect1>
 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>function_name</parameter></term>
+     <term><parameter>function</parameter></term>
      <listitem>
       <para>
        The function name, as a string.
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if <parameter>function_name</parameter> exists and is a
+   Returns &true; if <parameter>function</parameter> exists and is a
    function, &false; otherwise.
   </para>
   <note>
@@ -73,8 +73,7 @@ if (function_exists('imap_open')) {
   <note>
    <para>
     A function name may exist even if the function itself is unusable due to
-    configuration or compiling options (with the <link
-    linkend="ref.image">image</link> functions being an example).
+    configuration or compiling options (with the <link linkend="ref.image">image</link> functions being an example).
    </para>
   </note>
  </refsect1>
@@ -93,7 +92,6 @@ if (function_exists('imap_open')) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/funchand/functions/get-defined-functions.xml b/reference/funchand/functions/get-defined-functions.xml
index 2c292137d2..0a6e9151bf 100644
--- a/reference/funchand/functions/get-defined-functions.xml
+++ b/reference/funchand/functions/get-defined-functions.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>get_defined_functions</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>exclude_disabled</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>exclude_disabled</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Gets an array of all defined functions.
@@ -53,6 +53,13 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The default value of the <parameter>exclude_disabled</parameter> parameter
+       has been changed from &false; to &true;.
+      </entry>
+     </row>
      <row>
       <entry>7.0.15, 7.1.1</entry>
       <entry>
@@ -127,7 +134,6 @@ Array
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/funchand/functions/register-tick-function.xml b/reference/funchand/functions/register-tick-function.xml
index 3c7185a57e..812a2d20c6 100644
--- a/reference/funchand/functions/register-tick-function.xml
+++ b/reference/funchand/functions/register-tick-function.xml
@@ -72,16 +72,6 @@ register_tick_function(array(&$object, 'my_method'), true);
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    <function>register_tick_function</function> should not be used with
-    threaded web server modules with PHP 5.2 or lower.
-   </para>
-  </warning>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/gearman/book.xml b/reference/gearman/book.xml
index fcb2843d08..d283730475 100644
--- a/reference/gearman/book.xml
+++ b/reference/gearman/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.gearman" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Gearman</title>
  <titleabbrev>Gearman</titleabbrev>
 
diff --git a/reference/gender/book.xml b/reference/gender/book.xml
index fd23e8933c..f71f6a8caa 100644
--- a/reference/gender/book.xml
+++ b/reference/gender/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.gender" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Determine gender of firstnames</title>
  <titleabbrev>Gender</titleabbrev>
 
diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml
index ce81383a72..9cd3a2e33b 100644
--- a/reference/geoip/book.xml
+++ b/reference/geoip/book.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <book xml:id="book.geoip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Geo IP Location</title>
  <titleabbrev>GeoIP</titleabbrev>
 
@@ -45,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml
index ea7c3594bd..4144e61bae 100644
--- a/reference/geoip/functions/geoip-db-get-all-info.xml
+++ b/reference/geoip/functions/geoip-db-get-all-info.xml
@@ -47,6 +47,12 @@
   </para>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/gettext/functions/bindtextdomain.xml b/reference/gettext/functions/bindtextdomain.xml
index bac3a5fc17..2fbecd2d0e 100644
--- a/reference/gettext/functions/bindtextdomain.xml
+++ b/reference/gettext/functions/bindtextdomain.xml
@@ -36,6 +36,7 @@
      <listitem>
       <para>
        The directory path.
+       An empty string means the current directory.
        If &null;, the currently set directory is returned.
       </para>
      </listitem>
diff --git a/reference/gmagick/book.xml b/reference/gmagick/book.xml
index 5625069e72..6865a38395 100644
--- a/reference/gmagick/book.xml
+++ b/reference/gmagick/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.gmagick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Gmagick</title>
  <titleabbrev>Gmagick</titleabbrev>
 
diff --git a/reference/gmagick/constants.xml b/reference/gmagick/constants.xml
index 9a6a07703d..047d80486a 100644
--- a/reference/gmagick/constants.xml
+++ b/reference/gmagick/constants.xml
@@ -3029,6 +3029,75 @@
    <listitem>
     <simpara>
      
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
+ <variablelist xml:id="gmagick.constants.interlace">
+  <title>Interlace constants</title>
+  <varlistentry xml:id="gmagick.constants.interlace-undefined">
+   <term>
+    <constant>Gmagick::INTERLACE_UNDEFINED</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="gmagick.constants.interlace-no">
+   <term>
+    <constant>Gmagick::INTERLACE_NO</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="gmagick.constants.interlace-none">
+   <term>
+    <constant>Gmagick::INTERLACE_NONE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="gmagick.constants.interlace-line">
+   <term>
+    <constant>Gmagick::INTERLACE_LINE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="gmagick.constants.interlace-plane">
+   <term>
+    <constant>Gmagick::INTERLACE_PLANE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="gmagick.constants.interlace-partition">
+   <term>
+    <constant>Gmagick::INTERLACE_PARTITION</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/gmagick/gmagick/annotateimage.xml b/reference/gmagick/gmagick/annotateimage.xml
index 3a2e43a190..f4353795e0 100644
--- a/reference/gmagick/gmagick/annotateimage.xml
+++ b/reference/gmagick/gmagick/annotateimage.xml
@@ -30,7 +30,7 @@
      <term><parameter>GmagickDraw</parameter></term>
      <listitem>
       <para>
-       The GmagickDraw object that contains settings for drawing the text 
+       The <classname>GmagickDraw</classname> object that contains settings for drawing the text.
       </para>
      </listitem>
     </varlistentry>
@@ -38,7 +38,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
-       Horizontal offset in pixels to the left of text 
+       Horizontal offset in pixels to the left of text.
       </para>
      </listitem>
     </varlistentry>
@@ -46,7 +46,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
-       Vertical offset in pixels to the baseline of text 
+       Vertical offset in pixels to the baseline of text.
       </para>
      </listitem>
     </varlistentry>
@@ -54,7 +54,7 @@
      <term><parameter>angle</parameter></term>
      <listitem>
       <para>
-       The angle at which to write the text 
+       The angle at which to write the text.
       </para>
      </listitem>
     </varlistentry>
@@ -62,7 +62,7 @@
      <term><parameter>text</parameter></term>
      <listitem>
       <para>
-       The string to draw 
+       The string to draw.
       </para>
      </listitem>
     </varlistentry>
@@ -73,7 +73,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object with annotation made.
+   The <classname>Gmagick</classname> object with annotation made.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/blurimage.xml b/reference/gmagick/gmagick/blurimage.xml
index 3b23dedb54..e5d90869b2 100644
--- a/reference/gmagick/gmagick/blurimage.xml
+++ b/reference/gmagick/gmagick/blurimage.xml
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The blurred Gmagick object
+   The blurred <classname>Gmagick</classname> object
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/borderimage.xml b/reference/gmagick/gmagick/borderimage.xml
index 0c8cfd7fbb..598bb653ff 100644
--- a/reference/gmagick/gmagick/borderimage.xml
+++ b/reference/gmagick/gmagick/borderimage.xml
@@ -16,7 +16,7 @@
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Surrounds the image with a border of the color defined by the bordercolor GmagickPixel object or a color string. 
+   Surrounds the image with a border of the color defined by the bordercolor <classname>GmagickPixel</classname> object or a color string. 
   </para>
  </refsect1>
 
@@ -28,7 +28,7 @@
      <term><parameter>color</parameter></term>
      <listitem>
       <para>
-       GmagickPixel object or a string containing the border color 
+       <classname>GmagickPixel</classname> object or a string containing the border color.
       </para>
      </listitem>
     </varlistentry>
@@ -36,7 +36,7 @@
      <term><parameter>width</parameter></term>
      <listitem>
       <para>
-       Border width 
+       Border width.
       </para>
      </listitem>
     </varlistentry>
@@ -44,7 +44,7 @@
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-       Border height
+       Border height.
       </para>
      </listitem>
     </varlistentry>
@@ -55,7 +55,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object with border defined
+   The <classname>Gmagick</classname> object with border defined.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/charcoalimage.xml b/reference/gmagick/gmagick/charcoalimage.xml
index 0515d7ffd6..93e613104a 100644
--- a/reference/gmagick/gmagick/charcoalimage.xml
+++ b/reference/gmagick/gmagick/charcoalimage.xml
@@ -27,7 +27,7 @@
      <term><parameter>radius</parameter></term>
      <listitem>
       <para>
-       The radius of the Gaussian, in pixels, not counting the center pixel
+       The radius of the Gaussian, in pixels, not counting the center pixel.
       </para>
      </listitem>
     </varlistentry>
@@ -35,7 +35,7 @@
      <term><parameter>sigma</parameter></term>
      <listitem>
       <para>
-       The standard deviation of the Gaussian, in pixels
+       The standard deviation of the Gaussian, in pixels.
       </para>
      </listitem>
     </varlistentry>
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object with charcoal simulation
+   The <classname>Gmagick</classname> object with charcoal simulation.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/chopimage.xml b/reference/gmagick/gmagick/chopimage.xml
index c900e55491..44512bb76c 100644
--- a/reference/gmagick/gmagick/chopimage.xml
+++ b/reference/gmagick/gmagick/chopimage.xml
@@ -29,7 +29,7 @@
      <term><parameter>width</parameter></term>
      <listitem>
       <para>
-        Width of the chopped area
+        Width of the chopped area.
       </para>
      </listitem>
     </varlistentry>
@@ -37,7 +37,7 @@
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-       Height of the chopped area
+       Height of the chopped area.
       </para>
      </listitem>
     </varlistentry>
@@ -45,7 +45,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
-       X origo of the chopped area
+       X origo of the chopped area.
       </para>
      </listitem>
     </varlistentry>
@@ -53,7 +53,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
-       Y origo of the chopped area
+       Y origo of the chopped area.
       </para>
      </listitem>
     </varlistentry>
@@ -64,7 +64,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The chopped Gmagick object
+   The chopped <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/clear.xml b/reference/gmagick/gmagick/clear.xml
index d1383bbfa6..8a883ff78c 100644
--- a/reference/gmagick/gmagick/clear.xml
+++ b/reference/gmagick/gmagick/clear.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
-  Clears all resources associated to Gmagick object 
+  Clears all resources associated to <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    The cleared Gmagick object
+    The cleared <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/commentimage.xml b/reference/gmagick/gmagick/commentimage.xml
index f8bd339f91..50985e63af 100644
--- a/reference/gmagick/gmagick/commentimage.xml
+++ b/reference/gmagick/gmagick/commentimage.xml
@@ -26,7 +26,7 @@
      <term><parameter>comment</parameter></term>
      <listitem>
       <para>
-       The comment to add
+       The comment to add.
       </para>
      </listitem>
     </varlistentry>
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object with comment added.
+   The <classname>Gmagick</classname> object with comment added.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/compositeimage.xml b/reference/gmagick/gmagick/compositeimage.xml
index 063c16a574..f18e49a207 100644
--- a/reference/gmagick/gmagick/compositeimage.xml
+++ b/reference/gmagick/gmagick/compositeimage.xml
@@ -20,8 +20,6 @@
    Composite one image onto another at the specified offset. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -32,7 +30,7 @@
      <term><parameter>source</parameter></term>
      <listitem>
       <para>
-        Gmagick object which holds the composite image
+       <classname>Gmagick</classname> object which holds the composite image.
       </para>
      </listitem>
     </varlistentry>
@@ -48,7 +46,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
-       The column offset of the composited image
+       The column offset of the composited image.
       </para>
      </listitem>
     </varlistentry>
@@ -56,7 +54,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
-       The row offset of the composited image
+       The row offset of the composited image.
       </para>
      </listitem>
     </varlistentry>
@@ -67,7 +65,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object with compositions.
+   The <classname>Gmagick</classname> object with compositions.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/construct.xml b/reference/gmagick/gmagick/construct.xml
index d5f1475485..5a9d26536c 100644
--- a/reference/gmagick/gmagick/construct.xml
+++ b/reference/gmagick/gmagick/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
-   The Gmagick constructor.
+   The <classname>Gmagick</classname> constructor.
   </para>
 
  </refsect1>
@@ -27,7 +27,7 @@
      <term><parameter>filename</parameter></term>
      <listitem>
       <para>
-       The path to an image to load or array of paths
+       The path to an image to load or array of paths.
       </para>
      </listitem>
     </varlistentry>
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a new Gmagick object on success.
+   Returns a new <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/cropimage.xml b/reference/gmagick/gmagick/cropimage.xml
index 6f3f381afb..8f8094eb1f 100644
--- a/reference/gmagick/gmagick/cropimage.xml
+++ b/reference/gmagick/gmagick/cropimage.xml
@@ -40,7 +40,7 @@
        </term>
        <listitem>
          <para>
-           The width of the crop
+           The width of the crop.
          </para>
        </listitem>
      </varlistentry>
@@ -50,7 +50,7 @@
        </term>
        <listitem>
          <para>
-           The height of the crop
+           The height of the crop.
          </para>
        </listitem>
      </varlistentry>     
@@ -58,7 +58,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
-       The X coordinate of the cropped region's top left corner
+       The X coordinate of the cropped region's top left corner.
       </para>
      </listitem>
     </varlistentry>
@@ -66,7 +66,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
-      The Y coordinate of the cropped region's top left corner
+      The Y coordinate of the cropped region's top left corner.
       </para>
      </listitem>
     </varlistentry>
@@ -77,7 +77,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The cropped Gmagick object
+   The cropped <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/cropthumbnailimage.xml b/reference/gmagick/gmagick/cropthumbnailimage.xml
index 7d470f152d..532bb7471f 100644
--- a/reference/gmagick/gmagick/cropthumbnailimage.xml
+++ b/reference/gmagick/gmagick/cropthumbnailimage.xml
@@ -27,7 +27,7 @@
     <term><parameter>width</parameter></term>
      <listitem>
       <para>
-      The width of the thumbnail
+      The width of the thumbnail.
       </para>
      </listitem>
     </varlistentry>
@@ -35,7 +35,7 @@
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-       The Height of the thumbnail
+       The Height of the thumbnail.
       </para>
      </listitem>
     </varlistentry>
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  The cropped Gmagick object 
+  The cropped <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/deconstructimages.xml b/reference/gmagick/gmagick/deconstructimages.xml
index 50e365c091..3caf02a023 100644
--- a/reference/gmagick/gmagick/deconstructimages.xml
+++ b/reference/gmagick/gmagick/deconstructimages.xml
@@ -27,7 +27,7 @@ Compares each image with the next in a sequence and returns the maximum bounding
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a new <classname>Gmagick</classname> object on success.
+   Returns a new <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/despeckleimage.xml b/reference/gmagick/gmagick/despeckleimage.xml
index 33ee1347d3..123080aea9 100644
--- a/reference/gmagick/gmagick/despeckleimage.xml
+++ b/reference/gmagick/gmagick/despeckleimage.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The despeckled Gmagick object on success.
+   The despeckled <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
@@ -59,15 +59,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Classname::Method</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/gmagick/gmagick/destroy.xml b/reference/gmagick/gmagick/destroy.xml
index a6ee70007b..2c18659ebc 100644
--- a/reference/gmagick/gmagick/destroy.xml
+++ b/reference/gmagick/gmagick/destroy.xml
@@ -14,11 +14,16 @@
    <void />
   </methodsynopsis>
   <para>
-   Destroys the Gmagick object and frees all resources associated with it
+   Destroys the <classname>Gmagick</classname> object and frees all resources associated with it
   </para>
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/gmagick/gmagick/drawimage.xml b/reference/gmagick/gmagick/drawimage.xml
index ad023212e5..b1518b4398 100644
--- a/reference/gmagick/gmagick/drawimage.xml
+++ b/reference/gmagick/gmagick/drawimage.xml
@@ -14,7 +14,7 @@
    <methodparam><type>GmagickDraw</type><parameter>GmagickDraw</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Renders the GmagickDraw object on the current image
+    Renders the <classname>GmagickDraw</classname> object on the current image.
   </para>
 
 
@@ -39,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The drawn Gmagick object
+   The drawn <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/edgeimage.xml b/reference/gmagick/gmagick/edgeimage.xml
index c72900a198..081e43b99b 100644
--- a/reference/gmagick/gmagick/edgeimage.xml
+++ b/reference/gmagick/gmagick/edgeimage.xml
@@ -39,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object with edges enhanced.
+   The <classname>Gmagick</classname> object with edges enhanced.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/embossimage.xml b/reference/gmagick/gmagick/embossimage.xml
index 9fb5a15100..96d2563ac1 100644
--- a/reference/gmagick/gmagick/embossimage.xml
+++ b/reference/gmagick/gmagick/embossimage.xml
@@ -29,7 +29,7 @@
      <term><parameter>radius</parameter></term>
      <listitem>
       <para>
-       The radius of the effect
+       The radius of the effect.
       </para>
      </listitem>
     </varlistentry>
@@ -37,7 +37,7 @@
      <term><parameter>sigma</parameter></term>
      <listitem>
       <para>
-       The sigma of the effect
+       The sigma of the effect.
       </para>
      </listitem>
     </varlistentry>
@@ -48,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The embossed Gmagick object.
+   The embossed <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/enhanceimage.xml b/reference/gmagick/gmagick/enhanceimage.xml
index f5356fa8fd..11c6e7eed9 100644
--- a/reference/gmagick/gmagick/enhanceimage.xml
+++ b/reference/gmagick/gmagick/enhanceimage.xml
@@ -17,13 +17,17 @@
    Applies a digital filter that improves the quality of a noisy image.
   </para>
 
+ </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The enhanced Gmagick object.
+   The enhanced <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/equalizeimage.xml b/reference/gmagick/gmagick/equalizeimage.xml
index 47ca39f8a4..f162ea352a 100644
--- a/reference/gmagick/gmagick/equalizeimage.xml
+++ b/reference/gmagick/gmagick/equalizeimage.xml
@@ -17,13 +17,17 @@
    Equalizes the image histogram.
   </para>
 
+ </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The equalized Gmagick object.
+   The equalized <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/flipimage.xml b/reference/gmagick/gmagick/flipimage.xml
index dd3b86b608..87b185bf36 100644
--- a/reference/gmagick/gmagick/flipimage.xml
+++ b/reference/gmagick/gmagick/flipimage.xml
@@ -18,10 +18,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The flipped Gmagick object.
+   The flipped <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/flopimage.xml b/reference/gmagick/gmagick/flopimage.xml
index 5159bb3cd7..078a8624b2 100644
--- a/reference/gmagick/gmagick/flopimage.xml
+++ b/reference/gmagick/gmagick/flopimage.xml
@@ -19,10 +19,15 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The flopped Gmagick object.
+   The flopped <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/frameimage.xml b/reference/gmagick/gmagick/frameimage.xml
index 2f90b68f2a..c580a6ee0f 100644
--- a/reference/gmagick/gmagick/frameimage.xml
+++ b/reference/gmagick/gmagick/frameimage.xml
@@ -31,7 +31,7 @@ Adds a simulated three-dimensional border around the image. The width and height
      <term><parameter>color</parameter></term>
      <listitem>
       <para>
-       GmagickPixel object or a float representing the matte color
+       <classname>GmagickPixel</classname> object or a float representing the matte color.
       </para>
      </listitem>
     </varlistentry>
@@ -39,7 +39,7 @@ Adds a simulated three-dimensional border around the image. The width and height
      <term><parameter>width</parameter></term>
      <listitem>
       <para>
-       The width of the border
+       The width of the border.
       </para>
      </listitem>
     </varlistentry>
@@ -47,7 +47,7 @@ Adds a simulated three-dimensional border around the image. The width and height
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-        The height of the border
+        The height of the border.
       </para>
      </listitem>
     </varlistentry>
@@ -55,7 +55,7 @@ Adds a simulated three-dimensional border around the image. The width and height
      <term><parameter>inner_bevel</parameter></term>
      <listitem>
       <para>
-       The inner bevel width
+       The inner bevel width.
       </para>
      </listitem>
     </varlistentry>
@@ -63,7 +63,7 @@ Adds a simulated three-dimensional border around the image. The width and height
      <term><parameter>outer_bevel</parameter></term>
      <listitem>
       <para>
-        The outer bevel width
+        The outer bevel width.
       </para>
      </listitem>
     </varlistentry>
@@ -74,7 +74,7 @@ Adds a simulated three-dimensional border around the image. The width and height
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The framed Gmagick object.
+   The framed <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/gammaimage.xml b/reference/gmagick/gmagick/gammaimage.xml
index fa405053ec..f4b99e1cc3 100644
--- a/reference/gmagick/gmagick/gammaimage.xml
+++ b/reference/gmagick/gmagick/gammaimage.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  The gamma corrected Gmagick object.
+  The gamma corrected <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/getcopyright.xml b/reference/gmagick/gmagick/getcopyright.xml
index 923629b14b..06605704e9 100644
--- a/reference/gmagick/gmagick/getcopyright.xml
+++ b/reference/gmagick/gmagick/getcopyright.xml
@@ -17,7 +17,11 @@
    Returns the GraphicsMagick API copyright as a string.
   </para>
 
+ </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
diff --git a/reference/gmagick/gmagick/getfilename.xml b/reference/gmagick/gmagick/getfilename.xml
index b4a961dcce..4980fac543 100644
--- a/reference/gmagick/gmagick/getfilename.xml
+++ b/reference/gmagick/gmagick/getfilename.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/gmagick/gmagick/getimagebordercolor.xml b/reference/gmagick/gmagick/getimagebordercolor.xml
index c5f1450733..55151ddbba 100644
--- a/reference/gmagick/gmagick/getimagebordercolor.xml
+++ b/reference/gmagick/gmagick/getimagebordercolor.xml
@@ -28,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   GmagickPixel object representing the color of the border
+   <classname>GmagickPixel</classname> object representing the color of the border.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/getimagegamma.xml b/reference/gmagick/gmagick/getimagegamma.xml
index aa7a48386a..00e6ff0b99 100644
--- a/reference/gmagick/gmagick/getimagegamma.xml
+++ b/reference/gmagick/gmagick/getimagegamma.xml
@@ -17,8 +17,6 @@
    Gets the image gamma
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/gmagick/gmagick/getimagehistogram.xml b/reference/gmagick/gmagick/getimagehistogram.xml
index dfea26208a..b3573b4b62 100644
--- a/reference/gmagick/gmagick/getimagehistogram.xml
+++ b/reference/gmagick/gmagick/getimagehistogram.xml
@@ -14,7 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns the image histogram as an array of GmagickPixel objects. Throw an GmagickException on error.
+   Returns the image histogram as an array of <classname>GmagickPixel</classname> objects. 
+   Throw an <classname>GmagickException</classname> on error.
   </para>
 
    
@@ -29,7 +30,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the image histogram as an array of GmagickPixel objects. 
+   Returns the image histogram as an array of <classname>GmagickPixel</classname> objects. 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/getimageindex.xml b/reference/gmagick/gmagick/getimageindex.xml
index 9a1fe3bef1..c78b125744 100644
--- a/reference/gmagick/gmagick/getimageindex.xml
+++ b/reference/gmagick/gmagick/getimageindex.xml
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns the index of the current active image within the Gmagick object. 
+   Returns the index of the current active image within the <classname>Gmagick</classname> object. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Index of current active image
+   Index of current active image.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/getquantumdepth.xml b/reference/gmagick/gmagick/getquantumdepth.xml
index 2fef7a8d94..c60291391e 100644
--- a/reference/gmagick/gmagick/getquantumdepth.xml
+++ b/reference/gmagick/gmagick/getquantumdepth.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns the Gmagick quantum depth as a string.
+   Returns the <classname>Gmagick</classname> quantum depth as a string.
   </para>
 
    
@@ -29,7 +29,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the Gmagick quantum depth as a string. 
+   Returns the <classname>Gmagick</classname> quantum depth as a string. 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/getsize.xml b/reference/gmagick/gmagick/getsize.xml
index 0eb1382546..385dbce682 100644
--- a/reference/gmagick/gmagick/getsize.xml
+++ b/reference/gmagick/gmagick/getsize.xml
@@ -14,11 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns the size associated with the Gmagick object as an array with the keys "columns" and "rows". 
+   Returns the size associated with the <classname>Gmagick</classname> object as an array with the keys "columns" and "rows". 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the size associated with the Gmagick object as an array with the keys "columns" and "rows". 
+   Returns the size associated with the <classname>Gmagick</classname> object as an array with the keys "columns" and "rows". 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/hasnextimage.xml b/reference/gmagick/gmagick/hasnextimage.xml
index c6b1231df3..b682f2b2e7 100644
--- a/reference/gmagick/gmagick/hasnextimage.xml
+++ b/reference/gmagick/gmagick/hasnextimage.xml
@@ -14,11 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns TRUE if the object has more images when traversing the list in the forward direction. 
+   Returns &true; if the object has more images when traversing the list in the forward direction. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns TRUE if the object has more images when traversing the list in the forward direction, returns FALSE if there are none. 
+   Returns &true; if the object has more images when traversing the list in the forward direction, returns &false; if there are none. 
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/haspreviousimage.xml b/reference/gmagick/gmagick/haspreviousimage.xml
index bf97da6676..e12c4dfa6f 100644
--- a/reference/gmagick/gmagick/haspreviousimage.xml
+++ b/reference/gmagick/gmagick/haspreviousimage.xml
@@ -14,11 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns TRUE if the object has more images when traversing the list in the reverse direction 
+   Returns &true; if the object has more images when traversing the list in the reverse direction.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns TRUE if the object has more images when traversing the list in the reverse direction, returns FALSE if there are none. 
+   Returns &true; if the object has more images when traversing the list in the reverse direction, returns &false; if there are none. 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/implodeimage.xml b/reference/gmagick/gmagick/implodeimage.xml
index 95928e0c90..9be4df570d 100644
--- a/reference/gmagick/gmagick/implodeimage.xml
+++ b/reference/gmagick/gmagick/implodeimage.xml
@@ -16,9 +16,6 @@
   <para>
    Creates a new image that is a copy of an existing one with the image pixels "imploded" by the specified percentage. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
      <term><parameter>radius</parameter></term>
      <listitem>
       <para>
-       The radius of the implode 
+       The radius of the implode.
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns imploded Gmagick object.
+   Returns imploded <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/levelimage.xml b/reference/gmagick/gmagick/levelimage.xml
index 98090bf49a..03dfc32b7a 100644
--- a/reference/gmagick/gmagick/levelimage.xml
+++ b/reference/gmagick/gmagick/levelimage.xml
@@ -24,9 +24,6 @@
  specifies the lightest color in the image. Colors brighter than the white point are set to the
  maximum quantum value. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -37,7 +34,7 @@
      <term><parameter>blackPoint</parameter></term>
      <listitem>
       <para>
-       The image black point 
+       The image black point.
       </para>
      </listitem>
     </varlistentry>
@@ -45,7 +42,7 @@
      <term><parameter>gamma</parameter></term>
      <listitem>
       <para>
-       The gamma value 
+       The gamma value.
       </para>
      </listitem>
     </varlistentry>
@@ -53,7 +50,7 @@
      <term><parameter>whitePoint</parameter></term>
      <listitem>
       <para>
-       The image white point 
+       The image white point.
       </para>
      </listitem>
     </varlistentry>
@@ -75,7 +72,7 @@ To apply to more than one channel, combine channeltype constants using bitwise
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Gmagick object with image levelled.
+   <classname>Gmagick</classname> object with image leveled.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/magnifyimage.xml b/reference/gmagick/gmagick/magnifyimage.xml
index 63c08ed89e..b3170b8cad 100644
--- a/reference/gmagick/gmagick/magnifyimage.xml
+++ b/reference/gmagick/gmagick/magnifyimage.xml
@@ -16,9 +16,6 @@
   <para>
    Conveniently scales an image proportionally to twice its original size. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Magnified Gmagick object.
+   Magnified <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/mapimage.xml b/reference/gmagick/gmagick/mapimage.xml
index ec97a760ca..5c90f86fd0 100644
--- a/reference/gmagick/gmagick/mapimage.xml
+++ b/reference/gmagick/gmagick/mapimage.xml
@@ -17,9 +17,6 @@
   <para>
    Replaces the colors of an image with the closest color from a reference image.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +27,7 @@
      <term><parameter>gmagick</parameter></term>
      <listitem>
       <para>
-       The reference image
+       The reference image.
       </para>
      </listitem>
     </varlistentry>
@@ -38,7 +35,7 @@
      <term><parameter>dither</parameter></term>
      <listitem>
       <para>
-       Set this integer value to something other than zero to dither the mapped image
+       Set this integer value to something other than zero to dither the mapped image.
       </para>
      </listitem>
     </varlistentry>
@@ -49,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Gmagick object
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/medianfilterimage.xml b/reference/gmagick/gmagick/medianfilterimage.xml
index d610ba5ae0..9255ab20b0 100644
--- a/reference/gmagick/gmagick/medianfilterimage.xml
+++ b/reference/gmagick/gmagick/medianfilterimage.xml
@@ -16,9 +16,6 @@
   <para>
    Applies a digital filter that improves the quality of a noisy image. Each pixel is replaced by the median in a set of neighboring pixels as defined by radius. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Gmagick object with median filter applied.
+   <classname>Gmagick</classname> object with median filter applied.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/minifyimage.xml b/reference/gmagick/gmagick/minifyimage.xml
index f09bbe0f33..2293ada85a 100644
--- a/reference/gmagick/gmagick/minifyimage.xml
+++ b/reference/gmagick/gmagick/minifyimage.xml
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-   A convenient method that scales an image proportionally to one-half its original size 
+   A convenient method that scales an image proportionally to one-half its original size.
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/modulateimage.xml b/reference/gmagick/gmagick/modulateimage.xml
index c2bc445746..f613380a23 100644
--- a/reference/gmagick/gmagick/modulateimage.xml
+++ b/reference/gmagick/gmagick/modulateimage.xml
@@ -61,7 +61,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/motionblurimage.xml b/reference/gmagick/gmagick/motionblurimage.xml
index 8f7f43cff7..c8e8f7a807 100644
--- a/reference/gmagick/gmagick/motionblurimage.xml
+++ b/reference/gmagick/gmagick/motionblurimage.xml
@@ -18,12 +18,10 @@
   <para>
    Simulates motion blur. We convolve the image with a Gaussian operator of the 
    given radius and standard deviation (sigma). For reasonable results, radius should be
-   larger than sigma. Use a radius of 0 and MotionBlurImage() selects a suitable radius
+   larger than sigma. Use a radius of 0 and <methodname>Gmagick::motionblurimage</methodname> selects a suitable radius
    for you. Angle gives the angle of the blurring motion. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -61,7 +59,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/newimage.xml b/reference/gmagick/gmagick/newimage.xml
index 8c6c39fce0..c49ea27d25 100644
--- a/reference/gmagick/gmagick/newimage.xml
+++ b/reference/gmagick/gmagick/newimage.xml
@@ -17,11 +17,8 @@
    <methodparam choice="opt"><type>string</type><parameter>format</parameter></methodparam>    
   </methodsynopsis>
   <para>
-   Creates a new image with the specified background color 
+   Creates a new image with the specified background color.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -32,7 +29,7 @@
      <term><parameter>width</parameter></term>
      <listitem>
       <para>
-       Width of the new image
+       Width of the new image.
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +37,7 @@
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-       Height of the new image
+       Height of the new image.
       </para>
      </listitem>
     </varlistentry>
@@ -48,7 +45,7 @@
      <term><parameter>background</parameter></term>
      <listitem>
       <para>
-       The background color used for this image (as float)
+       The background color used for this image (as float).
       </para>
      </listitem>
     </varlistentry>
@@ -67,7 +64,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/nextimage.xml b/reference/gmagick/gmagick/nextimage.xml
index d664edfd11..2a90edeb3d 100644
--- a/reference/gmagick/gmagick/nextimage.xml
+++ b/reference/gmagick/gmagick/nextimage.xml
@@ -14,11 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Associates the next image in the image list with an Gmagick object. 
+   Associates the next image in the image list with an <classname>Gmagick</classname> object. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/gmagick/gmagick/normalizeimage.xml b/reference/gmagick/gmagick/normalizeimage.xml
index c57974bc74..b3459a7171 100644
--- a/reference/gmagick/gmagick/normalizeimage.xml
+++ b/reference/gmagick/gmagick/normalizeimage.xml
@@ -17,8 +17,6 @@
    Enhances the contrast of a color image by adjusting the pixels color to span the entire range of colors available. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
      <term><parameter>channel</parameter></term>
      <listitem>
       <para>
-       Identify which channel to normalize
+       Identify which channel to normalize.
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/profileimage.xml b/reference/gmagick/gmagick/profileimage.xml
index 34e062fa70..118c91ebc0 100644
--- a/reference/gmagick/gmagick/profileimage.xml
+++ b/reference/gmagick/gmagick/profileimage.xml
@@ -15,11 +15,10 @@
    <methodparam><type>string</type><parameter>profile</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Adds or removes a ICC, IPTC, or generic profile from an image. If the profile is NULL, it is removed from the image otherwise added. Use a name of '*' and a profile of NULL to remove all profiles from the image. 
+   Adds or removes a ICC, IPTC, or generic profile from an image. If the profile is &null;, it is removed from the image otherwise added.
+   Use a name of <literal>*</literal> and a profile of &null; to remove all profiles from the image. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/queryformats.xml b/reference/gmagick/gmagick/queryformats.xml
index 7d35e9fd09..b60e5639d3 100644
--- a/reference/gmagick/gmagick/queryformats.xml
+++ b/reference/gmagick/gmagick/queryformats.xml
@@ -14,11 +14,8 @@
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Returns formats supported by Gmagick.
+   Returns formats supported by <classname>Gmagick</classname>.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/radialblurimage.xml b/reference/gmagick/gmagick/radialblurimage.xml
index ae3e724a04..8a8c491310 100644
--- a/reference/gmagick/gmagick/radialblurimage.xml
+++ b/reference/gmagick/gmagick/radialblurimage.xml
@@ -17,9 +17,6 @@
   <para>
    Radial blurs an image.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -38,7 +35,7 @@
      <term><parameter>channel</parameter></term>
      <listitem>
       <para>
-       Related channel
+       Related channel.
       </para>
      </listitem>
     </varlistentry>
@@ -49,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/raiseimage.xml b/reference/gmagick/gmagick/raiseimage.xml
index c360c3c227..3bac21eb55 100644
--- a/reference/gmagick/gmagick/raiseimage.xml
+++ b/reference/gmagick/gmagick/raiseimage.xml
@@ -21,8 +21,6 @@
    Creates a simulated three-dimensional button-like effect by lightening and darkening the edges of the image. Members width and height of raise_info define the width of the vertical and horizontal edge of the effect. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +47,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
-       X coordinate 
+       X coordinate. 
       </para>
      </listitem>
     </varlistentry>
@@ -57,7 +55,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
-       Y coordinate 
+       Y coordinate.
       </para>
      </listitem>
     </varlistentry>
@@ -76,7 +74,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/read.xml b/reference/gmagick/gmagick/read.xml
index 4775bc5251..770ee52524 100644
--- a/reference/gmagick/gmagick/read.xml
+++ b/reference/gmagick/gmagick/read.xml
@@ -17,8 +17,6 @@
    Reads image from filename.
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/readimage.xml b/reference/gmagick/gmagick/readimage.xml
index a8ddd7d826..e6b31aca0e 100644
--- a/reference/gmagick/gmagick/readimage.xml
+++ b/reference/gmagick/gmagick/readimage.xml
@@ -16,9 +16,6 @@
   <para>
    Reads image from filename.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/readimageblob.xml b/reference/gmagick/gmagick/readimageblob.xml
index 3ed477145a..c3d941e530 100644
--- a/reference/gmagick/gmagick/readimageblob.xml
+++ b/reference/gmagick/gmagick/readimageblob.xml
@@ -17,9 +17,6 @@
   <para>
    Reads image from a binary string.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +27,7 @@
      <term><parameter>imageContents</parameter></term>
      <listitem>
       <para>
-       Content of image
+       Content of image.
       </para>
      </listitem>
     </varlistentry>
@@ -38,7 +35,7 @@
      <term><parameter>filename</parameter></term>
      <listitem>
       <para>
-           The image filename.
+       The image filename.
       </para>
      </listitem>
     </varlistentry>
@@ -49,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/readimagefile.xml b/reference/gmagick/gmagick/readimagefile.xml
index e6e302c31d..5855a24bd3 100644
--- a/reference/gmagick/gmagick/readimagefile.xml
+++ b/reference/gmagick/gmagick/readimagefile.xml
@@ -17,9 +17,6 @@
   <para>
    Reads an image or image sequence from an open file descriptor.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -41,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/reducenoiseimage.xml b/reference/gmagick/gmagick/reducenoiseimage.xml
index fbd8baa63e..444248ad4c 100644
--- a/reference/gmagick/gmagick/reducenoiseimage.xml
+++ b/reference/gmagick/gmagick/reducenoiseimage.xml
@@ -14,11 +14,10 @@
    <methodparam><type>float</type><parameter>radius</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Smooths the contours of an image while still preserving edge information. The algorithm works by replacing each pixel with its neighbor closest in value. A neighbor is defined by radius. Use a radius of 0 and Gmagick::reduceNoiseImage() selects a suitable radius for you. 
+   Smooths the contours of an image while still preserving edge information. The algorithm works by replacing each pixel with its neighbor closest in value. A neighbor is defined by radius. 
+   Use a radius of 0 and <methodname>Gmagick::reducenoiseimage</methodname> selects a suitable radius for you. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/removeimage.xml b/reference/gmagick/gmagick/removeimage.xml
index b0d41ead3e..051aad5fc1 100644
--- a/reference/gmagick/gmagick/removeimage.xml
+++ b/reference/gmagick/gmagick/removeimage.xml
@@ -16,9 +16,6 @@
   <para>
    Removes an image from the image list. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/resizeimage.xml b/reference/gmagick/gmagick/resizeimage.xml
index 2ff99dd04e..491c46e9e2 100644
--- a/reference/gmagick/gmagick/resizeimage.xml
+++ b/reference/gmagick/gmagick/resizeimage.xml
@@ -66,7 +66,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/scaleimage.xml b/reference/gmagick/gmagick/scaleimage.xml
index 71985464f0..3c456247e9 100644
--- a/reference/gmagick/gmagick/scaleimage.xml
+++ b/reference/gmagick/gmagick/scaleimage.xml
@@ -18,9 +18,6 @@
   <para>
    Scales the size of an image to the given dimensions. The other parameter will be calculated if 0 is passed as either param. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -50,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/separateimagechannel.xml b/reference/gmagick/gmagick/separateimagechannel.xml
index 9dc803121c..c0d7c3cc4f 100644
--- a/reference/gmagick/gmagick/separateimagechannel.xml
+++ b/reference/gmagick/gmagick/separateimagechannel.xml
@@ -16,9 +16,6 @@
   <para>
    Separates a channel from the image and returns a grayscale image. A channel is a particular color component of each pixel in the image. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,8 @@
      <term><parameter>channel</parameter></term>
      <listitem>
       <para>
-       Identify which channel to extract: RedChannel, GreenChannel, BlueChannel, OpacityChannel, CyanChannel, MagentaChannel, YellowChannel, BlackChannel.
+       One of the <link linkend="gmagick.constants.channel">Channel</link> constant
+       (<literal>Gmagick::CHANNEL_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setcompressionquality.xml b/reference/gmagick/gmagick/setcompressionquality.xml
index a9c6a72148..947e771d8f 100644
--- a/reference/gmagick/gmagick/setcompressionquality.xml
+++ b/reference/gmagick/gmagick/setcompressionquality.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/setfilename.xml b/reference/gmagick/gmagick/setfilename.xml
index e85f303d68..6abb3f1fa4 100644
--- a/reference/gmagick/gmagick/setfilename.xml
+++ b/reference/gmagick/gmagick/setfilename.xml
@@ -17,8 +17,6 @@
     Sets the filename before you read or write an image file. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/setimagebackgroundcolor.xml b/reference/gmagick/gmagick/setimagebackgroundcolor.xml
index b977a95154..119cb0cf5f 100644
--- a/reference/gmagick/gmagick/setimagebackgroundcolor.xml
+++ b/reference/gmagick/gmagick/setimagebackgroundcolor.xml
@@ -17,8 +17,6 @@
    Sets the image background color. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
  <refsect1 role="errors">
diff --git a/reference/gmagick/gmagick/setimageblueprimary.xml b/reference/gmagick/gmagick/setimageblueprimary.xml
index b55e70c597..1ba99ebfde 100644
--- a/reference/gmagick/gmagick/setimageblueprimary.xml
+++ b/reference/gmagick/gmagick/setimageblueprimary.xml
@@ -18,8 +18,6 @@
    Sets the image chromaticity blue primary point. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagebordercolor.xml b/reference/gmagick/gmagick/setimagebordercolor.xml
index 2b2a9c9464..8065051dcb 100644
--- a/reference/gmagick/gmagick/setimagebordercolor.xml
+++ b/reference/gmagick/gmagick/setimagebordercolor.xml
@@ -17,8 +17,6 @@
    Sets the image border color.
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagechanneldepth.xml b/reference/gmagick/gmagick/setimagechanneldepth.xml
index 8a69833d40..a0915f26fe 100644
--- a/reference/gmagick/gmagick/setimagechanneldepth.xml
+++ b/reference/gmagick/gmagick/setimagechanneldepth.xml
@@ -18,8 +18,6 @@
    Sets the depth of a particular image channel. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +28,8 @@
      <term><parameter>channel</parameter></term>
      <listitem>
       <para>
-       Identify which channel to extract: RedChannel, GreenChannel, BlueChannel, OpacityChannel, CyanChannel, MagentaChannel, YellowChannel, BlackChannel.
+       One of the <link linkend="gmagick.constants.channel">Channel</link> constant
+       (<literal>Gmagick::CHANNEL_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -49,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagecolorspace.xml b/reference/gmagick/gmagick/setimagecolorspace.xml
index 7499f834ec..4330bdb12a 100644
--- a/reference/gmagick/gmagick/setimagecolorspace.xml
+++ b/reference/gmagick/gmagick/setimagecolorspace.xml
@@ -17,8 +17,6 @@
    Sets the image colorspace. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,8 @@
      <term><parameter>colorspace</parameter></term>
      <listitem>
       <para>
-       The image colorspace: UndefinedColorspace, RGBColorspace, GRAYColorspace, TransparentColorspace, OHTAColorspace, XYZColorspace, YCbCrColorspace, YCCColorspace, YIQColorspace, YPbPrColorspace, YPbPrColorspace, YUVColorspace, CMYKColorspace, sRGBColorspace, HSLColorspace, or HWBColorspace.
+       One of the <link linkend="gmagick.constants.colorspace">Colorspace</link> constant
+       (<literal>Gmagick::COLORSPACE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagedelay.xml b/reference/gmagick/gmagick/setimagedelay.xml
index 06a872c342..9f41c5b493 100644
--- a/reference/gmagick/gmagick/setimagedelay.xml
+++ b/reference/gmagick/gmagick/setimagedelay.xml
@@ -14,11 +14,8 @@
    <methodparam><type>int</type><parameter>delay</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Sets the image delay
+    Sets the image delay.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagedepth.xml b/reference/gmagick/gmagick/setimagedepth.xml
index c81410d7c6..49ae8483c9 100644
--- a/reference/gmagick/gmagick/setimagedepth.xml
+++ b/reference/gmagick/gmagick/setimagedepth.xml
@@ -14,11 +14,8 @@
    <methodparam><type>int</type><parameter>depth</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Sets the image depth
+   Sets the image depth.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagedispose.xml b/reference/gmagick/gmagick/setimagedispose.xml
index b0fee074c3..4a1015ae7d 100644
--- a/reference/gmagick/gmagick/setimagedispose.xml
+++ b/reference/gmagick/gmagick/setimagedispose.xml
@@ -17,8 +17,6 @@
    Sets the image disposal method. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagefilename.xml b/reference/gmagick/gmagick/setimagefilename.xml
index ccea6fcfef..c6a6b67086 100644
--- a/reference/gmagick/gmagick/setimagefilename.xml
+++ b/reference/gmagick/gmagick/setimagefilename.xml
@@ -17,8 +17,6 @@
    Sets the filename of a particular image in a sequence. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimageformat.xml b/reference/gmagick/gmagick/setimageformat.xml
index 914b885ebd..932e943fae 100644
--- a/reference/gmagick/gmagick/setimageformat.xml
+++ b/reference/gmagick/gmagick/setimageformat.xml
@@ -16,9 +16,6 @@
   <para>
    Sets the format of a particular image in a sequence. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagegamma.xml b/reference/gmagick/gmagick/setimagegamma.xml
index 3512fdd9c8..37bbb935ab 100644
--- a/reference/gmagick/gmagick/setimagegamma.xml
+++ b/reference/gmagick/gmagick/setimagegamma.xml
@@ -17,8 +17,6 @@
    Sets the image gamma. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagegreenprimary.xml b/reference/gmagick/gmagick/setimagegreenprimary.xml
index ecb97f3746..281e7202c7 100644
--- a/reference/gmagick/gmagick/setimagegreenprimary.xml
+++ b/reference/gmagick/gmagick/setimagegreenprimary.xml
@@ -18,8 +18,6 @@
    Sets the image chromaticity green primary point. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimageindex.xml b/reference/gmagick/gmagick/setimageindex.xml
index 4f494d30e3..61332d4441 100644
--- a/reference/gmagick/gmagick/setimageindex.xml
+++ b/reference/gmagick/gmagick/setimageindex.xml
@@ -17,8 +17,6 @@
    Set the iterator to the position in the image list specified with the index parameter. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimageinterlacescheme.xml b/reference/gmagick/gmagick/setimageinterlacescheme.xml
index 5df715ec0e..741e749bb2 100644
--- a/reference/gmagick/gmagick/setimageinterlacescheme.xml
+++ b/reference/gmagick/gmagick/setimageinterlacescheme.xml
@@ -17,8 +17,6 @@
    Sets the interlace scheme of the image.
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,8 @@
      <term><parameter>interlace</parameter></term>
      <listitem>
       <para>
-      The image interlace scheme: NoInterlace, LineInterlace, PlaneInterlace, PartitionInterlace.
+       One of the <link linkend="gmagick.constants.interlace">Interlace</link> constant
+       (<literal>Gmagick::INTERLACE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimageiterations.xml b/reference/gmagick/gmagick/setimageiterations.xml
index 2b4818de2d..ec56215ec2 100644
--- a/reference/gmagick/gmagick/setimageiterations.xml
+++ b/reference/gmagick/gmagick/setimageiterations.xml
@@ -16,9 +16,6 @@
   <para>
    Sets the image iterations. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagerenderingintent.xml b/reference/gmagick/gmagick/setimagerenderingintent.xml
index 8002f2682a..33b6efdd7c 100644
--- a/reference/gmagick/gmagick/setimagerenderingintent.xml
+++ b/reference/gmagick/gmagick/setimagerenderingintent.xml
@@ -17,8 +17,6 @@
    Sets the image rendering intent. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,8 @@
      <term><parameter>rendering_intent</parameter></term>
      <listitem>
       <para>
-       The image rendering intent: UndefinedIntent, SaturationIntent, PerceptualIntent, AbsoluteIntent, or RelativeIntent.
+       One of the <link linkend="gmagick.constants.renderingintent">Rendering Intent</link> constant
+       (<literal>Gmagick::RENDERINGINTENT_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagescene.xml b/reference/gmagick/gmagick/setimagescene.xml
index cba8ca2413..9258933464 100644
--- a/reference/gmagick/gmagick/setimagescene.xml
+++ b/reference/gmagick/gmagick/setimagescene.xml
@@ -16,9 +16,6 @@
   <para>
    Sets the image scene. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagetype.xml b/reference/gmagick/gmagick/setimagetype.xml
index 9cef22d02f..adcf971e4b 100644
--- a/reference/gmagick/gmagick/setimagetype.xml
+++ b/reference/gmagick/gmagick/setimagetype.xml
@@ -16,9 +16,6 @@
   <para>
    Sets the image type. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,9 +26,8 @@
      <term><parameter>imgType</parameter></term>
      <listitem>
       <para>
-       The image type: UndefinedType, BilevelType, GrayscaleType, 
-GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, 
-TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, or OptimizeType.
+       One of the <link linkend="gmagick.constants.imagetype">Image type</link> constant
+       (<literal>Gmagick::IMGTYPE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -42,7 +38,7 @@ TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, or OptimizeTy
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimageunits.xml b/reference/gmagick/gmagick/setimageunits.xml
index 6f20d13d17..ede0b19c2a 100644
--- a/reference/gmagick/gmagick/setimageunits.xml
+++ b/reference/gmagick/gmagick/setimageunits.xml
@@ -16,9 +16,6 @@
   <para>
    Sets the image units of resolution. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,8 @@
      <term><parameter>resolution</parameter></term>
      <listitem>
       <para>
-       The image units of resolution : Undefinedresolution, PixelsPerInchResolution, or PixelsPerCentimeterResolution.
+       One of the <link linkend="gmagick.constants.resolution">Resolution</link> constant
+       (<literal>Gmagick::RESOLUTION_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setimagewhitepoint.xml b/reference/gmagick/gmagick/setimagewhitepoint.xml
index ed34a30c56..88850e871b 100644
--- a/reference/gmagick/gmagick/setimagewhitepoint.xml
+++ b/reference/gmagick/gmagick/setimagewhitepoint.xml
@@ -17,9 +17,6 @@
   <para>
    Sets the image chromaticity white point. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setsamplingfactors.xml b/reference/gmagick/gmagick/setsamplingfactors.xml
index 30c46c860d..84100a3cc0 100644
--- a/reference/gmagick/gmagick/setsamplingfactors.xml
+++ b/reference/gmagick/gmagick/setsamplingfactors.xml
@@ -16,9 +16,6 @@
   <para>
    Sets the image sampling factors. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-      The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/setsize.xml b/reference/gmagick/gmagick/setsize.xml
index b6080be2f9..0aa833b1ff 100644
--- a/reference/gmagick/gmagick/setsize.xml
+++ b/reference/gmagick/gmagick/setsize.xml
@@ -15,11 +15,9 @@
    <methodparam><type>int</type><parameter>rows</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Sets the size of the Gmagick object. Set it before you read a raw image format such as RGB, GRAY, or CMYK. 
+   Sets the size of the Gmagick object. Set it before you read a raw image format such as <constant>Gmagick::COLORSPACE_RGB</constant>,
+   <constant>Gmagick::COLORSPACE_GRAY</constant>, or <constant>Gmagick::COLORSPACE_CMYK</constant>. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/shearimage.xml b/reference/gmagick/gmagick/shearimage.xml
index b239eb76f8..1559feef4c 100644
--- a/reference/gmagick/gmagick/shearimage.xml
+++ b/reference/gmagick/gmagick/shearimage.xml
@@ -23,8 +23,6 @@ The amount of the shear is controlled by a shear angle. For X direction shears,
  from shearing the image are filled with the background color. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -62,7 +60,7 @@ The amount of the shear is controlled by a shear angle. For X direction shears,
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/solarizeimage.xml b/reference/gmagick/gmagick/solarizeimage.xml
index 8882a20b93..28713f0090 100644
--- a/reference/gmagick/gmagick/solarizeimage.xml
+++ b/reference/gmagick/gmagick/solarizeimage.xml
@@ -19,8 +19,6 @@
   Threshold ranges from 0 to QuantumRange and is a measure of the extent of the solarization. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -42,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/spreadimage.xml b/reference/gmagick/gmagick/spreadimage.xml
index 0e80d4dd2f..921516c1b7 100644
--- a/reference/gmagick/gmagick/spreadimage.xml
+++ b/reference/gmagick/gmagick/spreadimage.xml
@@ -17,8 +17,6 @@
     Special effects method that randomly displaces each pixel in a block defined by the radius parameter. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/stripimage.xml b/reference/gmagick/gmagick/stripimage.xml
index c57f9f16f4..57a5065eeb 100644
--- a/reference/gmagick/gmagick/stripimage.xml
+++ b/reference/gmagick/gmagick/stripimage.xml
@@ -16,9 +16,6 @@
   <para>
     Strips an image of all profiles and comments. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/swirlimage.xml b/reference/gmagick/gmagick/swirlimage.xml
index 05ad66efec..3077fcc6a5 100644
--- a/reference/gmagick/gmagick/swirlimage.xml
+++ b/reference/gmagick/gmagick/swirlimage.xml
@@ -17,8 +17,6 @@
    Swirls the pixels about the center of the image, where degrees indicates the sweep of the arc through which each pixel is moved. You get a more dramatic effect as the degrees move from 1 to 360. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/thumbnailimage.xml b/reference/gmagick/gmagick/thumbnailimage.xml
index 3411289148..bc3405d247 100644
--- a/reference/gmagick/gmagick/thumbnailimage.xml
+++ b/reference/gmagick/gmagick/thumbnailimage.xml
@@ -18,12 +18,9 @@
   <para>
    Changes the size of an image to the given dimensions and removes any associated profiles. 
 The goal is to produce small low cost thumbnail images suited for display on the Web. 
-If TRUE is given as a third parameter then columns and rows parameters are used as maximums
+If &true; is given as a third parameter then columns and rows parameters are used as maximums
  for each side. Both sides will be scaled down until the match or are smaller than the parameter given for the side. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -34,7 +31,7 @@ If TRUE is given as a third parameter then columns and rows parameters are used
      <term><parameter>width</parameter></term>
      <listitem>
       <para>
-       Image width 
+       Image width.
       </para>
      </listitem>
     </varlistentry>
@@ -42,7 +39,7 @@ If TRUE is given as a third parameter then columns and rows parameters are used
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-       Image height 
+       Image height.
       </para>
      </listitem>
     </varlistentry>
@@ -53,7 +50,7 @@ If TRUE is given as a third parameter then columns and rows parameters are used
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object on success.
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/trimimage.xml b/reference/gmagick/gmagick/trimimage.xml
index 82fc38d165..0e125dd709 100644
--- a/reference/gmagick/gmagick/trimimage.xml
+++ b/reference/gmagick/gmagick/trimimage.xml
@@ -17,8 +17,6 @@
    Remove edges that are the background color from the image. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagick/writeimage.xml b/reference/gmagick/gmagick/writeimage.xml
index a781f3ac3c..aa8b4ea343 100644
--- a/reference/gmagick/gmagick/writeimage.xml
+++ b/reference/gmagick/gmagick/writeimage.xml
@@ -15,12 +15,9 @@
    <methodparam choice="opt"><type>bool</type><parameter>all_frames</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
-     Writes an image to the specified filename. If the filename parameter is NULL, 
-the image is written to the filename set by Gmagick::ReadImage() or Gmagick::SetImageFilename(). 
+   Writes an image to the specified filename. If the filename parameter is &null;,
+   the image is written to the filename set by <methodname>Gmagick::readimage</methodname> or <methodname>Gmagick::setimagefilename</methodname>. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -42,7 +39,7 @@ the image is written to the filename set by Gmagick::ReadImage() or Gmagick::Set
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The Gmagick object
+   The <classname>Gmagick</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/annotate.xml b/reference/gmagick/gmagickdraw/annotate.xml
index 1070bde23b..07297c130a 100644
--- a/reference/gmagick/gmagickdraw/annotate.xml
+++ b/reference/gmagick/gmagickdraw/annotate.xml
@@ -58,7 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-       The GmagickDraw object on success.
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/arc.xml b/reference/gmagick/gmagickdraw/arc.xml
index 87a1feab45..456bf4404c 100644
--- a/reference/gmagick/gmagickdraw/arc.xml
+++ b/reference/gmagick/gmagickdraw/arc.xml
@@ -85,7 +85,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success.
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/bezier.xml b/reference/gmagick/gmagickdraw/bezier.xml
index eaa9aa09f2..488c8259de 100644
--- a/reference/gmagick/gmagickdraw/bezier.xml
+++ b/reference/gmagick/gmagickdraw/bezier.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/ellipse.xml b/reference/gmagick/gmagickdraw/ellipse.xml
index 364d76385b..ecbf38e2d3 100644
--- a/reference/gmagick/gmagickdraw/ellipse.xml
+++ b/reference/gmagick/gmagickdraw/ellipse.xml
@@ -82,7 +82,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/getfontsize.xml b/reference/gmagick/gmagickdraw/getfontsize.xml
index 90f2aa7657..af9bda12f9 100644
--- a/reference/gmagick/gmagickdraw/getfontsize.xml
+++ b/reference/gmagick/gmagickdraw/getfontsize.xml
@@ -29,7 +29,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the font size associated with the current GmagickDraw object. 
+   Returns the font size associated with the current
+   <classname>GmagickDraw</classname> object. 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/getfontstyle.xml b/reference/gmagick/gmagickdraw/getfontstyle.xml
index 55ac81ce40..1060bd6e2c 100644
--- a/reference/gmagick/gmagickdraw/getfontstyle.xml
+++ b/reference/gmagick/gmagickdraw/getfontstyle.xml
@@ -29,7 +29,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the font style constant (STYLE_) associated with the GmagickDraw object or 0 if no style is set. 
+   Returns the font style constant (STYLE_) associated with the
+   <classname>GmagickDraw</classname> object or <literal>0</literal> if no style
+   is set.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/line.xml b/reference/gmagick/gmagickdraw/line.xml
index b8ba45f373..a1474e78ed 100644
--- a/reference/gmagick/gmagickdraw/line.xml
+++ b/reference/gmagick/gmagickdraw/line.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="gmagickdraw.line" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>GmagickDraw::line</refname>
-  <refpurpose>The line purpose</refpurpose>
+  <refpurpose>Draws a line</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -67,7 +67,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/point.xml b/reference/gmagick/gmagickdraw/point.xml
index 5b6c4656dc..f0057b2329 100644
--- a/reference/gmagick/gmagickdraw/point.xml
+++ b/reference/gmagick/gmagickdraw/point.xml
@@ -49,7 +49,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/polygon.xml b/reference/gmagick/gmagickdraw/polygon.xml
index 57a3814f03..08c37c8857 100644
--- a/reference/gmagick/gmagickdraw/polygon.xml
+++ b/reference/gmagick/gmagickdraw/polygon.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/polyline.xml b/reference/gmagick/gmagickdraw/polyline.xml
index f025c244d0..d0583168b2 100644
--- a/reference/gmagick/gmagickdraw/polyline.xml
+++ b/reference/gmagick/gmagickdraw/polyline.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/rectangle.xml b/reference/gmagick/gmagickdraw/rectangle.xml
index a9f170dd32..72594fbe9f 100644
--- a/reference/gmagick/gmagickdraw/rectangle.xml
+++ b/reference/gmagick/gmagickdraw/rectangle.xml
@@ -67,7 +67,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/rotate.xml b/reference/gmagick/gmagickdraw/rotate.xml
index 035be8658e..d9849df462 100644
--- a/reference/gmagick/gmagickdraw/rotate.xml
+++ b/reference/gmagick/gmagickdraw/rotate.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/roundrectangle.xml b/reference/gmagick/gmagickdraw/roundrectangle.xml
index 042f56bf05..90d5d6bd13 100644
--- a/reference/gmagick/gmagickdraw/roundrectangle.xml
+++ b/reference/gmagick/gmagickdraw/roundrectangle.xml
@@ -85,7 +85,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/scale.xml b/reference/gmagick/gmagickdraw/scale.xml
index 93bbe74e00..354a7ef677 100644
--- a/reference/gmagick/gmagickdraw/scale.xml
+++ b/reference/gmagick/gmagickdraw/scale.xml
@@ -49,7 +49,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setfillopacity.xml b/reference/gmagick/gmagickdraw/setfillopacity.xml
index 4933c1054d..50f0cbd089 100644
--- a/reference/gmagick/gmagickdraw/setfillopacity.xml
+++ b/reference/gmagick/gmagickdraw/setfillopacity.xml
@@ -41,7 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setfont.xml b/reference/gmagick/gmagickdraw/setfont.xml
index 966033eb58..01f23dbb0a 100644
--- a/reference/gmagick/gmagickdraw/setfont.xml
+++ b/reference/gmagick/gmagickdraw/setfont.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setfontsize.xml b/reference/gmagick/gmagickdraw/setfontsize.xml
index a043f27844..6011bf9007 100644
--- a/reference/gmagick/gmagickdraw/setfontsize.xml
+++ b/reference/gmagick/gmagickdraw/setfontsize.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setfontstyle.xml b/reference/gmagick/gmagickdraw/setfontstyle.xml
index c9c88ccedb..45575d5214 100644
--- a/reference/gmagick/gmagickdraw/setfontstyle.xml
+++ b/reference/gmagick/gmagickdraw/setfontstyle.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setfontweight.xml b/reference/gmagick/gmagickdraw/setfontweight.xml
index 97e570fda6..6408c915f5 100644
--- a/reference/gmagick/gmagickdraw/setfontweight.xml
+++ b/reference/gmagick/gmagickdraw/setfontweight.xml
@@ -38,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setstrokeopacity.xml b/reference/gmagick/gmagickdraw/setstrokeopacity.xml
index e582d5401a..f5d6ca6a3b 100644
--- a/reference/gmagick/gmagickdraw/setstrokeopacity.xml
+++ b/reference/gmagick/gmagickdraw/setstrokeopacity.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/setstrokewidth.xml b/reference/gmagick/gmagickdraw/setstrokewidth.xml
index acd310291e..5e66623ced 100644
--- a/reference/gmagick/gmagickdraw/setstrokewidth.xml
+++ b/reference/gmagick/gmagickdraw/setstrokewidth.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/settextdecoration.xml b/reference/gmagick/gmagickdraw/settextdecoration.xml
index 1c8bc5a6f9..6ae848a305 100644
--- a/reference/gmagick/gmagickdraw/settextdecoration.xml
+++ b/reference/gmagick/gmagickdraw/settextdecoration.xml
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickdraw/settextencoding.xml b/reference/gmagick/gmagickdraw/settextencoding.xml
index 4bce4e9706..9b382cf16b 100644
--- a/reference/gmagick/gmagickdraw/settextencoding.xml
+++ b/reference/gmagick/gmagickdraw/settextencoding.xml
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickDraw object on success
+   The <classname>GmagickDraw</classname> object.
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/gmagick/gmagickpixel/construct.xml b/reference/gmagick/gmagickpixel/construct.xml
index 1d63433cec..09b3b31d6f 100644
--- a/reference/gmagick/gmagickpixel/construct.xml
+++ b/reference/gmagick/gmagickpixel/construct.xml
@@ -14,11 +14,9 @@
    <methodparam choice="opt"><type>string</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Constructs an GmagickPixel object. If a color is specified, the object is constructed and then initialised with that color before being returned. 
+   Constructs an <classname>GmagickPixel</classname> object. If a color is specified, the object is constructed and then initialised with that color before being returned. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickPixel object on success.
+   The <classname>GmagickPixel</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickpixel/getcolor.xml b/reference/gmagick/gmagickpixel/getcolor.xml
index f8605ecb9d..201716f0ee 100644
--- a/reference/gmagick/gmagickpixel/getcolor.xml
+++ b/reference/gmagick/gmagickpixel/getcolor.xml
@@ -15,11 +15,8 @@
    <methodparam choice="opt"><type>bool</type><parameter>normalize_array</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Returns the color described by the GmagickPixel object, as a <type>string</type> or an <type>array</type>. If the color has an opacity channel set, this is provided as a fourth value in the list.
+   Returns the color described by the <classname>GmagickPixel</classname> object, as a <type>string</type> or an <type>array</type>. If the color has an opacity channel set, this is provided as a fourth value in the list.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/gmagick/gmagickpixel/getcolorcount.xml b/reference/gmagick/gmagickpixel/getcolorcount.xml
index bff785130c..f8ff1b6419 100644
--- a/reference/gmagick/gmagickpixel/getcolorcount.xml
+++ b/reference/gmagick/gmagickpixel/getcolorcount.xml
@@ -14,11 +14,8 @@
    <void/>
   </methodsynopsis>
   <para>
-   Returns the color count associated with this color
+   Returns the color count associated with this color.
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the color count as an integer on success, throws GmagickPixelException on failure. 
+   Returns the color count as an integer on success, throws <classname>GmagickPixelException</classname> on failure. 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickpixel/getcolorvalue.xml b/reference/gmagick/gmagickpixel/getcolorvalue.xml
index 3f4581bee2..9608445302 100644
--- a/reference/gmagick/gmagickpixel/getcolorvalue.xml
+++ b/reference/gmagick/gmagickpixel/getcolorvalue.xml
@@ -17,8 +17,6 @@
    Retrieves the value of the color channel specified, as a floating-point number between 0 and 1. 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The value of the channel, as a normalized floating-point number, throwing GmagickPixelException on error. 
+   The value of the channel, as a normalized floating-point number, throwing <classname>GmagickPixelException</classname> on error. 
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickpixel/setcolor.xml b/reference/gmagick/gmagickpixel/setcolor.xml
index 05548e3f6b..9f0ec0627b 100644
--- a/reference/gmagick/gmagickpixel/setcolor.xml
+++ b/reference/gmagick/gmagickpixel/setcolor.xml
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Sets the color described by the GmagickPixel object, with a string (e.g. "blue", "#0000ff", "rgb(0,0,255)", "cmyk(100,100,100,10)", etc.). 
+   Sets the color described by the <classname>GmagickPixel</classname> object, with a string (e.g. "blue", "#0000ff", "rgb(0,0,255)", "cmyk(100,100,100,10)", etc.). 
   </para>
 
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
      <term><parameter>color</parameter></term>
      <listitem>
       <para>
-       The color definition to use in order to initialise the GmagickPixel object. 
+       The color definition to use in order to initialise the <classname>GmagickPixel</classname> object. 
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +38,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickPixel object on success.
+   The <classname>GmagickPixel</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/gmagickpixel/setcolorvalue.xml b/reference/gmagick/gmagickpixel/setcolorvalue.xml
index a03d577801..59abb994b2 100644
--- a/reference/gmagick/gmagickpixel/setcolorvalue.xml
+++ b/reference/gmagick/gmagickpixel/setcolorvalue.xml
@@ -15,11 +15,9 @@
    <methodparam><type>float</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Sets the value of the specified channel of this object to the provided value, which should be between 0 and 1. This function can be used to provide an opacity channel to a GmagickPixel object. 
+   Sets the value of the specified channel of this object to the provided value, which should be between 0 and 1.
+   This function can be used to provide an opacity channel to a <classname>GmagickPixel</classname> object. 
   </para>
-
-   
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The GmagickPixel object on success.
+   The <classname>GmagickPixel</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/gmagick/setup.xml b/reference/gmagick/setup.xml
index 6fc4052e6f..f18f7b33d8 100644
--- a/reference/gmagick/setup.xml
+++ b/reference/gmagick/setup.xml
@@ -7,7 +7,7 @@
  <section xml:id="gmagick.requirements">
   &reftitle.required;
   <para>
-   This extension works best with GraphicsMagick version 1.4+ and PHP 5.1.3+.
+   This extension works best with GraphicsMagick version 1.4+.
    Gmagick should work with earlier versions up to GraphicsMagick 1.2.6 but
    some features and formats are not supported for these versions.
    Windows version of GraphicsMagick is available from the GraphicsMagick
diff --git a/reference/gmp/book.xml b/reference/gmp/book.xml
index 6bc30c9cbe..533253f9fd 100644
--- a/reference/gmp/book.xml
+++ b/reference/gmp/book.xml
@@ -16,8 +16,7 @@
   <note>
    <para>
     Most GMP functions accept GMP number arguments. These are shown in this
-    documentation as <classname>GMP</classname> objects. However, note that PHP
-    5.5 and earlier represented GMP numbers as <type>resource</type>s.  Most
+    documentation as <classname>GMP</classname> objects. Most
     of these functions will also accept numeric and string arguments, so long
     as it is possible to convert the latter to a number. Also, if there is a
     more performant function that can operate on the arguments (integers only),
@@ -43,7 +42,7 @@
   </warning>
   <note>
    <simpara>
-    This extension is available on Windows platforms since PHP 5.1.0.
+    This extension is available on Windows platforms.
    </simpara>
   </note>
  </preface>
diff --git a/reference/gmp/functions/gmp-export.xml b/reference/gmp/functions/gmp-export.xml
index 7c37332520..5c9aa59c3e 100644
--- a/reference/gmp/functions/gmp-export.xml
+++ b/reference/gmp/functions/gmp-export.xml
@@ -43,7 +43,7 @@
      <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       Default value is GMP_MSW_FIRST | GMP_NATIVE_ENDIAN.
+       Default value is <constant>GMP_MSW_FIRST</constant> | <constant>GMP_NATIVE_ENDIAN</constant>.
       </para>
      </listitem>
     </varlistentry>   
diff --git a/reference/gmp/functions/gmp-import.xml b/reference/gmp/functions/gmp-import.xml
index f849b86d47..e19c0da814 100644
--- a/reference/gmp/functions/gmp-import.xml
+++ b/reference/gmp/functions/gmp-import.xml
@@ -43,7 +43,7 @@
      <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       Default value is GMP_MSW_FIRST | GMP_NATIVE_ENDIAN.
+       Default value is <constant>GMP_MSW_FIRST</constant> | <constant>GMP_NATIVE_ENDIAN</constant>.
       </para>
      </listitem>
     </varlistentry>   
diff --git a/reference/gmp/functions/gmp-sign.xml b/reference/gmp/functions/gmp-sign.xml
index dce33a92d5..a3c0df8cdd 100644
--- a/reference/gmp/functions/gmp-sign.xml
+++ b/reference/gmp/functions/gmp-sign.xml
@@ -25,8 +25,7 @@
      <term><parameter>num</parameter></term>
      <listitem>
       <para>
-       Either a GMP number <type>resource</type> in PHP 5.5 and earlier,
-       a <classname>GMP</classname> object in PHP 5.6 and later, or a numeric
+       Either a <classname>GMP</classname> object, or a numeric
        string provided that it is possible to convert the latter to an
        <type>int</type>.
       </para>
diff --git a/reference/gmp/functions/gmp-testbit.xml b/reference/gmp/functions/gmp-testbit.xml
index d996e4ea92..ef0f8ec473 100644
--- a/reference/gmp/functions/gmp-testbit.xml
+++ b/reference/gmp/functions/gmp-testbit.xml
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if the bit is set in resource <parameter>$a</parameter>, 
+   Returns &true; if the bit is set in <parameter>num</parameter>, 
    otherwise &false;.
   </para>
  </refsect1>
diff --git a/reference/gmp/setup.xml b/reference/gmp/setup.xml
index 7c3f8e7c7e..6abae064be 100644
--- a/reference/gmp/setup.xml
+++ b/reference/gmp/setup.xml
@@ -30,17 +30,6 @@
  </section>
  <!-- }}} -->
 
- <!-- {{{ Resources -->
- <section xml:id="gmp.resources">
-  &reftitle.resources;
-  <para>
-   Prior to PHP 5.6, most GMP functions operate on or return GMP number
-   resources. PHP 5.6 onwards uses <classname>GMP</classname> objects in place
-   of GMP number resources.
-  </para>
- </section>
- <!-- }}} -->
-
 </chapter>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/gnupg/book.xml b/reference/gnupg/book.xml
index 162af3bf9b..3cf61fd4dd 100644
--- a/reference/gnupg/book.xml
+++ b/reference/gnupg/book.xml
@@ -3,6 +3,7 @@
 <!-- State: beta --> 
 
 <book xml:id="book.gnupg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>GNU Privacy Guard</title>
  <titleabbrev>GnuPG</titleabbrev>
  
diff --git a/reference/hash/book.xml b/reference/hash/book.xml
index ab67472c88..4c6ffab544 100644
--- a/reference/hash/book.xml
+++ b/reference/hash/book.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- State: experimental -->
- 
 <book xml:id="book.hash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="core" ?>
  <title>HASH Message Digest Framework</title>
@@ -23,7 +21,6 @@
  &reference.hash.reference;
 
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -44,4 +41,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/hash/functions/hash-algos.xml b/reference/hash/functions/hash-algos.xml
index 8a36714f89..d71b0c496a 100644
--- a/reference/hash/functions/hash-algos.xml
+++ b/reference/hash/functions/hash-algos.xml
@@ -13,6 +13,11 @@
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/hash/functions/hash-hmac-algos.xml b/reference/hash/functions/hash-hmac-algos.xml
index 9dfbb6cc6b..3a4ae1291f 100644
--- a/reference/hash/functions/hash-hmac-algos.xml
+++ b/reference/hash/functions/hash-hmac-algos.xml
@@ -15,6 +15,11 @@
   </methodsynopsis>
  </refsect1><!-- }}} -->
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
   <para>
diff --git a/reference/hrtime/book.xml b/reference/hrtime/book.xml
index d1e0f532a9..cce8f0680c 100644
--- a/reference/hrtime/book.xml
+++ b/reference/hrtime/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.hrtime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="bundled" ?>
  <title>High resolution timing</title>
  <titleabbrev>HRTime</titleabbrev>
 
diff --git a/reference/ibase/book.xml b/reference/ibase/book.xml
index a3885704e3..b424561aa6 100644
--- a/reference/ibase/book.xml
+++ b/reference/ibase/book.xml
@@ -2,12 +2,18 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.ibase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>Firebird/InterBase</title>
  
  <!-- {{{ preface -->
  <preface xml:id="intro.ibase">
   &reftitle.intro;
+  <warning>
+   <para>
+    &pecl.info.dead.git;
+    <link xlink:href="&url.php.git.mirror;pecl-database-interbase">&url.php.git.mirror;pecl-database-interbase</link>.
+   </para>
+  </warning>
   <para>
    Firebird is a relational database offering many ISO SQL-2003 features
    that runs on Linux, Windows, and a variety of Unix platforms. Firebird
diff --git a/reference/ibase/functions/ibase-errcode.xml b/reference/ibase/functions/ibase-errcode.xml
index 76a0e51bf6..916d1bad4f 100644
--- a/reference/ibase/functions/ibase-errcode.xml
+++ b/reference/ibase/functions/ibase-errcode.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/ibase/functions/ibase-errmsg.xml b/reference/ibase/functions/ibase-errmsg.xml
index 434f659b59..bb1236c419 100644
--- a/reference/ibase/functions/ibase-errmsg.xml
+++ b/reference/ibase/functions/ibase-errmsg.xml
@@ -18,6 +18,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/ibm_db2/book.xml b/reference/ibm_db2/book.xml
index c39ea1ca86..24df3ec6e6 100644
--- a/reference/ibm_db2/book.xml
+++ b/reference/ibm_db2/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.ibm-db2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>IBM DB2, Cloudscape and Apache Derby</title>
  <titleabbrev>IBM DB2</titleabbrev>
  
diff --git a/reference/ibm_db2/functions/db2-prepare.xml b/reference/ibm_db2/functions/db2-prepare.xml
index e59f82a930..14224acfa6 100644
--- a/reference/ibm_db2/functions/db2-prepare.xml
+++ b/reference/ibm_db2/functions/db2-prepare.xml
@@ -155,7 +155,7 @@ if ($stmt) {
      </para>
      <para>
       In the following example, assume that the PHP script has been placed on
-      a publically accessible Web server and the application provides
+      a publicly accessible Web server and the application provides
       different levels of access for different users. We shall also assume
       that the application issues an SQL statement that updates the privilege
       level of a newly registered user to the lowest level, taking the user ID
diff --git a/reference/iconv/functions/iconv-mime-decode-headers.xml b/reference/iconv/functions/iconv-mime-decode-headers.xml
index 0fc1b063ae..f17a1da41e 100644
--- a/reference/iconv/functions/iconv-mime-decode-headers.xml
+++ b/reference/iconv/functions/iconv-mime-decode-headers.xml
@@ -105,7 +105,7 @@
    If more than one field of the same name are present,
    <function>iconv_mime_decode_headers</function> automatically incorporates
    them into a numerically indexed array in the order of occurrence.
-   Note that header names are are not <emphasis>case-insensitive</emphasis>.
+   Note that header names are not <emphasis>case-insensitive</emphasis>.
   </para>
  </refsect1>
 
diff --git a/reference/image/functions/gd-info.xml b/reference/image/functions/gd-info.xml
index 0f53436ead..f32da9c001 100644
--- a/reference/image/functions/gd-info.xml
+++ b/reference/image/functions/gd-info.xml
@@ -16,6 +16,12 @@
    library.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/image/functions/image2wbmp.xml b/reference/image/functions/image2wbmp.xml
index 8b29f8889a..2e946ff94d 100644
--- a/reference/image/functions/image2wbmp.xml
+++ b/reference/image/functions/image2wbmp.xml
@@ -27,7 +27,15 @@
   &reftitle.parameters;
   <para>
    <variablelist>
-    &gd.image.description;
+    <varlistentry>
+     <term><parameter>image</parameter></term>
+     <listitem>
+      <para>
+       An image resource, returned by one of the image creation functions,
+       such as <function>imagecreatetruecolor</function>.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>filename</parameter></term>
      <listitem>
diff --git a/reference/image/functions/imageaffine.xml b/reference/image/functions/imageaffine.xml
index 5b09ac2aa1..b0162e1fdb 100644
--- a/reference/image/functions/imageaffine.xml
+++ b/reference/image/functions/imageaffine.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imageaffine" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imageaffine</refname>
@@ -10,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>imageaffine</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imageaffine</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>affine</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>clip</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>clip</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
 
@@ -39,7 +38,7 @@
     <term><parameter>clip</parameter></term>
     <listitem>
      <para>
-      Array with keys "x", "y", "width" and "height".
+      Array with keys "x", "y", "width" and "height"; or &null;.
      </para>
     </listitem>
    </varlistentry>
@@ -49,12 +48,40 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Return affined image resource on success&return.falseforfailure;.
+   Return affined image object on success&return.falseforfailure;.
   </para>
  </refsect1>
 
-</refentry>
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>clip</parameter> is now nullable.
+      </entry>
+     </row>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 
+</refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageaffinematrixconcat.xml b/reference/image/functions/imageaffinematrixconcat.xml
index b12364740f..ff6e533f25 100644
--- a/reference/image/functions/imageaffinematrixconcat.xml
+++ b/reference/image/functions/imageaffinematrixconcat.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imageaffinematrixconcat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imageaffinematrixconcat</refname>
@@ -11,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>array</type><type>false</type></type><methodname>imageaffinematrixconcat</methodname>
-   <methodparam><type>array</type><parameter>m1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>m2</parameter></methodparam>
+   <methodparam><type>array</type><parameter>matrix1</parameter></methodparam>
+   <methodparam><type>array</type><parameter>matrix2</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns the concatenation of two affine transformation matrices,
@@ -25,7 +24,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>m1</parameter></term>
+    <term><parameter>matrix1</parameter></term>
     <listitem>
      <para>
       An affine transformation matrix (an array with keys
@@ -34,7 +33,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>m2</parameter></term>
+    <term><parameter>matrix2</parameter></term>
     <listitem>
      <para>
       An affine transformation matrix (an array with keys
@@ -96,7 +95,6 @@ Array
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageaffinematrixget.xml b/reference/image/functions/imageaffinematrixget.xml
index 4d84413c2b..c210f5b016 100644
--- a/reference/image/functions/imageaffinematrixget.xml
+++ b/reference/image/functions/imageaffinematrixget.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imageaffinematrixget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imageaffinematrixget</refname>
@@ -12,7 +11,7 @@
   <methodsynopsis>
    <type class="union"><type>array</type><type>false</type></type><methodname>imageaffinematrixget</methodname>
    <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>options</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>float</type></type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns an affine transformation matrix.
@@ -98,7 +97,6 @@ Array
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagealphablending.xml b/reference/image/functions/imagealphablending.xml
index 360b734f87..e4efb63dba 100644
--- a/reference/image/functions/imagealphablending.xml
+++ b/reference/image/functions/imagealphablending.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagealphablending</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>blendmode</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagealphablending</function> allows for two different
@@ -31,7 +31,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>blendmode</parameter></term>
+     <term><parameter>enable</parameter></term>
      <listitem>
       <para>
        Whether to enable the blending mode or not. On true color images 
@@ -48,6 +48,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -75,7 +93,6 @@ imagedestroy($im);
   </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageantialias.xml b/reference/image/functions/imageantialias.xml
index 891138ff0f..a06aefb749 100644
--- a/reference/image/functions/imageantialias.xml
+++ b/reference/image/functions/imageantialias.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageantialias</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>enabled</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
   </methodsynopsis>
   <para>
    Activate the fast drawing antialiased methods for lines and wired polygons.
@@ -33,7 +33,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>enabled</parameter></term>
+     <term><parameter>enable</parameter></term>
      <listitem>
       <para>
        Whether to enable antialiasing or not.
@@ -61,6 +61,7 @@
      </row>
     </thead>
     <tbody>
+     &gd.changelog.image-param;
      <row>
       <entry>7.2.0</entry>
       <entry>
@@ -127,7 +128,6 @@ imagedestroy($normal);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagearc.xml b/reference/image/functions/imagearc.xml
index c08696ac69..a74a514342 100644
--- a/reference/image/functions/imagearc.xml
+++ b/reference/image/functions/imagearc.xml
@@ -9,13 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagearc</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cx</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cy</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_x</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-   <methodparam><type>int</type><parameter>end</parameter></methodparam>
+   <methodparam><type>int</type><parameter>start_angle</parameter></methodparam>
+   <methodparam><type>int</type><parameter>end_angle</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -29,7 +29,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>cx</parameter></term>
+     <term><parameter>center_x</parameter></term>
      <listitem>
       <para>
        x-coordinate of the center.
@@ -37,7 +37,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>cy</parameter></term>
+     <term><parameter>center_y</parameter></term>
      <listitem>
       <para>
        y-coordinate of the center.
@@ -61,7 +61,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>start_angle</parameter></term>
      <listitem>
       <para>
        The arc start angle, in degrees.
@@ -69,7 +69,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>end</parameter></term>
+     <term><parameter>end_angle</parameter></term>
      <listitem>
       <para>
        The arc end angle, in degrees.
@@ -95,6 +95,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -150,7 +168,6 @@ imagedestroy($img);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagebmp.xml b/reference/image/functions/imagebmp.xml
index 4dedacad7b..f111498b20 100644
--- a/reference/image/functions/imagebmp.xml
+++ b/reference/image/functions/imagebmp.xml
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagebmp</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>compressed</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -25,7 +25,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
       <note>
@@ -56,6 +56,30 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The type of <parameter>compressed</parameter> is &boolean; now; formerly it was &integer;.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -82,7 +106,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagechar.xml b/reference/image/functions/imagechar.xml
index 323d60f8d1..f1cfb97a74 100644
--- a/reference/image/functions/imagechar.xml
+++ b/reference/image/functions/imagechar.xml
@@ -9,16 +9,16 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagechar</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>font</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>string</type><parameter>c</parameter></methodparam>
+   <methodparam><type>string</type><parameter>char</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagechar</function> draws the first character of
-   <parameter>c</parameter> in the image identified by
+   <parameter>char</parameter> in the image identified by
    <parameter>image</parameter> with its upper-left at
    <parameter>x</parameter>,<parameter>y</parameter> (top left is 0,
    0) with the color <parameter>color</parameter>.
@@ -47,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>c</parameter></term>
+     <term><parameter>char</parameter></term>
      <listitem>
       <para>
        The character to draw.
@@ -71,6 +71,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -114,7 +132,6 @@ imagepng($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecharup.xml b/reference/image/functions/imagecharup.xml
index 4cfc043c41..484d5ab83f 100644
--- a/reference/image/functions/imagecharup.xml
+++ b/reference/image/functions/imagecharup.xml
@@ -9,15 +9,15 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecharup</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>font</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>string</type><parameter>c</parameter></methodparam>
+   <methodparam><type>string</type><parameter>char</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Draws the character <parameter>c</parameter> vertically at the specified
+   Draws the character <parameter>char</parameter> vertically at the specified
    coordinate on the given <parameter>image</parameter>.
   </para>
  </refsect1>
@@ -44,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>c</parameter></term>
+     <term><parameter>char</parameter></term>
      <listitem>
       <para>
        The character to draw.
@@ -68,6 +68,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -111,7 +129,6 @@ imagepng($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorallocate.xml b/reference/image/functions/imagecolorallocate.xml
index 5ca879bd15..df901956c2 100644
--- a/reference/image/functions/imagecolorallocate.xml
+++ b/reference/image/functions/imagecolorallocate.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>imagecolorallocate</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>imagecolorallocate</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -66,6 +66,24 @@
   </para>
   &return.falseproblem;
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -102,7 +120,6 @@ $black = imagecolorallocate($im, 0x00, 0x00, 0x00);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorallocatealpha.xml b/reference/image/functions/imagecolorallocatealpha.xml
index 2ff6c6914b..70380fec3f 100644
--- a/reference/image/functions/imagecolorallocatealpha.xml
+++ b/reference/image/functions/imagecolorallocatealpha.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>imagecolorallocatealpha</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>imagecolorallocatealpha</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -67,6 +67,24 @@
   </para>
   &return.falseproblem;
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -154,7 +172,6 @@ int(0)
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorat.xml b/reference/image/functions/imagecolorat.xml
index c8d0762a56..65b9afcc05 100644
--- a/reference/image/functions/imagecolorat.xml
+++ b/reference/image/functions/imagecolorat.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>int</type><type>false</type></type><methodname>imagecolorat</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
   </methodsynopsis>
@@ -55,6 +55,24 @@
   </para>
   &return.falseproblem;
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -123,7 +141,6 @@ array(4) {
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorclosest.xml b/reference/image/functions/imagecolorclosest.xml
index 0ab2d2554b..be1cf5a455 100644
--- a/reference/image/functions/imagecolorclosest.xml
+++ b/reference/image/functions/imagecolorclosest.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorclosest</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -60,6 +60,24 @@
    the specified one
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -116,7 +134,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorclosestalpha.xml b/reference/image/functions/imagecolorclosestalpha.xml
index f3e2891f9f..2337d935be 100644
--- a/reference/image/functions/imagecolorclosestalpha.xml
+++ b/reference/image/functions/imagecolorclosestalpha.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorclosestalpha</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -122,7 +122,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorclosesthwb.xml b/reference/image/functions/imagecolorclosesthwb.xml
index 0f4afd0389..db7896eb9d 100644
--- a/reference/image/functions/imagecolorclosesthwb.xml
+++ b/reference/image/functions/imagecolorclosesthwb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imagecolorclosesthwb' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imagecolorclosesthwb" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecolorclosesthwb</refname>
   <refpurpose>Get the index of the color which has the hue, white and blackness</refpurpose>
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorclosesthwb</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -53,6 +53,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -86,7 +103,6 @@ HWB: 33
    </simplelist>
   </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolordeallocate.xml b/reference/image/functions/imagecolordeallocate.xml
index bfb298c90a..c3879cf3af 100644
--- a/reference/image/functions/imagecolordeallocate.xml
+++ b/reference/image/functions/imagecolordeallocate.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecolordeallocate</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -40,6 +40,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -64,7 +82,6 @@ imagecolordeallocate($im, $white);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorexact.xml b/reference/image/functions/imagecolorexact.xml
index ce091deeaf..6dfbd665b8 100644
--- a/reference/image/functions/imagecolorexact.xml
+++ b/reference/image/functions/imagecolorexact.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorexact</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -53,6 +53,24 @@
    color does not exist.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -97,7 +115,6 @@ Array
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorexactalpha.xml b/reference/image/functions/imagecolorexactalpha.xml
index c9fac77004..22edccc6a4 100644
--- a/reference/image/functions/imagecolorexactalpha.xml
+++ b/reference/image/functions/imagecolorexactalpha.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorexactalpha</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -65,6 +65,24 @@
    image, or -1 if the color does not exist in the image's palette.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -111,7 +129,6 @@ Array
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolormatch.xml b/reference/image/functions/imagecolormatch.xml
index 0ee95ad76c..5dd0732fee 100644
--- a/reference/image/functions/imagecolormatch.xml
+++ b/reference/image/functions/imagecolormatch.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecolormatch</methodname>
-   <methodparam><type>resource</type><parameter>image1</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>image2</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image1</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image2</parameter></methodparam>
   </methodsynopsis>
   <para>
    Makes the colors of the palette version of an image more closely match the true color version.
@@ -24,7 +24,7 @@
      <term><parameter>image1</parameter></term>
      <listitem>
       <para>
-       A truecolor image resource.
+       A truecolor image object.
       </para>
      </listitem>
     </varlistentry>
@@ -32,7 +32,7 @@
      <term><parameter>image2</parameter></term>
      <listitem>
       <para>
-       A palette image resource pointing to an image that has the same
+       A palette image object pointing to an image that has the same
        size as <parameter>image1</parameter>.
       </para>
      </listitem>
@@ -46,6 +46,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>image1</parameter> and <parameter>image2</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -83,7 +108,6 @@ imagedestroy($im2);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorresolve.xml b/reference/image/functions/imagecolorresolve.xml
index cc94fcfc1b..97ca00e370 100644
--- a/reference/image/functions/imagecolorresolve.xml
+++ b/reference/image/functions/imagecolorresolve.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorresolve</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -53,6 +53,24 @@
    Returns a color index.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -94,7 +112,6 @@ Array
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorresolvealpha.xml b/reference/image/functions/imagecolorresolvealpha.xml
index d5f756ca39..7d978486ce 100644
--- a/reference/image/functions/imagecolorresolvealpha.xml
+++ b/reference/image/functions/imagecolorresolvealpha.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorresolvealpha</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -65,6 +65,24 @@
    Returns a color index.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -107,7 +125,6 @@ Array
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorset.xml b/reference/image/functions/imagecolorset.xml
index f60dae7083..416c696885 100644
--- a/reference/image/functions/imagecolorset.xml
+++ b/reference/image/functions/imagecolorset.xml
@@ -8,9 +8,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>void</type><methodname>imagecolorset</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
+   <type class="union"><type>bool</type><type>null</type></type><methodname>imagecolorset</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>color</parameter></methodparam>
    <methodparam><type>int</type><parameter>red</parameter></methodparam>
    <methodparam><type>int</type><parameter>green</parameter></methodparam>
    <methodparam><type>int</type><parameter>blue</parameter></methodparam>
@@ -29,7 +29,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>index</parameter></term>
+     <term><parameter>color</parameter></term>
      <listitem>
       <para>
        An index in the palette.
@@ -68,10 +68,27 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.void;
+   The function returns &null; on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -110,7 +127,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorsforindex.xml b/reference/image/functions/imagecolorsforindex.xml
index b5baa7dd37..646763ac4f 100644
--- a/reference/image/functions/imagecolorsforindex.xml
+++ b/reference/image/functions/imagecolorsforindex.xml
@@ -8,9 +8,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imagecolorsforindex</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imagecolorsforindex</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the color for a specified index.
@@ -22,7 +22,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>index</parameter></term>
+     <term><parameter>color</parameter></term>
      <listitem>
       <para>
        The color index.
@@ -36,9 +36,28 @@
   &reftitle.returnvalues;
   <para>
    Returns an associative array with red, green, blue and alpha keys that
-   contain the appropriate values for the specified color index.
+   contain the appropriate values for the specified color index,
+   &return.falseforfailure;.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -88,7 +107,6 @@ Array
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolorstotal.xml b/reference/image/functions/imagecolorstotal.xml
index 42674ca298..c5fdaa2693 100644
--- a/reference/image/functions/imagecolorstotal.xml
+++ b/reference/image/functions/imagecolorstotal.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolorstotal</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns the number of colors in an image palette.
@@ -30,6 +30,24 @@
    truecolor images.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -66,7 +84,6 @@ Total colors in image: 128
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecolortransparent.xml b/reference/image/functions/imagecolortransparent.xml
index 8172a7e9a7..bcbcb31dbc 100644
--- a/reference/image/functions/imagecolortransparent.xml
+++ b/reference/image/functions/imagecolortransparent.xml
@@ -9,12 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagecolortransparent</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>imagecolortransparent</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>color</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Gets or sets the transparent color in the given <parameter>image</parameter>.
@@ -41,10 +37,34 @@
   <para>
    The identifier of the new (or current, if none is specified)
    transparent color is returned. If <parameter>color</parameter>
-   is not specified, and the image has no transparent color, the
-   returned identifier will be -1.
+   is &null;, and the image has no transparent color, the
+   returned identifier will be <literal>-1</literal>.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>color</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -98,7 +118,6 @@ imagedestroy($im);
   </note>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageconvolution.xml b/reference/image/functions/imageconvolution.xml
index 2158ed6188..e7ecf8bbdc 100644
--- a/reference/image/functions/imageconvolution.xml
+++ b/reference/image/functions/imageconvolution.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageconvolution</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>matrix</parameter></methodparam>
-   <methodparam><type>float</type><parameter>div</parameter></methodparam>
+   <methodparam><type>float</type><parameter>divisor</parameter></methodparam>
    <methodparam><type>float</type><parameter>offset</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>div</parameter></term>
+     <term><parameter>divisor</parameter></term>
      <listitem>
       <para>
        The divisor of the result of the convolution, used for normalization.
@@ -57,6 +57,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -126,7 +144,6 @@ imagepng($image, null, 9);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecopy.xml b/reference/image/functions/imagecopy.xml
index 393631c0ab..325dc0a82b 100644
--- a/reference/image/functions/imagecopy.xml
+++ b/reference/image/functions/imagecopy.xml
@@ -9,21 +9,21 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecopy</methodname>
-   <methodparam><type>resource</type><parameter>dst_im</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>src_im</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>dst_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>src_image</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_h</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_height</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Copy a part of <parameter>src_im</parameter> onto
-   <parameter>dst_im</parameter> starting at the x,y coordinates
+   Copy a part of <parameter>src_image</parameter> onto
+   <parameter>dst_image</parameter> starting at the x,y coordinates
    <parameter>src_x</parameter>, <parameter>src_y </parameter> with
-   a width of <parameter>src_w</parameter> and a height of
-   <parameter>src_h</parameter>.  The portion defined will be copied
+   a width of <parameter>src_width</parameter> and a height of
+   <parameter>src_height</parameter>.  The portion defined will be copied
    onto the x,y coordinates, <parameter>dst_x</parameter> and
    <parameter>dst_y</parameter>.
   </para>
@@ -33,13 +33,13 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>dst_im</parameter></term>
+     <term><parameter>dst_image</parameter></term>
      <listitem>
       <para>&gd.image.destination;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_im</parameter></term>
+     <term><parameter>src_image</parameter></term>
      <listitem>
       <para>&gd.image.source;</para>
      </listitem>
@@ -77,13 +77,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_w</parameter></term>
+     <term><parameter>src_width</parameter></term>
      <listitem>
       <para>&gd.source.width;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_h</parameter></term>
+     <term><parameter>src_height</parameter></term>
      <listitem>
       <para>&gd.source.height;</para>
      </listitem>
@@ -97,6 +97,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>dst_image</parameter> and <parameter>src_image</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -140,7 +165,6 @@ imagedestroy($src);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecopymerge.xml b/reference/image/functions/imagecopymerge.xml
index c87fbe012c..b150ef3719 100644
--- a/reference/image/functions/imagecopymerge.xml
+++ b/reference/image/functions/imagecopymerge.xml
@@ -9,22 +9,22 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecopymerge</methodname>
-   <methodparam><type>resource</type><parameter>dst_im</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>src_im</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>dst_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>src_image</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_h</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_height</parameter></methodparam>
    <methodparam><type>int</type><parameter>pct</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Copy a part of <parameter>src_im</parameter> onto
-   <parameter>dst_im</parameter> starting at the x,y coordinates
+   Copy a part of <parameter>src_image</parameter> onto
+   <parameter>dst_image</parameter> starting at the x,y coordinates
    <parameter>src_x</parameter>, <parameter>src_y </parameter> with
-   a width of <parameter>src_w</parameter> and a height of
-   <parameter>src_h</parameter>.  The portion defined will be copied
+   a width of <parameter>src_width</parameter> and a height of
+   <parameter>src_height</parameter>.  The portion defined will be copied
    onto the x,y coordinates, <parameter>dst_x</parameter> and
    <parameter>dst_y</parameter>.
   </para>
@@ -34,13 +34,13 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>dst_im</parameter></term>
+     <term><parameter>dst_image</parameter></term>
      <listitem>
       <para>&gd.image.destination;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_im</parameter></term>
+     <term><parameter>src_image</parameter></term>
      <listitem>
       <para>&gd.image.source;</para>
      </listitem>
@@ -78,13 +78,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_w</parameter></term>
+     <term><parameter>src_width</parameter></term>
      <listitem>
       <para>&gd.source.width;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_h</parameter></term>
+     <term><parameter>src_height</parameter></term>
      <listitem>
       <para>&gd.source.height;</para>
      </listitem>
@@ -111,6 +111,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>dst_image</parameter> and <parameter>src_image</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -139,7 +164,6 @@ imagedestroy($src);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecopymergegray.xml b/reference/image/functions/imagecopymergegray.xml
index 4c43abcda4..454395d984 100644
--- a/reference/image/functions/imagecopymergegray.xml
+++ b/reference/image/functions/imagecopymergegray.xml
@@ -9,22 +9,22 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecopymergegray</methodname>
-   <methodparam><type>resource</type><parameter>dst_im</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>src_im</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>dst_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>src_image</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_h</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_height</parameter></methodparam>
    <methodparam><type>int</type><parameter>pct</parameter></methodparam>
   </methodsynopsis>
   <para>
-   <function>imagecopymergegray</function> copy a part of <parameter>src_im</parameter> onto
-   <parameter>dst_im</parameter> starting at the x,y coordinates
+   <function>imagecopymergegray</function> copy a part of <parameter>src_image</parameter> onto
+   <parameter>dst_image</parameter> starting at the x,y coordinates
    <parameter>src_x</parameter>, <parameter>src_y </parameter> with
-   a width of <parameter>src_w</parameter> and a height of
-   <parameter>src_h</parameter>.  The portion defined will be copied
+   a width of <parameter>src_width</parameter> and a height of
+   <parameter>src_height</parameter>.  The portion defined will be copied
    onto the x,y coordinates, <parameter>dst_x</parameter> and
    <parameter>dst_y</parameter>.
   </para>
@@ -39,13 +39,13 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>dst_im</parameter></term>
+     <term><parameter>dst_image</parameter></term>
      <listitem>
       <para>&gd.image.destination;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_im</parameter></term>
+     <term><parameter>src_image</parameter></term>
      <listitem>
       <para>&gd.image.source;</para>
      </listitem>
@@ -83,13 +83,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_w</parameter></term>
+     <term><parameter>src_width</parameter></term>
      <listitem>
       <para>&gd.source.width;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_h</parameter></term>
+     <term><parameter>src_height</parameter></term>
      <listitem>
       <para>&gd.source.height;</para>
      </listitem>
@@ -98,7 +98,7 @@
      <term><parameter>pct</parameter></term>
      <listitem>
       <para>
-        The <parameter>src_im</parameter> will be changed to grayscale according 
+        The <parameter>src_image</parameter> will be changed to grayscale according 
         to <parameter>pct</parameter> where 0 is fully grayscale and 100 is 
         unchanged. When <parameter>pct</parameter> = 100 this function behaves 
         identically to <function>imagecopy</function> for pallete images, except for
@@ -116,6 +116,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>dst_image</parameter> and <parameter>src_image</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -144,7 +169,6 @@ imagedestroy($src);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecopyresampled.xml b/reference/image/functions/imagecopyresampled.xml
index 10a8aad547..413a525c81 100644
--- a/reference/image/functions/imagecopyresampled.xml
+++ b/reference/image/functions/imagecopyresampled.xml
@@ -9,16 +9,16 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecopyresampled</methodname>
-   <methodparam><type>resource</type><parameter>dst_image</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>src_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>dst_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>src_image</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>dst_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>dst_h</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_h</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dst_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dst_height</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_height</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagecopyresampled</function> copies a rectangular
@@ -29,10 +29,10 @@
   <para>
    In other words, <function>imagecopyresampled</function> will take a 
    rectangular area from <parameter>src_image</parameter> of width 
-   <parameter>src_w</parameter> and height <parameter>src_h</parameter> at 
+   <parameter>src_width</parameter> and height <parameter>src_height</parameter> at 
    position (<parameter>src_x</parameter>,<parameter>src_y</parameter>) 
    and place it in a rectangular area of <parameter>dst_image</parameter> 
-   of width <parameter>dst_w</parameter> and height <parameter>dst_h</parameter>
+   of width <parameter>dst_width</parameter> and height <parameter>dst_height</parameter>
    at position (<parameter>dst_x</parameter>,<parameter>dst_y</parameter>).
   </para>
   <para>
@@ -94,7 +94,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dst_w</parameter></term>
+     <term><parameter>dst_width</parameter></term>
      <listitem>
       <para>
        Destination width.
@@ -102,7 +102,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dst_h</parameter></term>
+     <term><parameter>dst_height</parameter></term>
      <listitem>
       <para>
        Destination height.
@@ -110,13 +110,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_w</parameter></term>
+     <term><parameter>src_width</parameter></term>
      <listitem>
       <para>&gd.source.width;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_h</parameter></term>
+     <term><parameter>src_height</parameter></term>
      <listitem>
       <para>&gd.source.height;</para>
      </listitem>
@@ -130,6 +130,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>dst_image</parameter> and <parameter>src_image</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -249,7 +274,6 @@ imagejpeg($image_p, null, 100);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecopyresized.xml b/reference/image/functions/imagecopyresized.xml
index 66fcd02440..fd15885981 100644
--- a/reference/image/functions/imagecopyresized.xml
+++ b/reference/image/functions/imagecopyresized.xml
@@ -9,16 +9,16 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagecopyresized</methodname>
-   <methodparam><type>resource</type><parameter>dst_image</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>src_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>dst_image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>src_image</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>dst_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_x</parameter></methodparam>
    <methodparam><type>int</type><parameter>src_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>dst_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>dst_h</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_w</parameter></methodparam>
-   <methodparam><type>int</type><parameter>src_h</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dst_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dst_height</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_width</parameter></methodparam>
+   <methodparam><type>int</type><parameter>src_height</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagecopyresized</function> copies a rectangular
@@ -29,10 +29,10 @@
   <para>
    In other words, <function>imagecopyresized</function> will take a 
    rectangular area from <parameter>src_image</parameter> of width 
-   <parameter>src_w</parameter> and height <parameter>src_h</parameter> at 
+   <parameter>src_width</parameter> and height <parameter>src_height</parameter> at 
    position (<parameter>src_x</parameter>,<parameter>src_y</parameter>) 
    and place it in a rectangular area of <parameter>dst_image</parameter> 
-   of width <parameter>dst_w</parameter> and height <parameter>dst_h</parameter>
+   of width <parameter>dst_width</parameter> and height <parameter>dst_height</parameter>
    at position (<parameter>dst_x</parameter>,<parameter>dst_y</parameter>).
   </para>
   <para>
@@ -94,7 +94,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dst_w</parameter></term>
+     <term><parameter>dst_width</parameter></term>
      <listitem>
       <para>
        Destination width.
@@ -102,7 +102,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dst_h</parameter></term>
+     <term><parameter>dst_height</parameter></term>
      <listitem>
       <para>
        Destination height.
@@ -110,13 +110,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_w</parameter></term>
+     <term><parameter>src_width</parameter></term>
      <listitem>
       <para>&gd.source.width;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>src_h</parameter></term>
+     <term><parameter>src_height</parameter></term>
      <listitem>
       <para>&gd.source.height;</para>
      </listitem>
@@ -130,6 +130,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>dst_image</parameter> and <parameter>src_image</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -205,7 +230,6 @@ imagejpeg($thumb);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreate.xml b/reference/image/functions/imagecreate.xml
index a4b15f4117..f40e5ba5b4 100644
--- a/reference/image/functions/imagecreate.xml
+++ b/reference/image/functions/imagecreate.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreate</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreate</methodname>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
@@ -53,6 +53,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -92,7 +116,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefrombmp.xml b/reference/image/functions/imagecreatefrombmp.xml
index 314d56d0df..41d3063257 100644
--- a/reference/image/functions/imagecreatefrombmp.xml
+++ b/reference/image/functions/imagecreatefrombmp.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefrombmp</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefrombmp</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -40,6 +40,29 @@
   <para>&gd.return.identifier;</para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -61,7 +84,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromgd.xml b/reference/image/functions/imagecreatefromgd.xml
index 658b3d1d3e..cd84fcaf1c 100644
--- a/reference/image/functions/imagecreatefromgd.xml
+++ b/reference/image/functions/imagecreatefromgd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imagecreatefromgd' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imagecreatefromgd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatefromgd</refname>
   <refpurpose>Create a new image from GD file or URL</refpurpose>
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromgd</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromgd</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -35,6 +35,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -47,7 +71,7 @@
 $im = @imagecreatefromgd('./test.gd');
 
 // Test if the image was loaded
-if(!is_resource($im))
+if(!$im)
 {
      die('Unable to load gd image!');
 }
@@ -70,7 +94,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromgd2.xml b/reference/image/functions/imagecreatefromgd2.xml
index e0e4fed1b0..6a4b9c32c5 100644
--- a/reference/image/functions/imagecreatefromgd2.xml
+++ b/reference/image/functions/imagecreatefromgd2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imagecreatefromgd2' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imagecreatefromgd2" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatefromgd2</refname>
   <refpurpose>Create a new image from GD2 file or URL</refpurpose>
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromgd2</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromgd2</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -35,6 +35,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -69,7 +93,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromgd2part.xml b/reference/image/functions/imagecreatefromgd2part.xml
index a9647fb631..7b9e5fc7a7 100644
--- a/reference/image/functions/imagecreatefromgd2part.xml
+++ b/reference/image/functions/imagecreatefromgd2part.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imagecreatefromgd2part' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imagecreatefromgd2part" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatefromgd2part</refname>
   <refpurpose>Create a new image from a given part of GD2 file or URL</refpurpose>
@@ -8,10 +8,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromgd2part</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromgd2part</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>srcX</parameter></methodparam>
-   <methodparam><type>int</type><parameter>srcY</parameter></methodparam>
+   <methodparam><type>int</type><parameter>x</parameter></methodparam>
+   <methodparam><type>int</type><parameter>y</parameter></methodparam>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>srcX</parameter></term>
+     <term><parameter>x</parameter></term>
      <listitem>
       <para>
        x-coordinate of source point.
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>srcY</parameter></term>
+     <term><parameter>y</parameter></term>
      <listitem>
       <para>
        y-coordinate of source point.
@@ -67,6 +67,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -104,7 +128,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromgif.xml b/reference/image/functions/imagecreatefromgif.xml
index 16e5cbc08b..53b91fd768 100644
--- a/reference/image/functions/imagecreatefromgif.xml
+++ b/reference/image/functions/imagecreatefromgif.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromgif</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromgif</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -18,7 +18,7 @@
   <caution>
    <para>
     When reading GIF files into memory, only the first frame 
-    is returned in the image resource pointer. The size of the image is not
+    is returned in the image object. The size of the image is not
     necessarily what is reported by <function>getimagesize</function>.
    </para>
   </caution>
@@ -43,6 +43,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -101,7 +125,6 @@ imagedestroy($img);
   </note>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromjpeg.xml b/reference/image/functions/imagecreatefromjpeg.xml
index 5a9e9bc212..e298ab0f37 100644
--- a/reference/image/functions/imagecreatefromjpeg.xml
+++ b/reference/image/functions/imagecreatefromjpeg.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromjpeg</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromjpeg</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -36,6 +36,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -84,7 +108,6 @@ imagedestroy($img);
   </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefrompng.xml b/reference/image/functions/imagecreatefrompng.xml
index 70ce1e0244..d4acea3447 100644
--- a/reference/image/functions/imagecreatefrompng.xml
+++ b/reference/image/functions/imagecreatefrompng.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefrompng</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefrompng</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -36,6 +36,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -84,7 +108,6 @@ imagedestroy($img);
   </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromstring.xml b/reference/image/functions/imagecreatefromstring.xml
index 7bb578f8ef..2c9781e29f 100644
--- a/reference/image/functions/imagecreatefromstring.xml
+++ b/reference/image/functions/imagecreatefromstring.xml
@@ -8,12 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromstring</methodname>
-   <methodparam><type>string</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromstring</methodname>
+   <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagecreatefromstring</function> returns an image identifier
-   representing the image obtained from the given <parameter>image</parameter>.
+   representing the image obtained from the given <parameter>data</parameter>.
    These types will be automatically detected if your build of PHP supports 
    them: JPEG, PNG, GIF, BMP, WBMP, GD2, and WEBP.
   </para>
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>image</parameter></term>
+     <term><parameter>data</parameter></term>
      <listitem>
       <para>
        A string containing the image data.
@@ -36,12 +36,20 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   An image resource will be returned on success. &false; is returned if
+   An image object will be returned on success. &false; is returned if
    the image type is unsupported, the data is not in a recognised format,
    or the image is corrupt and cannot be loaded.
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   <function>imagecreatefromstring</function> raises an E_WARNING level error,
+   if the data is not in a recognized format.
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -53,6 +61,13 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
      <row>
       <entry>7.3.0</entry>
       <entry>
@@ -64,14 +79,6 @@
   </informaltable>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <function>imagecreatefromstring</function> raises an E_WARNING level error,
-   if the data is not in a recognized format.
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -118,7 +125,6 @@ else {
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromwbmp.xml b/reference/image/functions/imagecreatefromwbmp.xml
index b2fcf9e3db..0346527e11 100644
--- a/reference/image/functions/imagecreatefromwbmp.xml
+++ b/reference/image/functions/imagecreatefromwbmp.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromwbmp</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromwbmp</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -42,6 +42,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -83,7 +107,6 @@ imagedestroy($img);
   </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromwebp.xml b/reference/image/functions/imagecreatefromwebp.xml
index cc50a201ce..951fa298e7 100644
--- a/reference/image/functions/imagecreatefromwebp.xml
+++ b/reference/image/functions/imagecreatefromwebp.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromwebp</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromwebp</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -40,6 +40,29 @@
   <para>&gd.return.identifier;</para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -61,7 +84,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromxbm.xml b/reference/image/functions/imagecreatefromxbm.xml
index 589127309b..61c86bb266 100644
--- a/reference/image/functions/imagecreatefromxbm.xml
+++ b/reference/image/functions/imagecreatefromxbm.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromxbm</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromxbm</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -36,6 +36,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -57,7 +81,6 @@ imagedestroy($xbm);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatefromxpm.xml b/reference/image/functions/imagecreatefromxpm.xml
index f07edc8d20..c41db72d01 100644
--- a/reference/image/functions/imagecreatefromxpm.xml
+++ b/reference/image/functions/imagecreatefromxpm.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatefromxpm</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatefromxpm</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -37,6 +37,29 @@
   <para>&gd.return.identifier;</para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -69,7 +92,6 @@ imagedestroy($xpm);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecreatetruecolor.xml b/reference/image/functions/imagecreatetruecolor.xml
index 5ece5008a8..b74562f299 100644
--- a/reference/image/functions/imagecreatetruecolor.xml
+++ b/reference/image/functions/imagecreatetruecolor.xml
@@ -8,12 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagecreatetruecolor</methodname>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecreatetruecolor</methodname>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
   <para>
-   <function>imagecreatetruecolor</function> returns an image identifier
+   <function>imagecreatetruecolor</function> returns an image object
    representing a black image of the specified size.
   </para>
  </refsect1>
@@ -44,6 +44,30 @@
   &reftitle.returnvalues;
   <para>&gd.return.identifier;</para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -83,7 +107,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecrop.xml b/reference/image/functions/imagecrop.xml
index c51ca635ce..ccf545578a 100644
--- a/reference/image/functions/imagecrop.xml
+++ b/reference/image/functions/imagecrop.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imagecrop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imagecrop</refname>
@@ -10,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>imagecrop</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>array</type><parameter>rect</parameter></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecrop</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>array</type><parameter>rectangle</parameter></methodparam>
   </methodsynopsis>
   <para>
    Crops an image to the given rectangular area and returns the resulting image.
@@ -26,7 +25,7 @@
   <variablelist>
    &gd.image.description;
    <varlistentry>
-    <term><parameter>rect</parameter></term>
+    <term><parameter>rectangle</parameter></term>
     <listitem>
      <para>
       The cropping rectangle as <type>array</type> with keys
@@ -41,10 +40,34 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Return cropped image resource on success&return.falseforfailure;.
+   Return cropped image object on success&return.falseforfailure;.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="imagecrop.example.basic">
@@ -77,7 +100,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagecropauto.xml b/reference/image/functions/imagecropauto.xml
index dc8cc73792..bff4c1cf43 100644
--- a/reference/image/functions/imagecropauto.xml
+++ b/reference/image/functions/imagecropauto.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imagecropauto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imagecropauto</refname>
@@ -10,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>imagecropauto</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagecropauto</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>IMG_CROP_DEFAULT</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>threshold</parameter><initializer>.5</initializer></methodparam>
+   <methodparam choice="opt"><type>float</type><parameter>threshold</parameter><initializer>0.5</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>color</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -125,7 +124,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a cropped image resource on success&return.falseforfailure;.
+   Returns a cropped image object on success&return.falseforfailure;.
    If the complete image was cropped, <function>imagecrop</function> returns &false;.
   </para>
  </refsect1>
@@ -141,6 +140,14 @@
      </row>
     </thead>
     <tbody>
+     &gd.changelog.image-param;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
      <row>
       <entry>7.4.0</entry>
       <entry>
@@ -172,7 +179,7 @@
     <para>
      As noted in the return value section, <function>imagecropauto</function>
      returns &false; if the whole image
-     was cropped. In this example we have an image resource
+     was cropped. In this example we have an image object
      <literal>$im</literal> which should be automatically cropped only if there
      is something to crop; otherwise we want to proceed with the original image.
     </para>
@@ -180,7 +187,7 @@
 <![CDATA[
 <?php
 $cropped = imagecropauto($im, IMG_CROP_DEFAULT);
-if ($cropped !== false) { // in case a new image resource was returned
+if ($cropped !== false) { // in case a new image object was returned
     imagedestroy($im);    // we destroy the original image
     $im = $cropped;       // and assign the cropped image to $im
 }
@@ -199,7 +206,6 @@ if ($cropped !== false) { // in case a new image resource was returned
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagedashedline.xml b/reference/image/functions/imagedashedline.xml
index 24be32a554..b581c8c218 100644
--- a/reference/image/functions/imagedashedline.xml
+++ b/reference/image/functions/imagedashedline.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagedashedline</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x1</parameter></methodparam>
    <methodparam><type>int</type><parameter>y1</parameter></methodparam>
    <methodparam><type>int</type><parameter>x2</parameter></methodparam>
@@ -76,6 +76,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -149,7 +167,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagedestroy.xml b/reference/image/functions/imagedestroy.xml
index c29447f439..62d34254cd 100644
--- a/reference/image/functions/imagedestroy.xml
+++ b/reference/image/functions/imagedestroy.xml
@@ -9,10 +9,10 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagedestroy</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
-   <function>imagedestroy</function> frees any memory associated
+   Prior to PHP 8.0.0, <function>imagedestroy</function> freed any memory associated
    with image <parameter>image</parameter>.
   </para>
  </refsect1>
@@ -30,11 +30,35 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       This function is a <acronym>NOP</acronym> now.
+      </entry>
+     </row>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
-    <title>Using <function>imagedestroy</function> example</title>
+    <title>Using <function>imagedestroy</function> prior to PHP 8.0.0</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -52,7 +76,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageellipse.xml b/reference/image/functions/imageellipse.xml
index d8d25cc754..77d77b63af 100644
--- a/reference/image/functions/imageellipse.xml
+++ b/reference/image/functions/imageellipse.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageellipse</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cx</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cy</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_x</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
@@ -26,7 +26,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>cx</parameter></term>
+     <term><parameter>center_x</parameter></term>
      <listitem>
       <para>
        x-coordinate of the center.
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>cy</parameter></term>
+     <term><parameter>center_y</parameter></term>
      <listitem>
       <para>
        y-coordinate of the center.
@@ -74,6 +74,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -131,7 +149,6 @@ imagepng($image);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefill.xml b/reference/image/functions/imagefill.xml
index 598aa1f013..42e64560d0 100644
--- a/reference/image/functions/imagefill.xml
+++ b/reference/image/functions/imagefill.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefill</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
@@ -58,6 +58,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -96,7 +114,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefilledarc.xml b/reference/image/functions/imagefilledarc.xml
index cf3e02fa23..88a98bd0d2 100644
--- a/reference/image/functions/imagefilledarc.xml
+++ b/reference/image/functions/imagefilledarc.xml
@@ -9,13 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefilledarc</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cx</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cy</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_x</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-   <methodparam><type>int</type><parameter>end</parameter></methodparam>
+   <methodparam><type>int</type><parameter>start_angle</parameter></methodparam>
+   <methodparam><type>int</type><parameter>end_angle</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
    <methodparam><type>int</type><parameter>style</parameter></methodparam>
   </methodsynopsis>
@@ -30,7 +30,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>cx</parameter></term>
+     <term><parameter>center_x</parameter></term>
      <listitem>
       <para>
        x-coordinate of the center.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>cy</parameter></term>
+     <term><parameter>center_y</parameter></term>
      <listitem>
       <para>
        y-coordinate of the center.
@@ -62,7 +62,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>start_angle</parameter></term>
      <listitem>
       <para>
        The arc start angle, in degrees.
@@ -70,7 +70,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>end</parameter></term>
+     <term><parameter>end_angle</parameter></term>
      <listitem>
       <para>
        The arc end angle, in degrees.
@@ -119,6 +119,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -171,7 +189,6 @@ imagedestroy($image);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefilledellipse.xml b/reference/image/functions/imagefilledellipse.xml
index f96a34878b..6358620b1d 100644
--- a/reference/image/functions/imagefilledellipse.xml
+++ b/reference/image/functions/imagefilledellipse.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefilledellipse</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cx</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cy</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_x</parameter></methodparam>
+   <methodparam><type>int</type><parameter>center_y</parameter></methodparam>
    <methodparam><type>int</type><parameter>width</parameter></methodparam>
    <methodparam><type>int</type><parameter>height</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
@@ -27,7 +27,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>cx</parameter></term>
+     <term><parameter>center_x</parameter></term>
      <listitem>
       <para>
        x-coordinate of the center.
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>cy</parameter></term>
+     <term><parameter>center_y</parameter></term>
      <listitem>
       <para>
        y-coordinate of the center.
@@ -75,6 +75,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -129,7 +147,6 @@ imagepng($image);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefilledpolygon.xml b/reference/image/functions/imagefilledpolygon.xml
index 9059e820fc..cb9986e80f 100644
--- a/reference/image/functions/imagefilledpolygon.xml
+++ b/reference/image/functions/imagefilledpolygon.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefilledpolygon</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>points</parameter></methodparam>
    <methodparam><type>int</type><parameter>num_points</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
@@ -17,7 +17,7 @@
   <simpara>Alternative signature (as of PHP 8.0.0)</simpara>
   <methodsynopsis>
    <type>bool</type><methodname>imagefilledpolygon</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>points</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
@@ -70,6 +70,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -126,7 +144,6 @@ imagedestroy($image);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefilledrectangle.xml b/reference/image/functions/imagefilledrectangle.xml
index 1e8ddeab57..6d96971985 100644
--- a/reference/image/functions/imagefilledrectangle.xml
+++ b/reference/image/functions/imagefilledrectangle.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefilledrectangle</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x1</parameter></methodparam>
    <methodparam><type>int</type><parameter>y1</parameter></methodparam>
    <methodparam><type>int</type><parameter>x2</parameter></methodparam>
@@ -76,6 +76,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -108,7 +126,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefilltoborder.xml b/reference/image/functions/imagefilltoborder.xml
index 49b406c921..bfaa26474f 100644
--- a/reference/image/functions/imagefilltoborder.xml
+++ b/reference/image/functions/imagefilltoborder.xml
@@ -9,15 +9,15 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefilltoborder</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>border</parameter></methodparam>
+   <methodparam><type>int</type><parameter>border_color</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagefilltoborder</function> performs a flood fill
-   whose border color is defined by <parameter>border</parameter>.
+   whose border color is defined by <parameter>border_color</parameter>.
    The starting point for the fill is <parameter>x</parameter>,
    <parameter>y</parameter> (top left is 0, 0) and the region is
    filled with color <parameter>color</parameter>.
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>border</parameter></term>
+     <term><parameter>border_color</parameter></term>
      <listitem>
       <para>
        The border color. &gd.identifier.color;
@@ -69,6 +69,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -102,7 +120,7 @@ imagedestroy($im);
     <mediaobject>
      <alt>Output of example : Filling an ellipse with a color</alt>
      <imageobject>
-      <imagedata fileref="en/reference/image/figures/imagefilltoborder.png" />
+      <imagedata fileref="en/reference/image/figures/imagefilltoborder.png"/>
      </imageobject>
     </mediaobject>
    </example>
@@ -121,7 +139,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefilter.xml b/reference/image/functions/imagefilter.xml
index bffa5dc57c..e29b8a9b10 100644
--- a/reference/image/functions/imagefilter.xml
+++ b/reference/image/functions/imagefilter.xml
@@ -9,16 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagefilter</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>filtertype</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>arg1</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>arg2</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>arg3</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>arg4</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>filter</parameter></methodparam>
+   <methodparam rep="repeat"><type class="union"><type>array</type><type>int</type><type>float</type><type>bool</type></type><parameter>args</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagefilter</function> applies the given filter
-   <parameter>filtertype</parameter> on the <parameter>image</parameter>.
+   <parameter>filter</parameter> on the <parameter>image</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -27,10 +24,10 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>filtertype</parameter></term>
+     <term><parameter>filter</parameter></term>
      <listitem>
       <para>
-       <parameter>filtertype</parameter> can be one of the following:
+       <parameter>filter</parameter> can be one of the following:
        <itemizedlist>
         <listitem>
          <simpara>
@@ -50,14 +47,14 @@
         <listitem>
          <simpara>
           <constant>IMG_FILTER_BRIGHTNESS</constant>: Changes the brightness
-          of the image. Use <parameter>arg1</parameter> to set the level of
+          of the image. Use <parameter>args</parameter> to set the level of
           brightness. The range for the brightness is -255 to 255.
          </simpara>
         </listitem>
         <listitem>
          <simpara>
           <constant>IMG_FILTER_CONTRAST</constant>: Changes the contrast of
-          the image. Use <parameter>arg1</parameter> to set the level of
+          the image. Use <parameter>args</parameter> to set the level of
           contrast.
          </simpara>
         </listitem>
@@ -65,7 +62,7 @@
          <simpara>
           <constant>IMG_FILTER_COLORIZE</constant>: Like
           <constant>IMG_FILTER_GRAYSCALE</constant>, except you can specify the
-          color. Use <parameter>arg1</parameter>, <parameter>arg2</parameter> and
+          color. Use <parameter>args</parameter>, <parameter>arg2</parameter> and
           <parameter>arg3</parameter> in the form of
           <parameter>red</parameter>, <parameter>green</parameter>,
           <parameter>blue</parameter> and <parameter>arg4</parameter> for the
@@ -103,20 +100,20 @@
         <listitem>
          <simpara>
           <constant>IMG_FILTER_SMOOTH</constant>: Makes the image smoother.
-          Use <parameter>arg1</parameter> to set the level of smoothness.
+          Use <parameter>args</parameter> to set the level of smoothness.
          </simpara>
         </listitem>
         <listitem>
          <simpara>
           <constant>IMG_FILTER_PIXELATE</constant>: Applies pixelation effect 
-          to the image, use <parameter>arg1</parameter> to set the block size 
+          to the image, use <parameter>args</parameter> to set the block size 
           and <parameter>arg2</parameter> to set the pixelation effect mode.
          </simpara>
         </listitem>
         <listitem>
          <simpara>
           <constant>IMG_FILTER_SCATTER</constant>: Applies scatter effect 
-          to the image, use <parameter>arg1</parameter> and 
+          to the image, use <parameter>args</parameter> and 
           <parameter>arg2</parameter> to define the effect strength and 
           additionally <parameter>arg3</parameter> to only apply the 
           on select pixel colors.
@@ -127,7 +124,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arg1</parameter></term>
+     <term><parameter>args</parameter></term>
      <listitem>
       <para>
        <itemizedlist>
@@ -249,6 +246,7 @@
       </row>
      </thead>
      <tbody>
+      &gd.changelog.image-param;
       <row>
        <entry>7.4.0</entry>
        <entry>
@@ -470,7 +468,6 @@ imagedestroy($logo);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageflip.xml b/reference/image/functions/imageflip.xml
index 033aa6fd6c..b99af5a4e1 100644
--- a/reference/image/functions/imageflip.xml
+++ b/reference/image/functions/imageflip.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageflip</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -75,6 +75,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -153,7 +170,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageftbbox.xml b/reference/image/functions/imageftbbox.xml
index e84455ffdd..0fc1b1590d 100644
--- a/reference/image/functions/imageftbbox.xml
+++ b/reference/image/functions/imageftbbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imageftbbox' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imageftbbox" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imageftbbox</refname>
   <refpurpose>Give the bounding box of a text using fonts via freetype2</refpurpose>
@@ -8,12 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imageftbbox</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imageftbbox</methodname>
    <methodparam><type>float</type><parameter>size</parameter></methodparam>
    <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fontfile</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>extrainfo</parameter></methodparam>
+   <methodparam><type>string</type><parameter>font_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    This function calculates and returns the bounding box in pixels
@@ -21,9 +21,10 @@
   </para>
   <note>
    <para>
-    <function>imageftbbox</function> is an extended variant of
-    <function>imagettfbbox</function> which additionally supports the
-    <parameter>extrainfo</parameter>.
+    Prior to PHP 8.0.0, <function>imageftbbox</function> was an extended variant of
+    <function>imagettfbbox</function> which additionally supported the
+    <parameter>options</parameter>.
+    As of PHP 8.0.0, <function>imagettfbbox</function> is an alias of <function>imageftbbox</function>.
    </para>
   </note>
  </refsect1>
@@ -41,13 +42,13 @@
      <term><parameter>angle</parameter></term>
      <listitem>
       <para>
-       Angle in degrees in which <parameter>text</parameter> will be 
+       Angle in degrees in which <parameter>string</parameter> will be 
        measured.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>fontfile</parameter></term>
+     <term><parameter>font_filename</parameter></term>
      <listitem>
       <para>
        The name of the TrueType font file (can be a URL). Depending on
@@ -58,7 +59,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>text</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        The string to be measured.
@@ -66,11 +67,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>extrainfo</parameter></term>
+     <term><parameter>options</parameter></term>
      <listitem>
       <para>
        <table>
-       <title>Possible array indexes for <parameter>extrainfo</parameter></title>
+       <title>Possible array indexes for <parameter>options</parameter></title>
         <tgroup cols="2">
          <thead>
           <row>
@@ -144,6 +145,9 @@
    <parameter>angle</parameter>, so "upper left" means in the top left-hand 
    corner seeing the text horizontally.
   </para>
+  <para>
+   On failure, &false; is returned.
+  </para>
  </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
@@ -197,7 +201,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagefttext.xml b/reference/image/functions/imagefttext.xml
index 14236534aa..e8ae136f8a 100644
--- a/reference/image/functions/imagefttext.xml
+++ b/reference/image/functions/imagefttext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imagefttext' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imagefttext" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefttext</refname>
   <refpurpose>Write text to the image using fonts using FreeType 2</refpurpose>
@@ -8,22 +8,23 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imagefttext</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imagefttext</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>float</type><parameter>size</parameter></methodparam>
    <methodparam><type>float</type><parameter>angle</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fontfile</parameter></methodparam>
+   <methodparam><type>string</type><parameter>font_filename</parameter></methodparam>
    <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>extrainfo</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <note>
    <para>
-    <function>imagefttext</function> is an extended variant of
-    <function>imagettftext</function> which additionally supports the
-    <parameter>extrainfo</parameter>.
+    Prior to PHP 8.0.0, <function>imagefttext</function> was an extended variant of
+    <function>imagettftext</function> which additionally supported the
+    <parameter>options</parameter>.
+    As of PHP 8.0.0, <function>imagettftext</function> is an alias of <function>imagefttext</function>.
    </para>
   </note>
  </refsect1>
@@ -83,14 +84,14 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>fontfile</parameter></term>
+     <term><parameter>font_filename</parameter></term>
      <listitem>
       <para>
        The path to the TrueType font you wish to use.
       </para>
       <para>
        Depending on which version of the GD library PHP is using, <emphasis>when
-       <parameter>fontfile</parameter> does not begin with a leading
+       <parameter>font_filename</parameter> does not begin with a leading
        <literal>/</literal> then <literal>.ttf</literal> will be appended</emphasis>
        to the filename and the library will attempt to search for that
        filename along a library-defined font path.
@@ -108,7 +109,7 @@
        <programlisting role="php">
 <![CDATA[
 <?php
-// Set the enviroment variable for GD
+// Set the environment variable for GD
 putenv('GDFONTPATH=' . realpath('.'));
 
 // Name the font to be used (note the lack of the .ttf extension)
@@ -128,11 +129,11 @@ $font = 'SomeFont';
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>extrainfo</parameter></term>
+     <term><parameter>options</parameter></term>
      <listitem>
       <para>
        <table>
-       <title>Possible array indexes for <parameter>extrainfo</parameter></title>
+       <title>Possible array indexes for <parameter>options</parameter></title>
         <tgroup cols="2">
          <thead>
           <row>
@@ -199,7 +200,28 @@ $font = 'SomeFont';
     </tgroup>
    </informaltable>
   </para>
+  <para>
+   On failure, &false; is returned.
+  </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -246,7 +268,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagegammacorrect.xml b/reference/image/functions/imagegammacorrect.xml
index 35bb3ffc99..fcc0879c67 100644
--- a/reference/image/functions/imagegammacorrect.xml
+++ b/reference/image/functions/imagegammacorrect.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagegammacorrect</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>float</type><parameter>inputgamma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>outputgamma</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>float</type><parameter>input_gamma</parameter></methodparam>
+   <methodparam><type>float</type><parameter>output_gamma</parameter></methodparam>
   </methodsynopsis>
   <para>
    Applies gamma correction to the given gd <parameter>image</parameter> 
@@ -24,7 +24,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>inputgamma</parameter></term>
+     <term><parameter>input_gamma</parameter></term>
      <listitem>
       <para>
        The input gamma.
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>outputgamma</parameter></term>
+     <term><parameter>output_gamma</parameter></term>
      <listitem>
       <para>
        The output gamma.
@@ -48,6 +48,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -72,7 +90,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagegd.xml b/reference/image/functions/imagegd.xml
index 9564bb445a..ea0eb6f87a 100644
--- a/reference/image/functions/imagegd.xml
+++ b/reference/image/functions/imagegd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.imagegd' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.imagegd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagegd</refname>
   <refpurpose>Output GD image to browser or file</refpurpose>
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagegd</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Outputs a GD image to the given <parameter>to</parameter>.
+   Outputs a GD image to the given <parameter>file</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -22,7 +22,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
      </listitem>
@@ -50,6 +50,13 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>8.0.3</entry>
+       <entry>
+        <parameter>file</parameter> is now nullable.
+       </entry>
+      </row>
+      &gd.changelog.image-param;
       <row>
        <entry>7.2.0</entry>
        <entry>
@@ -126,7 +133,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagegd2.xml b/reference/image/functions/imagegd2.xml
index a7e83befbb..ed5bcd46a1 100644
--- a/reference/image/functions/imagegd2.xml
+++ b/reference/image/functions/imagegd2.xml
@@ -9,13 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagegd2</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>chunk_size</parameter><initializer>128</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>IMG_GD2_RAW</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>IMG_GD2_RAW</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Outputs a GD2 image to the given <parameter>to</parameter>.
+   Outputs a GD2 image to the given <parameter>file</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -24,7 +24,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>image</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
      </listitem>
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>type</parameter></term>
+     <term><parameter>mode</parameter></term>
      <listitem>
       <para>
        Either <constant>IMG_GD2_RAW</constant> or 
@@ -58,6 +58,29 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>file</parameter> is now nullable.
+      </entry>
+     </row>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
  &reftitle.examples;
  <para>
diff --git a/reference/image/functions/imagegetclip.xml b/reference/image/functions/imagegetclip.xml
index 81c972caf4..76300e6de3 100644
--- a/reference/image/functions/imagegetclip.xml
+++ b/reference/image/functions/imagegetclip.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imagegetclip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imagegetclip</refname>
@@ -9,10 +8,9 @@
 
  <refsect1 role="description"><!-- {{{ -->
   &reftitle.description;
-  <methodsynopsis role="procedural">
+  <methodsynopsis>
    <type>array</type><methodname>imagegetclip</methodname>
-   <!-- Example: Required parameter -->
-   <methodparam><type>resource</type><parameter>im</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagegetclip</function> retrieves the current clipping rectangle,
@@ -49,6 +47,23 @@
   </para>
  </refsect1><!-- }}} -->
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples"><!-- {{{ -->
   &reftitle.examples;
   <example xml:id="imagegetclip.example.basic"><!-- {{{ -->
@@ -87,7 +102,6 @@ Array
  </refsect1><!-- }}} -->
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagegetinterpolation.xml b/reference/image/functions/imagegetinterpolation.xml
index b1d96450ee..c4a6726c8a 100644
--- a/reference/image/functions/imagegetinterpolation.xml
+++ b/reference/image/functions/imagegetinterpolation.xml
@@ -32,6 +32,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/image/functions/imagegif.xml b/reference/image/functions/imagegif.xml
index d4568e5aed..2b45b50010 100644
--- a/reference/image/functions/imagegif.xml
+++ b/reference/image/functions/imagegif.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagegif</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>imagegif</function> creates the <acronym>GIF</acronym>
-   file in <parameter>to</parameter> from the image <parameter>image</parameter>. The
+   file in <parameter>file</parameter> from the image <parameter>image</parameter>. The
    <parameter>image</parameter> argument is the return from the
    <function>imagecreate</function> or <literal>imagecreatefrom*</literal>
    function.
@@ -32,7 +32,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
      </listitem>
@@ -48,6 +48,23 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -204,7 +221,6 @@ elseif(imagetypes() & IMG_JPG)
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagegrabscreen.xml b/reference/image/functions/imagegrabscreen.xml
index fdbf916941..ade85da469 100644
--- a/reference/image/functions/imagegrabscreen.xml
+++ b/reference/image/functions/imagegrabscreen.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagegrabscreen</methodname>
-   <void />
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagegrabscreen</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Grabs a screenshot of the whole screen.
@@ -22,22 +22,41 @@
   </note>
  </refsect1>
 
-<!--
  <refsect1 role="parameters">
   &reftitle.parameters;
-  <para>
-   This function takes no parameters.
-  </para>
+  &no.function.parameters;
  </refsect1>
--->
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an image resource identifier on success, &false; on failure.
+   Returns an image object on success, &false; on failure.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
 <!--
  <refsect1 role="errors">
   &reftitle.errors;
@@ -76,7 +95,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -97,4 +115,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/image/functions/imagegrabwindow.xml b/reference/image/functions/imagegrabwindow.xml
index 8d39405115..e6bde9788f 100644
--- a/reference/image/functions/imagegrabwindow.xml
+++ b/reference/image/functions/imagegrabwindow.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imagegrabwindow</methodname>
-   <methodparam><type>int</type><parameter>window_handle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>client_area</parameter><initializer>0</initializer></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagegrabwindow</methodname>
+   <methodparam><type>int</type><parameter>handle</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>client_area</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Grabs a window or its client area using a windows handle (HWND property in COM instance)
@@ -28,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>window_handle</parameter></term>
+     <term><parameter>handle</parameter></term>
      <listitem>
       <para>
        The HWND window ID.
@@ -50,14 +50,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an image resource identifier on success, &false; on failure.
+   Returns an image object on success, &false; on failure.
   </para>
  </refsect1>
 
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   E_NOTICE is issued if <parameter>window_handle</parameter> is invalid
+   E_NOTICE is issued if <parameter>handle</parameter> is invalid
    window handle.
    E_WARNING is issued if the Windows API is too old.
   </para>
@@ -74,6 +74,13 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0</entry>
       <entry>
@@ -140,7 +147,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -161,4 +167,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/image/functions/imageinterlace.xml b/reference/image/functions/imageinterlace.xml
index de871a7e96..5bc51c9722 100644
--- a/reference/image/functions/imageinterlace.xml
+++ b/reference/image/functions/imageinterlace.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageinterlace</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>enable</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -63,6 +63,7 @@
        (non-zero for interlaced images, zero otherwise).
       </entry>
      </row>
+     &gd.changelog.image-param;
      <row>
       <entry>8.0.0</entry>
       <entry>
@@ -99,7 +100,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageistruecolor.xml b/reference/image/functions/imageistruecolor.xml
index b7ec74e73f..0134338a33 100644
--- a/reference/image/functions/imageistruecolor.xml
+++ b/reference/image/functions/imageistruecolor.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageistruecolor</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imageistruecolor</function> finds whether the image
@@ -31,6 +31,24 @@
    otherwise.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -73,7 +91,6 @@ if(!imageistruecolor($im))
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagejpeg.xml b/reference/image/functions/imagejpeg.xml
index 23c6fc3ba1..942863f587 100644
--- a/reference/image/functions/imagejpeg.xml
+++ b/reference/image/functions/imagejpeg.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagejpeg</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>quality</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -24,7 +24,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
      </listitem>
@@ -50,6 +50,23 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -150,7 +167,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagelayereffect.xml b/reference/image/functions/imagelayereffect.xml
index f9d96b3726..e12e36c0e8 100644
--- a/reference/image/functions/imagelayereffect.xml
+++ b/reference/image/functions/imagelayereffect.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagelayereffect</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>effect</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -96,10 +96,11 @@
      </row>
     </thead>
     <tbody>
+     &gd.changelog.image-param;
      <row>
       <entry>7.2.0</entry>
       <entry>
-       Added <constant>IMG_EFFECT_MULTIPLY</constant> (requires system libgd >=
+       Added <constant>IMG_EFFECT_MULTIPLY</constant> (requires system libgd &gt;=
        2.1.1 or the bundled libgd).
       </entry>
      </row>
@@ -148,7 +149,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageline.xml b/reference/image/functions/imageline.xml
index 5b03b83440..51603dd20c 100644
--- a/reference/image/functions/imageline.xml
+++ b/reference/image/functions/imageline.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageline</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x1</parameter></methodparam>
    <methodparam><type>int</type><parameter>y1</parameter></methodparam>
    <methodparam><type>int</type><parameter>x2</parameter></methodparam>
@@ -74,6 +74,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -122,7 +140,6 @@ function imagelinethick($image, $x1, $y1, $x2, $y2, $color, $thick = 1)
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageloadfont.xml b/reference/image/functions/imageloadfont.xml
index 0a3f98adc3..e548a0a86a 100644
--- a/reference/image/functions/imageloadfont.xml
+++ b/reference/image/functions/imageloadfont.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.imageloadfont">
+<refentry xml:id="function.imageloadfont" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imageloadfont</refname>
   <refpurpose>Load a new font</refpurpose>
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>imageloadfont</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>imageloadfont</methodname>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imageloadfont</function> loads a user-defined bitmap and returns
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        The font file format is currently binary and architecture
@@ -125,7 +125,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageopenpolygon.xml b/reference/image/functions/imageopenpolygon.xml
index 52b1fa0a23..64ca99bf87 100644
--- a/reference/image/functions/imageopenpolygon.xml
+++ b/reference/image/functions/imageopenpolygon.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imageopenpolygon" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imageopenpolygon</refname>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imageopenpolygon</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>points</parameter></methodparam>
    <methodparam><type>int</type><parameter>num_points</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
@@ -19,7 +18,7 @@
   <simpara>Alternative signature (as of PHP 8.0.0)</simpara>
   <methodsynopsis>
    <type>bool</type><methodname>imageopenpolygon</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>points</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
@@ -97,6 +96,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -147,7 +163,6 @@ imagedestroy($image);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagepalettecopy.xml b/reference/image/functions/imagepalettecopy.xml
index 72d0d63ccc..025e53bb74 100644
--- a/reference/image/functions/imagepalettecopy.xml
+++ b/reference/image/functions/imagepalettecopy.xml
@@ -9,13 +9,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>void</type><methodname>imagepalettecopy</methodname>
-   <methodparam><type>resource</type><parameter>destination</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>dst</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>src</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagepalettecopy</function> copies the palette from the
-   <parameter>source</parameter> image to the 
-   <parameter>destination</parameter> image.
+   <parameter>src</parameter> image to the 
+   <parameter>dst</parameter> image.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -23,18 +23,18 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>destination</parameter></term>
+     <term><parameter>dst</parameter></term>
      <listitem>
       <para>
-       The destination image resource.
+       The destination image object.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>source</parameter></term>
+     <term><parameter>src</parameter></term>
      <listitem>
       <para>
-       The source image resource.
+       The source image object.
       </para>
      </listitem>
     </varlistentry>
@@ -47,6 +47,31 @@
    &return.void;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>dst</parameter> and <parameter>src</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -84,7 +109,6 @@ imagedestroy($palette2);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagepalettetotruecolor.xml b/reference/image/functions/imagepalettetotruecolor.xml
index aa82911a45..7fb35abe21 100644
--- a/reference/image/functions/imagepalettetotruecolor.xml
+++ b/reference/image/functions/imagepalettetotruecolor.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagepalettetotruecolor</methodname>
-   <methodparam><type>resource</type><parameter>src</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
    Converts a palette based image, created by functions like 
@@ -35,12 +35,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
     <title>
-     Converts any image resource to true color
+     Converts any image object to true color
     </title>
     <programlisting role="php">
 <![CDATA[
@@ -104,7 +121,6 @@ typeof($im) = true color
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagepng.xml b/reference/image/functions/imagepng.xml
index 7733705003..8c31c0bbe7 100644
--- a/reference/image/functions/imagepng.xml
+++ b/reference/image/functions/imagepng.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagepng</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>quality</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>filters</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
@@ -25,7 +25,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
       <note>
@@ -75,6 +75,23 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -105,7 +122,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagepolygon.xml b/reference/image/functions/imagepolygon.xml
index 984f90d34f..65027031d9 100644
--- a/reference/image/functions/imagepolygon.xml
+++ b/reference/image/functions/imagepolygon.xml
@@ -9,15 +9,15 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagepolygon</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>points</parameter></methodparam>
    <methodparam><type>int</type><parameter>num_points</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
-  <simpara>Alternative signature (as of PHP 8.0.0)</simpara>
+  <simpara>Alternative signature as of PHP 8.0.0 (not supported with named arguments)</simpara>
   <methodsynopsis>
    <type>bool</type><methodname>imagepolygon</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>points</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
   </methodsynopsis>
@@ -91,6 +91,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -142,7 +160,6 @@ imagedestroy($image);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagerectangle.xml b/reference/image/functions/imagerectangle.xml
index 4d94b2b7f3..641d4277b5 100644
--- a/reference/image/functions/imagerectangle.xml
+++ b/reference/image/functions/imagerectangle.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagerectangle</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x1</parameter></methodparam>
    <methodparam><type>int</type><parameter>y1</parameter></methodparam>
    <methodparam><type>int</type><parameter>x2</parameter></methodparam>
@@ -76,6 +76,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -116,7 +134,6 @@ imagedestroy($canvas);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imageresolution.xml b/reference/image/functions/imageresolution.xml
index c8229efe26..9ed6fcf864 100644
--- a/reference/image/functions/imageresolution.xml
+++ b/reference/image/functions/imageresolution.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imageresolution" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imageresolution</refname>
@@ -9,22 +8,18 @@
 
  <refsect1 role="description"><!-- {{{ -->
   &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>mixed</type><methodname>imageresolution</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>mixed</type><methodname>imageresolution</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>res_x</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>res_y</parameter><initializer>$res_x</initializer></methodparam>
+  <methodsynopsis>
+   <type class="union"><type>array</type><type>bool</type></type><methodname>imageresolution</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>resolution_x</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>resolution_y</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>imageresolution</function> allows to set and get the resolution of
-   an image in DPI (dots per inch). If none of the optional parameters is given,
-   the current resolution is returned as indexed array. If only
-   <parameter>res_x</parameter> is given, the horizontal and vertical resolution
-   are set to this value. If both optional parameters are given, the horizontal
+   an image in DPI (dots per inch). If the optional parameters are &null;,
+   the current resolution is returned as an indexed array. If only
+   <parameter>resolution_x</parameter> is not &null;, the horizontal and vertical resolution
+   are set to this value. If none of the optional parameters are &null;, the horizontal
    and vertical resolution are set to these values, respectively.
   </para>
   <para>
@@ -40,7 +35,7 @@
   <variablelist>
    &gd.image.description;
    <varlistentry>
-    <term><parameter>res_x</parameter></term>
+    <term><parameter>resolution_x</parameter></term>
     <listitem>
      <para>
       The horizontal resolution in DPI.
@@ -48,7 +43,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>res_y</parameter></term>
+    <term><parameter>resolution_y</parameter></term>
     <listitem>
      <para>
       The vertical resolution in DPI.
@@ -61,14 +56,37 @@
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
   <para>
-   When used as getter (first signature),
+   When used as getter,
    it returns an indexed array of the horizontal and vertical resolution on
    success, &return.falseforfailure;.
-   When used as setter (second signature), it returns
+   When used as setter, it returns
    &true; on success, &return.falseforfailure;.
   </para>
  </refsect1><!-- }}} -->
 
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>resolution_x</parameter> and <parameter>resolution_y</parameter> are now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples"><!-- {{{ -->
   &reftitle.examples;
   <example xml:id="imageresolution.example.basic"><!-- {{{ -->
@@ -103,7 +121,6 @@ Array
  </refsect1><!-- }}} -->
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagerotate.xml b/reference/image/functions/imagerotate.xml
index 09468b4fde..e020b50dad 100644
--- a/reference/image/functions/imagerotate.xml
+++ b/reference/image/functions/imagerotate.xml
@@ -8,10 +8,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>imagerotate</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagerotate</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bgd_color</parameter></methodparam>
+   <methodparam><type>int</type><parameter>background_color</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>ignore_transparent</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>bgd_color</parameter></term>
+     <term><parameter>background_color</parameter></term>
      <listitem>
       <para>
        Specifies the color of the uncovered zone after the rotation
@@ -59,7 +59,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an image resource for the rotated image, &return.falseforfailure;.
+   Returns an image object for the rotated image, &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -74,6 +74,14 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+     &gd.changelog.image-param;
      <row>
       <entry>8.0.0</entry>
       <entry>
@@ -140,7 +148,6 @@ imagedestroy($rotate);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesavealpha.xml b/reference/image/functions/imagesavealpha.xml
index d0be37f7e0..778931670f 100644
--- a/reference/image/functions/imagesavealpha.xml
+++ b/reference/image/functions/imagesavealpha.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imagesavealpha" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagesavealpha</refname>
@@ -11,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesavealpha</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>saveflag</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagesavealpha</function> sets the flag which determines whether to retain
@@ -31,7 +30,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>saveflag</parameter></term>
+     <term><parameter>enable</parameter></term>
      <listitem>
       <para>
        Whether to save the alpha channel or not. Defaults to &false;. 
@@ -48,6 +47,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -86,7 +103,6 @@ imagedestroy($png);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -107,4 +123,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/image/functions/imagescale.xml b/reference/image/functions/imagescale.xml
index b3feb37d99..ce55588c60 100644
--- a/reference/image/functions/imagescale.xml
+++ b/reference/image/functions/imagescale.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imagescale" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imagescale</refname>
@@ -10,11 +9,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>imagescale</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>new_width</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>new_height</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>IMG_BILINEAR_FIXED</initializer></methodparam>
+   <type class="union"><type>GdImage</type><type>false</type></type><methodname>imagescale</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>int</type><parameter>width</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>height</parameter><initializer>-1</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>IMG_BILINEAR_FIXED</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>imagescale</function> scales an image using the given
@@ -34,7 +33,7 @@
   <variablelist>
    &gd.image.description;
    <varlistentry>
-    <term><parameter>new_width</parameter></term>
+    <term><parameter>width</parameter></term>
     <listitem>
      <para>
       The width to scale the image to.
@@ -42,7 +41,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>new_height</parameter></term>
+    <term><parameter>height</parameter></term>
     <listitem>
      <para>
       The height to scale the image to. If omitted or negative, the aspect
@@ -73,10 +72,34 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Return the scaled image resource on success&return.falseforfailure;.
+   Return the scaled image object on success&return.falseforfailure;.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       On success, this function returns a <classname>GDImage</classname> instance now;
+       previously, a <type>resource</type> was returned.
+      </entry>
+     </row>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
@@ -86,7 +109,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesetbrush.xml b/reference/image/functions/imagesetbrush.xml
index 6b83ab264f..44d1d62d06 100644
--- a/reference/image/functions/imagesetbrush.xml
+++ b/reference/image/functions/imagesetbrush.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesetbrush</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>brush</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>brush</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagesetbrush</function> sets the brush image to be
@@ -38,7 +38,7 @@
      <term><parameter>brush</parameter></term>
      <listitem>
       <para>
-       An image resource.
+       An image object.
       </para>
      </listitem>
     </varlistentry>
@@ -51,6 +51,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>image</parameter> and <parameter>brush</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -96,7 +121,6 @@ imagedestroy($php);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesetclip.xml b/reference/image/functions/imagesetclip.xml
index 927d6af6ae..dcf9e8e81d 100644
--- a/reference/image/functions/imagesetclip.xml
+++ b/reference/image/functions/imagesetclip.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.imagesetclip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imagesetclip</refname>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>imagesetclip</methodname>
-   <methodparam><type>resource</type><parameter>im</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x1</parameter></methodparam>
    <methodparam><type>int</type><parameter>y1</parameter></methodparam>
    <methodparam><type>int</type><parameter>x2</parameter></methodparam>
@@ -69,6 +68,23 @@
   </para>
  </refsect1><!-- }}} -->
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso"><!-- {{{ -->
   &reftitle.seealso;
   <simplelist>
@@ -77,7 +93,6 @@
  </refsect1><!-- }}} -->
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesetinterpolation.xml b/reference/image/functions/imagesetinterpolation.xml
index c1129e3f7b..efd90a029a 100644
--- a/reference/image/functions/imagesetinterpolation.xml
+++ b/reference/image/functions/imagesetinterpolation.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesetinterpolation</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>method</parameter><initializer>IMG_BILINEAR_FIXED</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>method</parameter><initializer><constant>IMG_BILINEAR_FIXED</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Sets the interpolation method, setting an interpolation method affects the rendering 
@@ -149,6 +149,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -201,7 +218,6 @@ imagesetinterpolation($im, IMG_MITCHELL);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesetpixel.xml b/reference/image/functions/imagesetpixel.xml
index 2a2fa6d87e..091d915927 100644
--- a/reference/image/functions/imagesetpixel.xml
+++ b/reference/image/functions/imagesetpixel.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesetpixel</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
@@ -57,6 +57,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -112,7 +130,6 @@ imagepng($gd);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesetstyle.xml b/reference/image/functions/imagesetstyle.xml
index 3bff339b67..3611f0c35c 100644
--- a/reference/image/functions/imagesetstyle.xml
+++ b/reference/image/functions/imagesetstyle.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesetstyle</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>array</type><parameter>style</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -45,6 +45,7 @@
    &return.success;
   </para>
  </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -98,7 +99,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesetthickness.xml b/reference/image/functions/imagesetthickness.xml
index 61ebea508a..fbfa5467a0 100644
--- a/reference/image/functions/imagesetthickness.xml
+++ b/reference/image/functions/imagesetthickness.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesetthickness</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>thickness</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -40,6 +40,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -82,7 +100,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesettile.xml b/reference/image/functions/imagesettile.xml
index 0f2d59376f..2a47bfd5ff 100644
--- a/reference/image/functions/imagesettile.xml
+++ b/reference/image/functions/imagesettile.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagesettile</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>tile</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>tile</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagesettile</function> sets the tile image to be
@@ -41,7 +41,7 @@
      <term><parameter>tile</parameter></term>
      <listitem>
       <para>
-       The image resource to be used as a tile.
+       The image object to be used as a tile.
       </para>
      </listitem>
     </varlistentry>
@@ -54,6 +54,31 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>image</parameter> and <parameter>tile</parameter> expect
+       <classname>GdImage</classname> instances now; previously, <type>resource</type>s
+       were expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -94,7 +119,6 @@ imagedestroy($zend);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagestring.xml b/reference/image/functions/imagestring.xml
index 52ffab4b8e..2e48f3adbe 100644
--- a/reference/image/functions/imagestring.xml
+++ b/reference/image/functions/imagestring.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagestring</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>font</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
@@ -67,6 +67,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -112,7 +130,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagestringup.xml b/reference/image/functions/imagestringup.xml
index 1d77d9aed0..4c7a796437 100644
--- a/reference/image/functions/imagestringup.xml
+++ b/reference/image/functions/imagestringup.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagestringup</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>int</type><parameter>font</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
@@ -68,6 +68,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -107,7 +125,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesx.xml b/reference/image/functions/imagesx.xml
index 3aa88b798b..3a3809e5b1 100644
--- a/reference/image/functions/imagesx.xml
+++ b/reference/image/functions/imagesx.xml
@@ -9,10 +9,10 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagesx</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the width of the given <parameter>image</parameter> resource.
+   Returns the width of the given <parameter>image</parameter> object.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -30,6 +30,24 @@
    errors.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -59,7 +77,6 @@ echo imagesx($img); // 300
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagesy.xml b/reference/image/functions/imagesy.xml
index 5d13d65ab5..9de180d490 100644
--- a/reference/image/functions/imagesy.xml
+++ b/reference/image/functions/imagesy.xml
@@ -9,10 +9,10 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imagesy</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the height of the given <parameter>image</parameter> resource.
+   Returns the height of the given <parameter>image</parameter> object.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -30,6 +30,24 @@
    errors.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -59,7 +77,6 @@ echo imagesy($img); // 200
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagetruecolortopalette.xml b/reference/image/functions/imagetruecolortopalette.xml
index d66a59556a..43104b842c 100644
--- a/reference/image/functions/imagetruecolortopalette.xml
+++ b/reference/image/functions/imagetruecolortopalette.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagetruecolortopalette</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ncolors</parameter></methodparam>
+   <methodparam><type>int</type><parameter>num_colors</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imagetruecolortopalette</function> converts a truecolor image
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ncolors</parameter></term>
+     <term><parameter>num_colors</parameter></term>
      <listitem>
       <para>
        Sets the maximum number of colors that should be retained in the palette.
@@ -56,6 +56,24 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -81,7 +99,6 @@ imagedestroy($im);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagettfbbox.xml b/reference/image/functions/imagettfbbox.xml
index 63c470fbad..fec1b21231 100644
--- a/reference/image/functions/imagettfbbox.xml
+++ b/reference/image/functions/imagettfbbox.xml
@@ -8,11 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imagettfbbox</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imagettfbbox</methodname>
    <methodparam><type>float</type><parameter>size</parameter></methodparam>
    <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fontfile</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
+   <methodparam><type>string</type><parameter>font_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    This function calculates and returns the bounding box in pixels
@@ -20,9 +21,10 @@
   </para>
   <note>
    <para>
-    <function>imageftbbox</function> is an extended variant of
-    <function>imagettfbbox</function> which additionally supports the
+    Prior to PHP 8.0.0, <function>imageftbbox</function> was an extended variant of
+    <function>imagettfbbox</function> which additionally supported the
     <parameter>extrainfo</parameter>.
+    As of PHP 8.0.0, <function>imagettfbbox</function> is an alias of <function>imageftbbox</function>.
    </para>
   </note>
  </refsect1>
@@ -40,13 +42,13 @@
      <term><parameter>angle</parameter></term>
      <listitem>
       <para>
-       Angle in degrees in which <parameter>text</parameter> will be measured.
+       Angle in degrees in which <parameter>string</parameter> will be measured.
       </para>
      </listitem>
     </varlistentry>
     &gd.ttf.fontfile;
     <varlistentry>
-     <term><parameter>text</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        The string to be measured.
@@ -113,6 +115,29 @@
    corner seeing the text horizontally.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The <parameter>options</parameter> has been added.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -175,7 +200,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagettftext.xml b/reference/image/functions/imagettftext.xml
index ab440273b0..b28afda2fb 100644
--- a/reference/image/functions/imagettftext.xml
+++ b/reference/image/functions/imagettftext.xml
@@ -8,15 +8,16 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imagettftext</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imagettftext</methodname>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
    <methodparam><type>float</type><parameter>size</parameter></methodparam>
    <methodparam><type>float</type><parameter>angle</parameter></methodparam>
    <methodparam><type>int</type><parameter>x</parameter></methodparam>
    <methodparam><type>int</type><parameter>y</parameter></methodparam>
    <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fontfile</parameter></methodparam>
+   <methodparam><type>string</type><parameter>font_filename</parameter></methodparam>
    <methodparam><type>string</type><parameter>text</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    Writes the given <parameter>text</parameter> into the image using TrueType
@@ -24,9 +25,10 @@
   </para>
   <note>
    <para>
-    <function>imagefttext</function> is an extended variant of
-    <function>imagettftext</function> which additionally supports the
+    Prior to PHP 8.0.0, <function>imagefttext</function> was an extended variant of
+    <function>imagettftext</function> which additionally supported the
     <parameter>extrainfo</parameter>.
+    As of PHP 8.0.0, <function>imagettftext</function> is an alias of <function>imagefttext</function>.
    </para>
   </note>
  </refsect1>
@@ -121,6 +123,29 @@
    Returns &false; on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The <parameter>options</parameter> has been added.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -184,7 +209,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagetypes.xml b/reference/image/functions/imagetypes.xml
index d92211c9b7..399cd41ef9 100644
--- a/reference/image/functions/imagetypes.xml
+++ b/reference/image/functions/imagetypes.xml
@@ -15,6 +15,12 @@
    Returns the image types supported by the current PHP installation.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -26,25 +32,8 @@
    <constant>IMG_XPM</constant> | <constant>IMG_WEBP</constant>.
   </para>
  </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Checking for PNG support</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if (imagetypes() & IMG_PNG) {
-    echo "PNG Support is enabled";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
 
-<refsect1 role="changelog">
+ <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
    <informaltable>
@@ -73,6 +62,24 @@ if (imagetypes() & IMG_PNG) {
    </informaltable>
   </para>
  </refsect1>
+ 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>Checking for PNG support</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+if (imagetypes() & IMG_PNG) {
+    echo "PNG Support is enabled";
+}
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/image/functions/imagewbmp.xml b/reference/image/functions/imagewbmp.xml
index c29a71d2bb..21902df7d6 100644
--- a/reference/image/functions/imagewbmp.xml
+++ b/reference/image/functions/imagewbmp.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagewbmp</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>foreground</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>foreground_color</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>imagewbmp</function> outputs or save a <acronym>WBMP</acronym>
@@ -24,13 +24,13 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>foreground</parameter></term>
+     <term><parameter>foreground_color</parameter></term>
      <listitem>
       <para>
        You can set the foreground color with this parameter by setting an
@@ -50,6 +50,29 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>foreground_color</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -138,7 +161,6 @@ imagedestroy($im);
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagewebp.xml b/reference/image/functions/imagewebp.xml
index e6d177b815..20c66be875 100644
--- a/reference/image/functions/imagewebp.xml
+++ b/reference/image/functions/imagewebp.xml
@@ -10,9 +10,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagewebp</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>to</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>quality</parameter><initializer>80</initializer></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>string</type><type>null</type></type><parameter>file</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>quality</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
    Outputs or saves a WebP version of the given <parameter>image</parameter>. 
@@ -25,7 +25,7 @@
    <variablelist>
     &gd.image.description;
     <varlistentry>
-     <term><parameter>to</parameter></term>
+     <term><parameter>file</parameter></term>
      <listitem>
       <para>&gd.image.path;</para>
      </listitem>
@@ -51,6 +51,23 @@
   &gd.return.trueonerror;
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &gd.changelog.image-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -77,7 +94,6 @@ imagedestroy($im);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/functions/imagexbm.xml b/reference/image/functions/imagexbm.xml
index 0c6c1d612a..176b41bd1c 100644
--- a/reference/image/functions/imagexbm.xml
+++ b/reference/image/functions/imagexbm.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imagexbm</methodname>
-   <methodparam><type>resource</type><parameter>image</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>foreground</parameter></methodparam>
+   <methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>filename</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>foreground_color</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Outputs or save an <acronym>XBM</acronym> version of the given 
@@ -44,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>foreground</parameter></term>
+     <term><parameter>foreground_color</parameter></term>
      <listitem>
       <para>
        You can set the foreground color with this parameter by setting an
@@ -76,6 +76,13 @@
      </row>
     </thead>
     <tbody>
+     &gd.changelog.image-param;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>foreground_color</parameter> is now nullable.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0</entry>
       <entry>
@@ -87,7 +94,6 @@
   </informaltable>
  </refsect1>
 
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -140,7 +146,6 @@ imagedestroy($im);
   &reftitle.notes;
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/image/setup.xml b/reference/image/setup.xml
index 462bd70364..c08f9caca8 100644
--- a/reference/image/setup.xml
+++ b/reference/image/setup.xml
@@ -105,7 +105,7 @@
       <row>
        <entry><literal>gd</literal></entry>
        <entry>Image resource, used by functions like <function>imagecreatefrompng</function></entry>
-       <entry></entry>
+       <entry>Prior to PHP 8.0.0</entry>
       </row>
       <row>
        <entry><literal>gd font</literal></entry>
diff --git a/reference/imagick/book.xml b/reference/imagick/book.xml
index f497b27cbc..24b02eb869 100644
--- a/reference/imagick/book.xml
+++ b/reference/imagick/book.xml
@@ -3,6 +3,7 @@
 <!-- State: experimental -->
  
 <book xml:id="book.imagick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Image Processing (ImageMagick)</title>
  <titleabbrev>ImageMagick</titleabbrev>
  
diff --git a/reference/imagick/imagick/averageimages.xml b/reference/imagick/imagick/averageimages.xml
index 0497cc5f56..e08ec9b18f 100644
--- a/reference/imagick/imagick/averageimages.xml
+++ b/reference/imagick/imagick/averageimages.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/clear.xml b/reference/imagick/imagick/clear.xml
index 33d7b60097..719bfb159f 100644
--- a/reference/imagick/imagick/clear.xml
+++ b/reference/imagick/imagick/clear.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/clipimage.xml b/reference/imagick/imagick/clipimage.xml
index 0a74968a0a..49fcc0c647 100644
--- a/reference/imagick/imagick/clipimage.xml
+++ b/reference/imagick/imagick/clipimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/clone.xml b/reference/imagick/imagick/clone.xml
index 9014b3e2fe..5da16980ec 100644
--- a/reference/imagick/imagick/clone.xml
+++ b/reference/imagick/imagick/clone.xml
@@ -24,24 +24,9 @@
   </warning>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Imagick object cloning in different versions of imagick</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Cloning an Imagick object in imagick 2.x and 3.0:
-$newImage = $image->clone();
-
-// Cloning an Imagick object from 3.1.0 on:
-$newImage = clone $image;
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
@@ -76,6 +61,26 @@ $newImage = clone $image;
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>Imagick object cloning in different versions of imagick</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// Cloning an Imagick object in imagick 2.x and 3.0:
+$newImage = $image->clone();
+
+// Cloning an Imagick object from 3.1.0 on:
+$newImage = clone $image;
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/coalesceimages.xml b/reference/imagick/imagick/coalesceimages.xml
index c95e01c133..e3bb865b3e 100644
--- a/reference/imagick/imagick/coalesceimages.xml
+++ b/reference/imagick/imagick/coalesceimages.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/current.xml b/reference/imagick/imagick/current.xml
index 7bfea364a7..05e24dafe8 100644
--- a/reference/imagick/imagick/current.xml
+++ b/reference/imagick/imagick/current.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/deconstructimages.xml b/reference/imagick/imagick/deconstructimages.xml
index b22adc9dd4..5b0fd7a88b 100644
--- a/reference/imagick/imagick/deconstructimages.xml
+++ b/reference/imagick/imagick/deconstructimages.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/despeckleimage.xml b/reference/imagick/imagick/despeckleimage.xml
index cc69cabf23..7d16a26252 100644
--- a/reference/imagick/imagick/despeckleimage.xml
+++ b/reference/imagick/imagick/despeckleimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/destroy.xml b/reference/imagick/imagick/destroy.xml
index 62334a59a7..71ba57ad13 100644
--- a/reference/imagick/imagick/destroy.xml
+++ b/reference/imagick/imagick/destroy.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/enhanceimage.xml b/reference/imagick/imagick/enhanceimage.xml
index aa73aa9117..56c061171a 100644
--- a/reference/imagick/imagick/enhanceimage.xml
+++ b/reference/imagick/imagick/enhanceimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/equalizeimage.xml b/reference/imagick/imagick/equalizeimage.xml
index 3c55aa24e6..a4404706dd 100644
--- a/reference/imagick/imagick/equalizeimage.xml
+++ b/reference/imagick/imagick/equalizeimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/evaluateimage.xml b/reference/imagick/imagick/evaluateimage.xml
index d4f61f1591..13bb6926d7 100644
--- a/reference/imagick/imagick/evaluateimage.xml
+++ b/reference/imagick/imagick/evaluateimage.xml
@@ -55,6 +55,20 @@
    </variablelist>
   </para>
  </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &imagick.return.success;
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   &imagick.imagick.throws;
+  </para>
+ </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
@@ -81,20 +95,6 @@ echo $im;
    </programlisting>
   </example>
  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
  </refsect1>
 
 </refentry>
diff --git a/reference/imagick/imagick/exportimagepixels.xml b/reference/imagick/imagick/exportimagepixels.xml
index e9c07e8a7e..7f35f8ea22 100644
--- a/reference/imagick/imagick/exportimagepixels.xml
+++ b/reference/imagick/imagick/exportimagepixels.xml
@@ -81,6 +81,20 @@
    </variablelist>
   </para>
  </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an array containing the pixels values.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   &imagick.imagick.throws;
+  </para>
+ </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
@@ -143,21 +157,6 @@ array(12) {
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-   &reftitle.returnvalues;
-  <para>
-   Returns an array containing the pixels values.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/flattenimages.xml b/reference/imagick/imagick/flattenimages.xml
index b4e829a6c8..9aa556a69c 100644
--- a/reference/imagick/imagick/flattenimages.xml
+++ b/reference/imagick/imagick/flattenimages.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/flipimage.xml b/reference/imagick/imagick/flipimage.xml
index d8c4fe9cfd..1db88209c4 100644
--- a/reference/imagick/imagick/flipimage.xml
+++ b/reference/imagick/imagick/flipimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/flopimage.xml b/reference/imagick/imagick/flopimage.xml
index d38936a5c1..d35c30e056 100644
--- a/reference/imagick/imagick/flopimage.xml
+++ b/reference/imagick/imagick/flopimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getcolorspace.xml b/reference/imagick/imagick/getcolorspace.xml
index 8020b5a44c..6ae2e59631 100644
--- a/reference/imagick/imagick/getcolorspace.xml
+++ b/reference/imagick/imagick/getcolorspace.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getcompression.xml b/reference/imagick/imagick/getcompression.xml
index 3997f55696..a87396f334 100644
--- a/reference/imagick/imagick/getcompression.xml
+++ b/reference/imagick/imagick/getcompression.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getcompressionquality.xml b/reference/imagick/imagick/getcompressionquality.xml
index e09709ed3d..4d6fc24e62 100644
--- a/reference/imagick/imagick/getcompressionquality.xml
+++ b/reference/imagick/imagick/getcompressionquality.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getcopyright.xml b/reference/imagick/imagick/getcopyright.xml
index 57009cebcd..d7d00bf3df 100644
--- a/reference/imagick/imagick/getcopyright.xml
+++ b/reference/imagick/imagick/getcopyright.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getfilename.xml b/reference/imagick/imagick/getfilename.xml
index e4cbcfd0dc..9035ac8882 100644
--- a/reference/imagick/imagick/getfilename.xml
+++ b/reference/imagick/imagick/getfilename.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getfont.xml b/reference/imagick/imagick/getfont.xml
index 1f6cfe4661..407cccd8b9 100644
--- a/reference/imagick/imagick/getfont.xml
+++ b/reference/imagick/imagick/getfont.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getformat.xml b/reference/imagick/imagick/getformat.xml
index 3a58604807..7dc877cf53 100644
--- a/reference/imagick/imagick/getformat.xml
+++ b/reference/imagick/imagick/getformat.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getgravity.xml b/reference/imagick/imagick/getgravity.xml
index 901c053903..a4d6709de0 100644
--- a/reference/imagick/imagick/getgravity.xml
+++ b/reference/imagick/imagick/getgravity.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/gethomeurl.xml b/reference/imagick/imagick/gethomeurl.xml
index 01097b0bbc..e73225df67 100644
--- a/reference/imagick/imagick/gethomeurl.xml
+++ b/reference/imagick/imagick/gethomeurl.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimage.xml b/reference/imagick/imagick/getimage.xml
index 178504b245..5d56989dc1 100644
--- a/reference/imagick/imagick/getimage.xml
+++ b/reference/imagick/imagick/getimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagealphachannel.xml b/reference/imagick/imagick/getimagealphachannel.xml
index 1680659599..5d2a799186 100644
--- a/reference/imagick/imagick/getimagealphachannel.xml
+++ b/reference/imagick/imagick/getimagealphachannel.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageattribute.xml b/reference/imagick/imagick/getimageattribute.xml
index c33e801093..5095ea9db1 100644
--- a/reference/imagick/imagick/getimageattribute.xml
+++ b/reference/imagick/imagick/getimageattribute.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="imagick.getimageattribute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Imagick::getImageAttribute</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Returns a named attribute</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
diff --git a/reference/imagick/imagick/getimagebackgroundcolor.xml b/reference/imagick/imagick/getimagebackgroundcolor.xml
index f8d43fbcab..2be924ff38 100644
--- a/reference/imagick/imagick/getimagebackgroundcolor.xml
+++ b/reference/imagick/imagick/getimagebackgroundcolor.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageblob.xml b/reference/imagick/imagick/getimageblob.xml
index 6f87a1bf3c..9cdc770c3a 100644
--- a/reference/imagick/imagick/getimageblob.xml
+++ b/reference/imagick/imagick/getimageblob.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagebordercolor.xml b/reference/imagick/imagick/getimagebordercolor.xml
index 163cf52b4f..ad2150f4a6 100644
--- a/reference/imagick/imagick/getimagebordercolor.xml
+++ b/reference/imagick/imagick/getimagebordercolor.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagechannelstatistics.xml b/reference/imagick/imagick/getimagechannelstatistics.xml
index ec0c222017..cf4dbdd7b8 100644
--- a/reference/imagick/imagick/getimagechannelstatistics.xml
+++ b/reference/imagick/imagick/getimagechannelstatistics.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageclipmask.xml b/reference/imagick/imagick/getimageclipmask.xml
index b4865e5ede..3b8119f78c 100644
--- a/reference/imagick/imagick/getimageclipmask.xml
+++ b/reference/imagick/imagick/getimageclipmask.xml
@@ -23,6 +23,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagecolors.xml b/reference/imagick/imagick/getimagecolors.xml
index afb802b84a..9c428bc155 100644
--- a/reference/imagick/imagick/getimagecolors.xml
+++ b/reference/imagick/imagick/getimagecolors.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagecolorspace.xml b/reference/imagick/imagick/getimagecolorspace.xml
index c873237141..830906fea2 100644
--- a/reference/imagick/imagick/getimagecolorspace.xml
+++ b/reference/imagick/imagick/getimagecolorspace.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagecompose.xml b/reference/imagick/imagick/getimagecompose.xml
index 9df0a97202..7de0538f0b 100644
--- a/reference/imagick/imagick/getimagecompose.xml
+++ b/reference/imagick/imagick/getimagecompose.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagecompression.xml b/reference/imagick/imagick/getimagecompression.xml
index db33609ef0..1bc6e5a65a 100644
--- a/reference/imagick/imagick/getimagecompression.xml
+++ b/reference/imagick/imagick/getimagecompression.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagecompressionquality.xml b/reference/imagick/imagick/getimagecompressionquality.xml
index d493689aa5..6c887b8435 100644
--- a/reference/imagick/imagick/getimagecompressionquality.xml
+++ b/reference/imagick/imagick/getimagecompressionquality.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagedelay.xml b/reference/imagick/imagick/getimagedelay.xml
index 5945b60243..c9644d94ab 100644
--- a/reference/imagick/imagick/getimagedelay.xml
+++ b/reference/imagick/imagick/getimagedelay.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagedepth.xml b/reference/imagick/imagick/getimagedepth.xml
index 218b17f755..d7cd2ed0e0 100644
--- a/reference/imagick/imagick/getimagedepth.xml
+++ b/reference/imagick/imagick/getimagedepth.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagedispose.xml b/reference/imagick/imagick/getimagedispose.xml
index dd84aed996..3da2a2d6aa 100644
--- a/reference/imagick/imagick/getimagedispose.xml
+++ b/reference/imagick/imagick/getimagedispose.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageextrema.xml b/reference/imagick/imagick/getimageextrema.xml
index 834df48318..6f0457178a 100644
--- a/reference/imagick/imagick/getimageextrema.xml
+++ b/reference/imagick/imagick/getimageextrema.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagefilename.xml b/reference/imagick/imagick/getimagefilename.xml
index d9d13c9f5f..23c4461b7d 100644
--- a/reference/imagick/imagick/getimagefilename.xml
+++ b/reference/imagick/imagick/getimagefilename.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageformat.xml b/reference/imagick/imagick/getimageformat.xml
index e8a5a00941..6fb7bf1f57 100644
--- a/reference/imagick/imagick/getimageformat.xml
+++ b/reference/imagick/imagick/getimageformat.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagegamma.xml b/reference/imagick/imagick/getimagegamma.xml
index d35422dcf6..1e877c8ba2 100644
--- a/reference/imagick/imagick/getimagegamma.xml
+++ b/reference/imagick/imagick/getimagegamma.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagegeometry.xml b/reference/imagick/imagick/getimagegeometry.xml
index 529ee92241..0e65740b63 100644
--- a/reference/imagick/imagick/getimagegeometry.xml
+++ b/reference/imagick/imagick/getimagegeometry.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -37,19 +42,26 @@
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>Imagick::getImageGeometry</function></title>
+      <title>Using <function>Imagick::getImageGeometry</function></title>
       <programlisting role="php">
       <![CDATA[
 <?php
-function getImageGeometry($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
+$imagick = new Imagick();
+$imagick->newImage(100, 200, "black");
+print_r($imagick->getImageGeometry());
 ?>
 ]]>
       </programlisting>
+      &example.outputs;
+      <screen>
+<![CDATA[
+Array
+(
+    [width] => 100
+    [height] => 200
+)
+]]>
+      </screen>
     </example>
   </para>
  </refsect1>
diff --git a/reference/imagick/imagick/getimagegravity.xml b/reference/imagick/imagick/getimagegravity.xml
index 827ad7a341..f39636ebdc 100644
--- a/reference/imagick/imagick/getimagegravity.xml
+++ b/reference/imagick/imagick/getimagegravity.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagegreenprimary.xml b/reference/imagick/imagick/getimagegreenprimary.xml
index e6dd98e98c..5291478427 100644
--- a/reference/imagick/imagick/getimagegreenprimary.xml
+++ b/reference/imagick/imagick/getimagegreenprimary.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageheight.xml b/reference/imagick/imagick/getimageheight.xml
index 8842fd5af0..592e7a020e 100644
--- a/reference/imagick/imagick/getimageheight.xml
+++ b/reference/imagick/imagick/getimageheight.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagehistogram.xml b/reference/imagick/imagick/getimagehistogram.xml
index a8a7e3e06d..17e1e1757d 100644
--- a/reference/imagick/imagick/getimagehistogram.xml
+++ b/reference/imagick/imagick/getimagehistogram.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageindex.xml b/reference/imagick/imagick/getimageindex.xml
index 94b47617e9..a54450f671 100644
--- a/reference/imagick/imagick/getimageindex.xml
+++ b/reference/imagick/imagick/getimageindex.xml
@@ -23,6 +23,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageinterlacescheme.xml b/reference/imagick/imagick/getimageinterlacescheme.xml
index e83626b0c3..608173aad1 100644
--- a/reference/imagick/imagick/getimageinterlacescheme.xml
+++ b/reference/imagick/imagick/getimageinterlacescheme.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageinterpolatemethod.xml b/reference/imagick/imagick/getimageinterpolatemethod.xml
index 9d70d61270..9bb83936b2 100644
--- a/reference/imagick/imagick/getimageinterpolatemethod.xml
+++ b/reference/imagick/imagick/getimageinterpolatemethod.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageiterations.xml b/reference/imagick/imagick/getimageiterations.xml
index ef2ad2256c..eb0265a456 100644
--- a/reference/imagick/imagick/getimageiterations.xml
+++ b/reference/imagick/imagick/getimageiterations.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagelength.xml b/reference/imagick/imagick/getimagelength.xml
index 7d4c3aee67..13474f100b 100644
--- a/reference/imagick/imagick/getimagelength.xml
+++ b/reference/imagick/imagick/getimagelength.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagematte.xml b/reference/imagick/imagick/getimagematte.xml
index cd2bbffe7a..881b614693 100644
--- a/reference/imagick/imagick/getimagematte.xml
+++ b/reference/imagick/imagick/getimagematte.xml
@@ -23,6 +23,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagemattecolor.xml b/reference/imagick/imagick/getimagemattecolor.xml
index f845e5ce7b..317790ab3a 100644
--- a/reference/imagick/imagick/getimagemattecolor.xml
+++ b/reference/imagick/imagick/getimagemattecolor.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageorientation.xml b/reference/imagick/imagick/getimageorientation.xml
index 3e24683c28..d1beff3133 100644
--- a/reference/imagick/imagick/getimageorientation.xml
+++ b/reference/imagick/imagick/getimageorientation.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagepage.xml b/reference/imagick/imagick/getimagepage.xml
index 935281b867..447e96699c 100644
--- a/reference/imagick/imagick/getimagepage.xml
+++ b/reference/imagick/imagick/getimagepage.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageproperty.xml b/reference/imagick/imagick/getimageproperty.xml
index 0c2a6033e3..93b62655d9 100644
--- a/reference/imagick/imagick/getimageproperty.xml
+++ b/reference/imagick/imagick/getimageproperty.xml
@@ -34,6 +34,14 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a string containing the image property, false if a
+   property with the given name does not exist.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -66,14 +74,6 @@ echo $image->getImageProperty('Exif:Make');
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the image property, false if a 
-   property with the given name does not exist.
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/getimageredprimary.xml b/reference/imagick/imagick/getimageredprimary.xml
index 5d9fd34fa1..c63f6a7be3 100644
--- a/reference/imagick/imagick/getimageredprimary.xml
+++ b/reference/imagick/imagick/getimageredprimary.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagerenderingintent.xml b/reference/imagick/imagick/getimagerenderingintent.xml
index 8178b32a7e..dd8fffad62 100644
--- a/reference/imagick/imagick/getimagerenderingintent.xml
+++ b/reference/imagick/imagick/getimagerenderingintent.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageresolution.xml b/reference/imagick/imagick/getimageresolution.xml
index 21e6e234d1..7c4bff848d 100644
--- a/reference/imagick/imagick/getimageresolution.xml
+++ b/reference/imagick/imagick/getimageresolution.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagesblob.xml b/reference/imagick/imagick/getimagesblob.xml
index 731df021d5..79d635ce58 100644
--- a/reference/imagick/imagick/getimagesblob.xml
+++ b/reference/imagick/imagick/getimagesblob.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagescene.xml b/reference/imagick/imagick/getimagescene.xml
index 198ed88d13..66c71fdc22 100644
--- a/reference/imagick/imagick/getimagescene.xml
+++ b/reference/imagick/imagick/getimagescene.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagesignature.xml b/reference/imagick/imagick/getimagesignature.xml
index 02c1883a8d..910a9a7239 100644
--- a/reference/imagick/imagick/getimagesignature.xml
+++ b/reference/imagick/imagick/getimagesignature.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagesize.xml b/reference/imagick/imagick/getimagesize.xml
index bacfec7acf..ac61075355 100644
--- a/reference/imagick/imagick/getimagesize.xml
+++ b/reference/imagick/imagick/getimagesize.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagetickspersecond.xml b/reference/imagick/imagick/getimagetickspersecond.xml
index d6ba7b81a5..838b3194b4 100644
--- a/reference/imagick/imagick/getimagetickspersecond.xml
+++ b/reference/imagick/imagick/getimagetickspersecond.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagetotalinkdensity.xml b/reference/imagick/imagick/getimagetotalinkdensity.xml
index d57fdbbd67..e324395044 100644
--- a/reference/imagick/imagick/getimagetotalinkdensity.xml
+++ b/reference/imagick/imagick/getimagetotalinkdensity.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagetype.xml b/reference/imagick/imagick/getimagetype.xml
index 5ac162e461..bcf42f3e1a 100644
--- a/reference/imagick/imagick/getimagetype.xml
+++ b/reference/imagick/imagick/getimagetype.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimageunits.xml b/reference/imagick/imagick/getimageunits.xml
index e6f32e30bf..bdc55d69c6 100644
--- a/reference/imagick/imagick/getimageunits.xml
+++ b/reference/imagick/imagick/getimageunits.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagevirtualpixelmethod.xml b/reference/imagick/imagick/getimagevirtualpixelmethod.xml
index 482b121ca6..453853b626 100644
--- a/reference/imagick/imagick/getimagevirtualpixelmethod.xml
+++ b/reference/imagick/imagick/getimagevirtualpixelmethod.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagewhitepoint.xml b/reference/imagick/imagick/getimagewhitepoint.xml
index 4f194bd541..e0c34cdc57 100644
--- a/reference/imagick/imagick/getimagewhitepoint.xml
+++ b/reference/imagick/imagick/getimagewhitepoint.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getimagewidth.xml b/reference/imagick/imagick/getimagewidth.xml
index afe0836a02..67cd2fa5eb 100644
--- a/reference/imagick/imagick/getimagewidth.xml
+++ b/reference/imagick/imagick/getimagewidth.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getinterlacescheme.xml b/reference/imagick/imagick/getinterlacescheme.xml
index 6762e11998..7c3de2c801 100644
--- a/reference/imagick/imagick/getinterlacescheme.xml
+++ b/reference/imagick/imagick/getinterlacescheme.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getiteratorindex.xml b/reference/imagick/imagick/getiteratorindex.xml
index 82a1f1c691..914877fa78 100644
--- a/reference/imagick/imagick/getiteratorindex.xml
+++ b/reference/imagick/imagick/getiteratorindex.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getnumberimages.xml b/reference/imagick/imagick/getnumberimages.xml
index c020feb091..ffc804fd46 100644
--- a/reference/imagick/imagick/getnumberimages.xml
+++ b/reference/imagick/imagick/getnumberimages.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getpackagename.xml b/reference/imagick/imagick/getpackagename.xml
index 7e7149095a..97687f87e4 100644
--- a/reference/imagick/imagick/getpackagename.xml
+++ b/reference/imagick/imagick/getpackagename.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getpage.xml b/reference/imagick/imagick/getpage.xml
index 330db58e1a..2f9eaddfc7 100644
--- a/reference/imagick/imagick/getpage.xml
+++ b/reference/imagick/imagick/getpage.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getpixeliterator.xml b/reference/imagick/imagick/getpixeliterator.xml
index c7fa0f447d..b6bd211831 100644
--- a/reference/imagick/imagick/getpixeliterator.xml
+++ b/reference/imagick/imagick/getpixeliterator.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getpointsize.xml b/reference/imagick/imagick/getpointsize.xml
index 59085e62ac..796ab1c734 100644
--- a/reference/imagick/imagick/getpointsize.xml
+++ b/reference/imagick/imagick/getpointsize.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getquantumdepth.xml b/reference/imagick/imagick/getquantumdepth.xml
index 64a7bfbd31..2df8045d06 100644
--- a/reference/imagick/imagick/getquantumdepth.xml
+++ b/reference/imagick/imagick/getquantumdepth.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getquantumrange.xml b/reference/imagick/imagick/getquantumrange.xml
index f352eb8960..0a16cffb1e 100644
--- a/reference/imagick/imagick/getquantumrange.xml
+++ b/reference/imagick/imagick/getquantumrange.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getreleasedate.xml b/reference/imagick/imagick/getreleasedate.xml
index 231af2c671..d1faed186d 100644
--- a/reference/imagick/imagick/getreleasedate.xml
+++ b/reference/imagick/imagick/getreleasedate.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getsamplingfactors.xml b/reference/imagick/imagick/getsamplingfactors.xml
index d6e30f85ec..bc563e5983 100644
--- a/reference/imagick/imagick/getsamplingfactors.xml
+++ b/reference/imagick/imagick/getsamplingfactors.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getsize.xml b/reference/imagick/imagick/getsize.xml
index 77540c07ea..ed1f2d35ed 100644
--- a/reference/imagick/imagick/getsize.xml
+++ b/reference/imagick/imagick/getsize.xml
@@ -22,6 +22,11 @@
   </note>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getsizeoffset.xml b/reference/imagick/imagick/getsizeoffset.xml
index 8ec8bacedf..030a228c06 100644
--- a/reference/imagick/imagick/getsizeoffset.xml
+++ b/reference/imagick/imagick/getsizeoffset.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/getversion.xml b/reference/imagick/imagick/getversion.xml
index 76c901c2ff..ade82032bb 100644
--- a/reference/imagick/imagick/getversion.xml
+++ b/reference/imagick/imagick/getversion.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/hasnextimage.xml b/reference/imagick/imagick/hasnextimage.xml
index e58aee78a9..0e3ecf144e 100644
--- a/reference/imagick/imagick/hasnextimage.xml
+++ b/reference/imagick/imagick/hasnextimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/haspreviousimage.xml b/reference/imagick/imagick/haspreviousimage.xml
index 029b4d9a37..c32d4da37d 100644
--- a/reference/imagick/imagick/haspreviousimage.xml
+++ b/reference/imagick/imagick/haspreviousimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/identifyimage.xml b/reference/imagick/imagick/identifyimage.xml
index 3f2abc1127..dcae90c890 100644
--- a/reference/imagick/imagick/identifyimage.xml
+++ b/reference/imagick/imagick/identifyimage.xml
@@ -41,6 +41,13 @@
    the image width, height, size, and others.
   </para>
  </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   &imagick.imagick.throws;
+  </para>
+ </refsect1>
  
  <refsect1 role="examples">
   <para>
@@ -77,13 +84,6 @@ Array
    </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/magnifyimage.xml b/reference/imagick/imagick/magnifyimage.xml
index bd7557a24a..45dab1cf15 100644
--- a/reference/imagick/imagick/magnifyimage.xml
+++ b/reference/imagick/imagick/magnifyimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/mergeimagelayers.xml b/reference/imagick/imagick/mergeimagelayers.xml
index 609fb6cfff..e94e9e43be 100644
--- a/reference/imagick/imagick/mergeimagelayers.xml
+++ b/reference/imagick/imagick/mergeimagelayers.xml
@@ -49,18 +49,7 @@
    &imagick.imagick.throws;
   </para>
  </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::flattenImages</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -89,6 +78,15 @@ function mergeImageLayers($layerMethodType, $imagePath1, $imagePath2) {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::flattenImages</function></member>
+   </simplelist>
+  </para>
+ </refsect1> 
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/minifyimage.xml b/reference/imagick/imagick/minifyimage.xml
index f22062c0e3..e55cc5d6dc 100644
--- a/reference/imagick/imagick/minifyimage.xml
+++ b/reference/imagick/imagick/minifyimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/mosaicimages.xml b/reference/imagick/imagick/mosaicimages.xml
index bce78b3fe1..07fdf02cf4 100644
--- a/reference/imagick/imagick/mosaicimages.xml
+++ b/reference/imagick/imagick/mosaicimages.xml
@@ -23,6 +23,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/nextimage.xml b/reference/imagick/imagick/nextimage.xml
index 693b80ef9b..b46311aa8a 100644
--- a/reference/imagick/imagick/nextimage.xml
+++ b/reference/imagick/imagick/nextimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/optimizeimagelayers.xml b/reference/imagick/imagick/optimizeimagelayers.xml
index a1cbffc987..860ee74d06 100644
--- a/reference/imagick/imagick/optimizeimagelayers.xml
+++ b/reference/imagick/imagick/optimizeimagelayers.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/previousimage.xml b/reference/imagick/imagick/previousimage.xml
index c0a67c96d1..88a79f871c 100644
--- a/reference/imagick/imagick/previousimage.xml
+++ b/reference/imagick/imagick/previousimage.xml
@@ -13,10 +13,15 @@
    <void/>
   </methodsynopsis>
   <para>
-   Assocates the previous image in an image list with the Imagick object.
+   Associates the previous image in an image list with the Imagick object.
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/recolorimage.xml b/reference/imagick/imagick/recolorimage.xml
index 105cd2560f..e5c939cac1 100644
--- a/reference/imagick/imagick/recolorimage.xml
+++ b/reference/imagick/imagick/recolorimage.xml
@@ -47,17 +47,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::displayImage</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -91,6 +80,15 @@ function recolorImage($imagePath) {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::displayImage</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/removeimage.xml b/reference/imagick/imagick/removeimage.xml
index 3b220dfffb..1c35b7fa5b 100644
--- a/reference/imagick/imagick/removeimage.xml
+++ b/reference/imagick/imagick/removeimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/render.xml b/reference/imagick/imagick/render.xml
index 5b979b8b56..b3ca8356c9 100644
--- a/reference/imagick/imagick/render.xml
+++ b/reference/imagick/imagick/render.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/roundcorners.xml b/reference/imagick/imagick/roundcorners.xml
index ef558a009b..a1feaee6a0 100644
--- a/reference/imagick/imagick/roundcorners.xml
+++ b/reference/imagick/imagick/roundcorners.xml
@@ -77,6 +77,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &imagick.return.success;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -102,14 +109,6 @@ $image->writeImage("rounded.png");
   </para>
  </refsect1>
 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/setfirstiterator.xml b/reference/imagick/imagick/setfirstiterator.xml
index 5cc865f278..f3551a9726 100644
--- a/reference/imagick/imagick/setfirstiterator.xml
+++ b/reference/imagick/imagick/setfirstiterator.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/setfont.xml b/reference/imagick/imagick/setfont.xml
index 245654b85f..8e2c370f5c 100644
--- a/reference/imagick/imagick/setfont.xml
+++ b/reference/imagick/imagick/setfont.xml
@@ -45,17 +45,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::getFont</function></member>
-    <member><function>ImagickDraw::setFont</function></member>
-    <member><function>ImagickDraw::getFont</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -117,17 +106,16 @@ $im->newPseudoImage(100, 100, "caption:Hello");
   </para>
  </refsect1>
 
- <!-- Use when adding See Also links
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
+    <member><function>Imagick::getFont</function></member>
+    <member><function>ImagickDraw::setFont</function></member>
+    <member><function>ImagickDraw::getFont</function></member>
    </simplelist>
   </para>
  </refsect1>
- -->
 
 </refentry>
 
diff --git a/reference/imagick/imagick/setimageartifact.xml b/reference/imagick/imagick/setimageartifact.xml
index b6bc7dc07e..30b54d061d 100644
--- a/reference/imagick/imagick/setimageartifact.xml
+++ b/reference/imagick/imagick/setimageartifact.xml
@@ -58,18 +58,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::getImageArtifact</function></member>
-    <member><function>Imagick::deleteImageArtifact</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -99,6 +87,16 @@ function setImageArtifact() {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::getImageArtifact</function></member>
+    <member><function>Imagick::deleteImageArtifact</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/setimageproperty.xml b/reference/imagick/imagick/setimageproperty.xml
index 02a71690e9..05f76539c5 100644
--- a/reference/imagick/imagick/setimageproperty.xml
+++ b/reference/imagick/imagick/setimageproperty.xml
@@ -41,6 +41,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &imagick.return.success;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -73,13 +80,6 @@ echo $image->getImageProperty('Exif:Make');
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/setlastiterator.xml b/reference/imagick/imagick/setlastiterator.xml
index 2ddf5f64ff..a465b5ea0a 100644
--- a/reference/imagick/imagick/setlastiterator.xml
+++ b/reference/imagick/imagick/setlastiterator.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/setpointsize.xml b/reference/imagick/imagick/setpointsize.xml
index e5314e9970..962699d3c2 100644
--- a/reference/imagick/imagick/setpointsize.xml
+++ b/reference/imagick/imagick/setpointsize.xml
@@ -42,15 +42,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::getPointSize</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -81,6 +72,16 @@ $im->newPseudoImage(100, 100, "caption:Hello");
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::getPointSize</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/sigmoidalcontrastimage.xml b/reference/imagick/imagick/sigmoidalcontrastimage.xml
index ffd1ee0530..e7ce94d4a5 100644
--- a/reference/imagick/imagick/sigmoidalcontrastimage.xml
+++ b/reference/imagick/imagick/sigmoidalcontrastimage.xml
@@ -76,6 +76,13 @@
    &imagick.return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   &imagick.imagick.throws;
+  </para>
+ </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
@@ -106,13 +113,6 @@ function generateBlendImage($width, $height, $contrast = 10, $midpoint = 0.5) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/stripimage.xml b/reference/imagick/imagick/stripimage.xml
index 6ada85ccc0..4c2f34d9b6 100644
--- a/reference/imagick/imagick/stripimage.xml
+++ b/reference/imagick/imagick/stripimage.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/transformimagecolorspace.xml b/reference/imagick/imagick/transformimagecolorspace.xml
index deaff49d50..299b951df0 100644
--- a/reference/imagick/imagick/transformimagecolorspace.xml
+++ b/reference/imagick/imagick/transformimagecolorspace.xml
@@ -41,8 +41,6 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="classname.methodname.example.basic">
@@ -77,31 +75,6 @@ function transformImageColorspace($imagePath, $colorSpace, $channel) {
   </simplelist>
  </refsect1>
 
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::transformImageColorspace</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function transformImageColorspace($imagePath, $colorSpace, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->transformimagecolorspace($colorSpace);
-    $imagick->separateImageChannel($channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/transposeimage.xml b/reference/imagick/imagick/transposeimage.xml
index ac56d1b30c..748a6d954e 100644
--- a/reference/imagick/imagick/transposeimage.xml
+++ b/reference/imagick/imagick/transposeimage.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -27,16 +32,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::transverseImage</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -59,6 +54,15 @@ function transposeImage($imagePath) {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::transverseImage</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/transverseimage.xml b/reference/imagick/imagick/transverseimage.xml
index b3d715cea1..bee828e0bd 100644
--- a/reference/imagick/imagick/transverseimage.xml
+++ b/reference/imagick/imagick/transverseimage.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -27,17 +32,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::transposeImage</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -60,6 +54,15 @@ function transverseImage($imagePath) {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::transposeImage</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/uniqueimagecolors.xml b/reference/imagick/imagick/uniqueimagecolors.xml
index d21df9ade6..98faf6bd1e 100644
--- a/reference/imagick/imagick/uniqueimagecolors.xml
+++ b/reference/imagick/imagick/uniqueimagecolors.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/valid.xml b/reference/imagick/imagick/valid.xml
index eb614871ec..2a485d6328 100644
--- a/reference/imagick/imagick/valid.xml
+++ b/reference/imagick/imagick/valid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagick/vignetteimage.xml b/reference/imagick/imagick/vignetteimage.xml
index ab7768ec8d..2ed46a4003 100644
--- a/reference/imagick/imagick/vignetteimage.xml
+++ b/reference/imagick/imagick/vignetteimage.xml
@@ -69,18 +69,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::waveImage</function></member>
-    <member><function>Imagick::swirlImage</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -103,6 +91,16 @@ function vignetteImage($imagePath, $blackPoint, $whitePoint, $x, $y) {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::waveImage</function></member>
+    <member><function>Imagick::swirlImage</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick/waveimage.xml b/reference/imagick/imagick/waveimage.xml
index b0d36545e9..5543a44acc 100644
--- a/reference/imagick/imagick/waveimage.xml
+++ b/reference/imagick/imagick/waveimage.xml
@@ -58,21 +58,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::solarizeImage</function></member>
-    <member><function>Imagick::oilpaintImage</function></member>
-    <member><function>Imagick::embossImage</function></member>
-    <member><function>Imagick::addNoiseImage</function></member>
-    <member><function>Imagick::swirlImage</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -95,6 +80,19 @@ function waveImage($imagePath, $amplitude, $length) {
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::solarizeImage</function></member>
+    <member><function>Imagick::oilpaintImage</function></member>
+    <member><function>Imagick::embossImage</function></member>
+    <member><function>Imagick::addNoiseImage</function></member>
+    <member><function>Imagick::swirlImage</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagickdraw/affine.xml b/reference/imagick/imagickdraw/affine.xml
index dd52f9ebd9..d4e42efb60 100644
--- a/reference/imagick/imagickdraw/affine.xml
+++ b/reference/imagick/imagickdraw/affine.xml
@@ -48,7 +48,7 @@
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::affine</function></title>
+      <title><function>ImagickDraw::affine</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/arc.xml b/reference/imagick/imagickdraw/arc.xml
index 1106b1157d..c738bc2e99 100644
--- a/reference/imagick/imagickdraw/arc.xml
+++ b/reference/imagick/imagickdraw/arc.xml
@@ -86,13 +86,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::arc</function></title>
+      <title><function>ImagickDraw::arc</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/bezier.xml b/reference/imagick/imagickdraw/bezier.xml
index c419a292ac..85731ffabd 100644
--- a/reference/imagick/imagickdraw/bezier.xml
+++ b/reference/imagick/imagickdraw/bezier.xml
@@ -42,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::bezier</function></title>
+      <title><function>ImagickDraw::bezier</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/circle.xml b/reference/imagick/imagickdraw/circle.xml
index 33f379d1bd..da6470bf10 100644
--- a/reference/imagick/imagickdraw/circle.xml
+++ b/reference/imagick/imagickdraw/circle.xml
@@ -68,13 +68,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::circle</function></title>
+      <title><function>ImagickDraw::circle</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/clear.xml b/reference/imagick/imagickdraw/clear.xml
index 57454685bd..d506ffcc07 100644
--- a/reference/imagick/imagickdraw/clear.xml
+++ b/reference/imagick/imagickdraw/clear.xml
@@ -22,7 +22,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ImagickDraw object.
+   Returns an <classname>ImagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/clone.xml b/reference/imagick/imagickdraw/clone.xml
index a2cbda61a2..3543304ef8 100644
--- a/reference/imagick/imagickdraw/clone.xml
+++ b/reference/imagick/imagickdraw/clone.xml
@@ -14,15 +14,14 @@
   </methodsynopsis>
   &warn.undocumented.func;
   <para>
-   Makes an exact copy of the specified ImagickDraw object.
+   Makes an exact copy of the specified <classname>ImagickDraw</classname> object.
   </para>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   What the function returns, first on success, then on failure. See
-   also the &amp;return.success; entity
+   returns an exact copy of the specified <classname>ImagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/color.xml b/reference/imagick/imagickdraw/color.xml
index 7f1218191b..3878a73678 100644
--- a/reference/imagick/imagickdraw/color.xml
+++ b/reference/imagick/imagickdraw/color.xml
@@ -45,7 +45,8 @@
      <term><parameter>paintMethod</parameter></term>
      <listitem>
       <para>
-       one of the PAINT_ constants
+       One of the <link linkend="imagick.constants.paint">PAINT</link> constant
+       (<literal>imagick::PAINT_*</literal>).
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/imagick/imagickdraw/composite.xml b/reference/imagick/imagickdraw/composite.xml
index 22150f3daa..998573e3a9 100644
--- a/reference/imagick/imagickdraw/composite.xml
+++ b/reference/imagick/imagickdraw/composite.xml
@@ -32,7 +32,9 @@
      <term><parameter>compose</parameter></term>
      <listitem>
       <para>
-       composition operator. One of COMPOSITE_ constants
+       composition operator.
+       One of the <link linkend="imagick.constants.compositeop">Composite Operator</link> constant
+       (<literal>imagick::COMPOSITE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -40,7 +42,7 @@
      <term><parameter>x</parameter></term>
      <listitem>
       <para>
-       x coordinate of the top left corner
+       x coordinate of the top left corner.
       </para>
      </listitem>
     </varlistentry>
@@ -48,7 +50,7 @@
      <term><parameter>y</parameter></term>
      <listitem>
       <para>
-       y coordinate of the top left corner
+       y coordinate of the top left corner.
       </para>
      </listitem>
     </varlistentry>
@@ -56,7 +58,7 @@
      <term><parameter>width</parameter></term>
      <listitem>
       <para>
-       width of the composition image
+       width of the composition image.
       </para>
      </listitem>
     </varlistentry>
@@ -64,7 +66,7 @@
      <term><parameter>height</parameter></term>
      <listitem>
       <para>
-       height of the composition image
+       height of the composition image.
       </para>
      </listitem>
     </varlistentry>
@@ -72,7 +74,7 @@
      <term><parameter>compositeWand</parameter></term>
      <listitem>
       <para>
-       the Imagick object where composition image is taken from
+       the <classname>Imagick</classname> object where composition image is taken from.
       </para>
      </listitem>
     </varlistentry>
@@ -87,13 +89,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::composite</function></title>
+      <title><function>ImagickDraw::composite</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/construct.xml b/reference/imagick/imagickdraw/construct.xml
index b93ad3b5b2..b9b7ee71b4 100644
--- a/reference/imagick/imagickdraw/construct.xml
+++ b/reference/imagick/imagickdraw/construct.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   &warn.undocumented.func;
   <para>
-   The ImagickDraw constructor
+   The <classname>ImagickDraw</classname> constructor.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/destroy.xml b/reference/imagick/imagickdraw/destroy.xml
index d928a06952..d0fb6d6279 100644
--- a/reference/imagick/imagickdraw/destroy.xml
+++ b/reference/imagick/imagickdraw/destroy.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   &warn.undocumented.func;
   <para>
-   Frees all resources associated with the ImagickDraw object.
+   Frees all resources associated with the <classname>ImagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/ellipse.xml b/reference/imagick/imagickdraw/ellipse.xml
index e246266e51..49806e01af 100644
--- a/reference/imagick/imagickdraw/ellipse.xml
+++ b/reference/imagick/imagickdraw/ellipse.xml
@@ -80,13 +80,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::ellipse</function></title>
+      <title><function>ImagickDraw::ellipse</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/getcliprule.xml b/reference/imagick/imagickdraw/getcliprule.xml
index 43dcefaebe..00fe8665e6 100644
--- a/reference/imagick/imagickdraw/getcliprule.xml
+++ b/reference/imagick/imagickdraw/getcliprule.xml
@@ -21,7 +21,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns one of the FILLRULE_ constants.
+   Returns a <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
+   (<literal>imagick::FILLRULE_*</literal>). 
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getclipunits.xml b/reference/imagick/imagickdraw/getclipunits.xml
index bae8ef8f2c..8c1074c7fc 100644
--- a/reference/imagick/imagickdraw/getclipunits.xml
+++ b/reference/imagick/imagickdraw/getclipunits.xml
@@ -21,7 +21,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an int on success.
+   Returns an &integer; on success.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getfillcolor.xml b/reference/imagick/imagickdraw/getfillcolor.xml
index 7c7030090e..7dea0ec16d 100644
--- a/reference/imagick/imagickdraw/getfillcolor.xml
+++ b/reference/imagick/imagickdraw/getfillcolor.xml
@@ -21,7 +21,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ImagickPixel object.
+   Returns an <classname>ImagickPixel</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getfillrule.xml b/reference/imagick/imagickdraw/getfillrule.xml
index 759519ff74..2bafde31d3 100644
--- a/reference/imagick/imagickdraw/getfillrule.xml
+++ b/reference/imagick/imagickdraw/getfillrule.xml
@@ -21,7 +21,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a FILLRULE_ constant
+   Returns a <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
+   (<literal>imagick::FILLRULE_*</literal>).
   </para>
  </refsect1>
  
diff --git a/reference/imagick/imagickdraw/getfontsize.xml b/reference/imagick/imagickdraw/getfontsize.xml
index 3e4ccbf363..a8a76e3062 100644
--- a/reference/imagick/imagickdraw/getfontsize.xml
+++ b/reference/imagick/imagickdraw/getfontsize.xml
@@ -21,7 +21,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the font size associated with the current ImagickDraw object.
+   Returns the font size associated with the current <classname>ImagickDraw</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getfontstyle.xml b/reference/imagick/imagickdraw/getfontstyle.xml
index 91486c72b1..456e47028b 100644
--- a/reference/imagick/imagickdraw/getfontstyle.xml
+++ b/reference/imagick/imagickdraw/getfontstyle.xml
@@ -21,7 +21,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the font style constant (STYLE_) associated with the ImagickDraw object 
+   Returns a <link linkend="imagick.constants.styles">STYLE</link> constant
+   (<literal>imagick::STYLE_*</literal>) associated with the <classname>ImagickDraw</classname> object 
    or 0 if no style is set.
   </para>
  </refsect1>
diff --git a/reference/imagick/imagickdraw/getfontweight.xml b/reference/imagick/imagickdraw/getfontweight.xml
index 9b36facbf9..b4e1b63511 100644
--- a/reference/imagick/imagickdraw/getfontweight.xml
+++ b/reference/imagick/imagickdraw/getfontweight.xml
@@ -21,7 +21,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an int on success and 0 if no weight is set.
+   Returns an &integer; on success and 0 if no weight is set.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getgravity.xml b/reference/imagick/imagickdraw/getgravity.xml
index 898ba9a6a4..3ea5eeab3c 100644
--- a/reference/imagick/imagickdraw/getgravity.xml
+++ b/reference/imagick/imagickdraw/getgravity.xml
@@ -21,7 +21,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a GRAVITY_ constant on success and 0 if no gravity is set.
+   Returns a <link linkend="imagick.constants.gravity">GRAVITY</link> constant
+   (<literal>imagick::GRAVITY_*</literal>) on success and 0 if no gravity is set.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getstrokeantialias.xml b/reference/imagick/imagickdraw/getstrokeantialias.xml
index 36e6128820..1ebc04a0a2 100644
--- a/reference/imagick/imagickdraw/getstrokeantialias.xml
+++ b/reference/imagick/imagickdraw/getstrokeantialias.xml
@@ -15,7 +15,7 @@
   &warn.undocumented.func;
   <para>
    Returns the current stroke antialias setting. Stroked outlines are
-   antialiased by default.  When antialiasing is disabled stroked pixels are
+   antialiased by default. When antialiasing is disabled stroked pixels are
    thresholded to determine if the stroke color or underlying canvas color
    should be used.
   </para>
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if antialiasing is on and false if it is off.
+   Returns &true; if antialiasing is on and &false; if it is off.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getstrokecolor.xml b/reference/imagick/imagickdraw/getstrokecolor.xml
index 0f71519fc1..e850b4960a 100644
--- a/reference/imagick/imagickdraw/getstrokecolor.xml
+++ b/reference/imagick/imagickdraw/getstrokecolor.xml
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ImagickPixel object which describes the color.
+   Returns an <classname>ImagickPixel</classname> object which describes the color.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getstrokelinecap.xml b/reference/imagick/imagickdraw/getstrokelinecap.xml
index 8f312b0b3f..f02f3d9633 100644
--- a/reference/imagick/imagickdraw/getstrokelinecap.xml
+++ b/reference/imagick/imagickdraw/getstrokelinecap.xml
@@ -22,7 +22,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns one of the LINECAP_ constants or 0 if stroke linecap is not set.
+   Returns a <link linkend="imagick.constants.linecap">LINECAP</link> constant
+   (<literal>imagick::LINECAP_*</literal>), or 0 if stroke linecap is not set.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getstrokelinejoin.xml b/reference/imagick/imagickdraw/getstrokelinejoin.xml
index d55f0c6c0b..6533b30bf6 100644
--- a/reference/imagick/imagickdraw/getstrokelinejoin.xml
+++ b/reference/imagick/imagickdraw/getstrokelinejoin.xml
@@ -22,7 +22,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns one of the LINEJOIN_ constants or 0 if stroke line join is not set.
+   Returns a <link linkend="imagick.constants.linejoin">LINEJOIN</link> constant
+   (<literal>imagick::LINEJOIN_*</literal>), or 0 if stroke line join is not set.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/gettextalignment.xml b/reference/imagick/imagickdraw/gettextalignment.xml
index 77f553e131..8010beb471 100644
--- a/reference/imagick/imagickdraw/gettextalignment.xml
+++ b/reference/imagick/imagickdraw/gettextalignment.xml
@@ -21,7 +21,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns one of the ALIGN_ constants and 0 if no align is set.
+   Returns a <link linkend="imagick.constants.align">ALIGN</link> constant
+   (<literal>imagick::ALIGN_*</literal>), and 0 if no align is set.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/gettextantialias.xml b/reference/imagick/imagickdraw/gettextantialias.xml
index 338e479e6b..e20979e340 100644
--- a/reference/imagick/imagickdraw/gettextantialias.xml
+++ b/reference/imagick/imagickdraw/gettextantialias.xml
@@ -15,14 +15,14 @@
   &warn.undocumented.func;
   <para>
    Returns the current text antialias setting, which determines whether text
-   is antialiased.  Text is antialiased by default.
+   is antialiased. Text is antialiased by default.
   </para>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if text is antialiased and false if not.
+   Returns &true; if text is antialiased and &false; if not.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/gettextdecoration.xml b/reference/imagick/imagickdraw/gettextdecoration.xml
index 89b8d8070a..a7fe9aea3a 100644
--- a/reference/imagick/imagickdraw/gettextdecoration.xml
+++ b/reference/imagick/imagickdraw/gettextdecoration.xml
@@ -21,8 +21,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns one of the DECORATION_ constants
-   and 0 if no decoration is set.
+   Returns a <link linkend="imagick.constants.decoration">DECORATION</link> constant
+   (<literal>imagick::DECORATION_*</literal>), and 0 if no decoration is set.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/gettextundercolor.xml b/reference/imagick/imagickdraw/gettextundercolor.xml
index e2d9d10d5f..bb4950443f 100644
--- a/reference/imagick/imagickdraw/gettextundercolor.xml
+++ b/reference/imagick/imagickdraw/gettextundercolor.xml
@@ -21,7 +21,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ImagickPixel object describing the color.
+   Returns an <classname>ImagickPixel</classname> object describing the color.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/getvectorgraphics.xml b/reference/imagick/imagickdraw/getvectorgraphics.xml
index 2eaa241849..86b06878ca 100644
--- a/reference/imagick/imagickdraw/getvectorgraphics.xml
+++ b/reference/imagick/imagickdraw/getvectorgraphics.xml
@@ -15,7 +15,7 @@
   &warn.undocumented.func;
   <para>
    Returns a string which specifies the vector graphics generated by any
-   graphics calls made since the ImagickDraw object was instantiated.  
+   graphics calls made since the <classname>ImagickDraw</classname> object was instantiated.  
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/line.xml b/reference/imagick/imagickdraw/line.xml
index acd5344929..95879a6e0c 100644
--- a/reference/imagick/imagickdraw/line.xml
+++ b/reference/imagick/imagickdraw/line.xml
@@ -68,13 +68,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::line</function></title>
+      <title><function>ImagickDraw::line</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/matte.xml b/reference/imagick/imagickdraw/matte.xml
index 3cf7797d91..be4ee02f62 100644
--- a/reference/imagick/imagickdraw/matte.xml
+++ b/reference/imagick/imagickdraw/matte.xml
@@ -45,7 +45,8 @@
      <term><parameter>paintMethod</parameter></term>
      <listitem>
       <para>
-       PAINT_ constant
+       One of the <link linkend="imagick.constants.paint">PAINT</link> constant
+       (<literal>imagick::PAINT_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -60,13 +61,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::matte</function></title>
+      <title><function>ImagickDraw::matte</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml
index 556955efa8..0f5ef574ba 100644
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml
+++ b/reference/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml
@@ -71,13 +71,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::pathCurveToQuadraticBezierAbsolute</function></title>
+      <title><function>ImagickDraw::pathCurveToQuadraticBezierAbsolute</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml
index 5fc75a8bcb..da5f09f810 100644
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml
+++ b/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml
@@ -68,7 +68,7 @@
   <para>
    <example>
     <title>
-     <methodname>ImagickDraw::pathCurveToQuadraticBezierSmoothAbsolute</methodname>
+     <methodname>ImagickDraw::pathCurveToQuadraticBezierSmoothAbsolute</methodname> example
     </title>
     <programlisting role="php">
      <![CDATA[
diff --git a/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml
index 1fc1ddbe62..7e09e96658 100644
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml
+++ b/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml
@@ -69,7 +69,7 @@
   <para>
    <example>
     <title>
-     <methodname>ImagickDraw::pathCurveToQuadraticBezierSmoothRelative</methodname>
+     <methodname>ImagickDraw::pathCurveToQuadraticBezierSmoothRelative</methodname> example
     </title>
     <programlisting role="php">
      <![CDATA[
diff --git a/reference/imagick/imagickdraw/pathellipticarcabsolute.xml b/reference/imagick/imagickdraw/pathellipticarcabsolute.xml
index 1e4e7acf3f..43ebd66596 100644
--- a/reference/imagick/imagickdraw/pathellipticarcabsolute.xml
+++ b/reference/imagick/imagickdraw/pathellipticarcabsolute.xml
@@ -27,8 +27,8 @@
    (cx, cy) of the ellipse is calculated automatically to satisfy the
    constraints imposed by the other parameters. largeArcFlag and sweepFlag
    contribute to the automatic calculations and help determine how the arc
-   is drawn. If largeArcFlag is &true; then draw the larger of the available
-   arcs. If sweepFlag is true, then draw the arc matching a clock-wise
+   is drawn. If <parameter>large_arc_flag</parameter> is &true; then draw the larger of the available
+   arcs. If <parameter>sweep_flag</parameter> is true, then draw the arc matching a clock-wise
    rotation.
   </para>
  </refsect1>
diff --git a/reference/imagick/imagickdraw/pathellipticarcrelative.xml b/reference/imagick/imagickdraw/pathellipticarcrelative.xml
index 4a05efd121..3fa116a3fe 100644
--- a/reference/imagick/imagickdraw/pathellipticarcrelative.xml
+++ b/reference/imagick/imagickdraw/pathellipticarcrelative.xml
@@ -27,8 +27,8 @@
    (cx, cy) of the ellipse is calculated automatically to satisfy the
    constraints imposed by the other parameters. largeArcFlag and sweepFlag
    contribute to the automatic calculations and help determine how the arc
-   is drawn. If largeArcFlag is &true; then draw the larger of the available
-   arcs. If sweepFlag is true, then draw the arc matching a clock-wise
+   is drawn. If <parameter>large_arc_flag</parameter> is &true; then draw the larger of the available
+   arcs. If <parameter>sweep_flag</parameter> is true, then draw the arc matching a clock-wise
    rotation.
   </para>
  </refsect1>
diff --git a/reference/imagick/imagickdraw/pathstart.xml b/reference/imagick/imagickdraw/pathstart.xml
index 335477c744..515ef5319e 100644
--- a/reference/imagick/imagickdraw/pathstart.xml
+++ b/reference/imagick/imagickdraw/pathstart.xml
@@ -28,13 +28,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::pathStart</function></title>
+      <title><function>ImagickDraw::pathStart</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/point.xml b/reference/imagick/imagickdraw/point.xml
index 256992d251..d5f1e040b4 100644
--- a/reference/imagick/imagickdraw/point.xml
+++ b/reference/imagick/imagickdraw/point.xml
@@ -50,13 +50,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::point</function></title>
+      <title><function>ImagickDraw::point</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/polygon.xml b/reference/imagick/imagickdraw/polygon.xml
index f640256afd..bf8e6837d6 100644
--- a/reference/imagick/imagickdraw/polygon.xml
+++ b/reference/imagick/imagickdraw/polygon.xml
@@ -42,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::polygon</function></title>
+      <title><function>ImagickDraw::polygon</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/polyline.xml b/reference/imagick/imagickdraw/polyline.xml
index 1d99240d46..453861019e 100644
--- a/reference/imagick/imagickdraw/polyline.xml
+++ b/reference/imagick/imagickdraw/polyline.xml
@@ -42,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::polyline</function></title>
+      <title><function>ImagickDraw::polyline</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/pop.xml b/reference/imagick/imagickdraw/pop.xml
index 4fcaa30341..e9ac410855 100644
--- a/reference/imagick/imagickdraw/pop.xml
+++ b/reference/imagick/imagickdraw/pop.xml
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success and false on failure.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/popdefs.xml b/reference/imagick/imagickdraw/popdefs.xml
index 5802f20b0e..cdaeae9c88 100644
--- a/reference/imagick/imagickdraw/popdefs.xml
+++ b/reference/imagick/imagickdraw/popdefs.xml
@@ -25,13 +25,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::popDefs</function></title>
+      <title><function>ImagickDraw::popDefs</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/push.xml b/reference/imagick/imagickdraw/push.xml
index ba0add75bc..1786c61773 100644
--- a/reference/imagick/imagickdraw/push.xml
+++ b/reference/imagick/imagickdraw/push.xml
@@ -16,7 +16,7 @@
   <para>
    Clones the current ImagickDraw to create a new ImagickDraw, which is then
    added to the ImagickDraw stack. The original drawing ImagickDraw(s) may be
-   returned to by invoking pop(). The ImagickDraws are stored on a
+   returned to by invoking <methodname>ImagickDraw::pop</methodname>. The ImagickDraws are stored on a
    ImagickDraw stack. For every Pop there must have already been an equivalent
    Push.
   </para>
@@ -29,13 +29,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::push</function></title>
+      <title><function>ImagickDraw::push</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/pushclippath.xml b/reference/imagick/imagickdraw/pushclippath.xml
index 4bde139beb..5835f62269 100644
--- a/reference/imagick/imagickdraw/pushclippath.xml
+++ b/reference/imagick/imagickdraw/pushclippath.xml
@@ -15,7 +15,7 @@
   &warn.undocumented.func;
   <para>
    Starts a clip path definition which is comprised of any number of drawing
-   commands and terminated by a ImagickDraw::popClipPath() command.
+   commands and terminated by a <methodname>ImagickDraw::popClipPath</methodname> command.
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/pushdefs.xml b/reference/imagick/imagickdraw/pushdefs.xml
index 83c1d98089..9313c8115c 100644
--- a/reference/imagick/imagickdraw/pushdefs.xml
+++ b/reference/imagick/imagickdraw/pushdefs.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   &warn.undocumented.func;
   <para>
-   Indicates that commands up to a terminating ImagickDraw::popDefs()
+   Indicates that commands up to a terminating <methodname>ImagickDraw::popDefs</methodname>
    command create named elements (e.g. clip-paths, textures, etc.) which
    may safely be processed earlier for the sake of efficiency.
   </para>
diff --git a/reference/imagick/imagickdraw/pushpattern.xml b/reference/imagick/imagickdraw/pushpattern.xml
index e88c207029..ab45479b5a 100644
--- a/reference/imagick/imagickdraw/pushpattern.xml
+++ b/reference/imagick/imagickdraw/pushpattern.xml
@@ -81,13 +81,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::pushPattern</function></title>
+      <title><function>ImagickDraw::pushPattern</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/rectangle.xml b/reference/imagick/imagickdraw/rectangle.xml
index 62ae55e3c0..32787b9f38 100644
--- a/reference/imagick/imagickdraw/rectangle.xml
+++ b/reference/imagick/imagickdraw/rectangle.xml
@@ -69,13 +69,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::rectangle</function></title>
+      <title><function>ImagickDraw::rectangle</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/rotate.xml b/reference/imagick/imagickdraw/rotate.xml
index 544758cc45..7ab60c73ec 100644
--- a/reference/imagick/imagickdraw/rotate.xml
+++ b/reference/imagick/imagickdraw/rotate.xml
@@ -26,7 +26,7 @@
      <term><parameter>degrees</parameter></term>
      <listitem>
       <para>
-       degrees to rotate
+       degrees to rotate.
       </para>
      </listitem>
     </varlistentry>
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::rotate</function></title>
+      <title><function>ImagickDraw::rotate</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/roundrectangle.xml b/reference/imagick/imagickdraw/roundrectangle.xml
index 27bcb090ea..432e10ace1 100644
--- a/reference/imagick/imagickdraw/roundrectangle.xml
+++ b/reference/imagick/imagickdraw/roundrectangle.xml
@@ -87,13 +87,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::roundRectangle</function></title>
+      <title><function>ImagickDraw::roundRectangle</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/scale.xml b/reference/imagick/imagickdraw/scale.xml
index 1d5dda6dde..a337dc9d86 100644
--- a/reference/imagick/imagickdraw/scale.xml
+++ b/reference/imagick/imagickdraw/scale.xml
@@ -51,13 +51,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::scale</function></title>
+      <title><function>ImagickDraw::scale</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setclippath.xml b/reference/imagick/imagickdraw/setclippath.xml
index eaeaf5915d..0e441e71e1 100644
--- a/reference/imagick/imagickdraw/setclippath.xml
+++ b/reference/imagick/imagickdraw/setclippath.xml
@@ -42,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setClipPath</function></title>
+      <title><function>ImagickDraw::setClipPath</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setcliprule.xml b/reference/imagick/imagickdraw/setcliprule.xml
index 7c9c71ad25..c7b80e05c5 100644
--- a/reference/imagick/imagickdraw/setcliprule.xml
+++ b/reference/imagick/imagickdraw/setcliprule.xml
@@ -26,7 +26,8 @@
      <term><parameter>fill_rule</parameter></term>
      <listitem>
       <para>
-       FILLRULE_ constant
+       One of the <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
+       (<literal>imagick::FILLRULE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -41,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setClipRule</function></title>
+      <title><function>ImagickDraw::setClipRule</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setclipunits.xml b/reference/imagick/imagickdraw/setclipunits.xml
index 31bcc1e09c..9f42683a14 100644
--- a/reference/imagick/imagickdraw/setclipunits.xml
+++ b/reference/imagick/imagickdraw/setclipunits.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setClipUnits</function></title>
+      <title><function>ImagickDraw::setClipUnits</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfillalpha.xml b/reference/imagick/imagickdraw/setfillalpha.xml
index 9b2b8492a6..4e2f3e4810 100644
--- a/reference/imagick/imagickdraw/setfillalpha.xml
+++ b/reference/imagick/imagickdraw/setfillalpha.xml
@@ -42,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFillAlpha</function></title>
+      <title><function>ImagickDraw::setFillAlpha</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfillrule.xml b/reference/imagick/imagickdraw/setfillrule.xml
index 821314cfa1..3edf09a80f 100644
--- a/reference/imagick/imagickdraw/setfillrule.xml
+++ b/reference/imagick/imagickdraw/setfillrule.xml
@@ -26,7 +26,8 @@
      <term><parameter>fill_rule</parameter></term>
      <listitem>
       <para>
-       FILLRULE_ constant
+       One of the <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
+       (<literal>imagick::FILLRULE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -41,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFillRule</function></title>
+      <title><function>ImagickDraw::setFillRule</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfont.xml b/reference/imagick/imagickdraw/setfont.xml
index 3acdb19687..a82646f7b4 100644
--- a/reference/imagick/imagickdraw/setfont.xml
+++ b/reference/imagick/imagickdraw/setfont.xml
@@ -40,13 +40,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFont</function></title>
+      <title><function>ImagickDraw::setFont</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfontfamily.xml b/reference/imagick/imagickdraw/setfontfamily.xml
index 9be835dd3e..91b25312c6 100644
--- a/reference/imagick/imagickdraw/setfontfamily.xml
+++ b/reference/imagick/imagickdraw/setfontfamily.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFontFamily</function></title>
+      <title><function>ImagickDraw::setFontFamily</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfontsize.xml b/reference/imagick/imagickdraw/setfontsize.xml
index fbdcf719cd..ee6c073e03 100644
--- a/reference/imagick/imagickdraw/setfontsize.xml
+++ b/reference/imagick/imagickdraw/setfontsize.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFontSize</function></title>
+      <title><function>ImagickDraw::setFontSize</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfontstretch.xml b/reference/imagick/imagickdraw/setfontstretch.xml
index 92576f374d..02000ffeeb 100644
--- a/reference/imagick/imagickdraw/setfontstretch.xml
+++ b/reference/imagick/imagickdraw/setfontstretch.xml
@@ -27,7 +27,8 @@
      <term><parameter>fontStretch</parameter></term>
      <listitem>
       <para>
-       STRETCH_ constant
+       One of the <link linkend="imagick.constants.stretch">STRETCH</link> constant
+       (<literal>imagick::STRETCH_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -42,13 +43,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFontStretch</function></title>
+      <title><function>ImagickDraw::setFontStretch</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfontstyle.xml b/reference/imagick/imagickdraw/setfontstyle.xml
index 21e918ab8c..99e01df9e3 100644
--- a/reference/imagick/imagickdraw/setfontstyle.xml
+++ b/reference/imagick/imagickdraw/setfontstyle.xml
@@ -27,7 +27,8 @@
      <term><parameter>style</parameter></term>
      <listitem>
       <para>
-       STYLETYPE_ constant
+       One of the <link linkend="imagick.constants.styles">STYLE</link> constant
+       (<literal>imagick::STYLE_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -42,13 +43,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFontStyle</function></title>
+      <title><function>ImagickDraw::setFontStyle</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setfontweight.xml b/reference/imagick/imagickdraw/setfontweight.xml
index 2639a94b08..4a5e247f68 100644
--- a/reference/imagick/imagickdraw/setfontweight.xml
+++ b/reference/imagick/imagickdraw/setfontweight.xml
@@ -39,13 +39,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setFontWeight</function></title>
+      <title><function>ImagickDraw::setFontWeight</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setgravity.xml b/reference/imagick/imagickdraw/setgravity.xml
index 1b06782e71..1f0e62536e 100644
--- a/reference/imagick/imagickdraw/setgravity.xml
+++ b/reference/imagick/imagickdraw/setgravity.xml
@@ -26,7 +26,8 @@
      <term><parameter>gravity</parameter></term>
      <listitem>
       <para>
-       GRAVITY_ constant
+       One of the <link linkend="imagick.constants.gravity">GRAVITY</link> constant
+       (<literal>imagick::GRAVITY_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -41,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setGravity</function></title>
+      <title><function>ImagickDraw::setGravity</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokealpha.xml b/reference/imagick/imagickdraw/setstrokealpha.xml
index 2e5a994660..feef15accc 100644
--- a/reference/imagick/imagickdraw/setstrokealpha.xml
+++ b/reference/imagick/imagickdraw/setstrokealpha.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeAlpha</function></title>
+      <title><function>ImagickDraw::setStrokeAlpha</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokeantialias.xml b/reference/imagick/imagickdraw/setstrokeantialias.xml
index ad5de02e76..3fe67a9c20 100644
--- a/reference/imagick/imagickdraw/setstrokeantialias.xml
+++ b/reference/imagick/imagickdraw/setstrokeantialias.xml
@@ -44,13 +44,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeAntialias</function></title>
+      <title><function>ImagickDraw::setStrokeAntialias</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokecolor.xml b/reference/imagick/imagickdraw/setstrokecolor.xml
index 0d36001760..1af22f0ff3 100644
--- a/reference/imagick/imagickdraw/setstrokecolor.xml
+++ b/reference/imagick/imagickdraw/setstrokecolor.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeColor</function></title>
+      <title><function>ImagickDraw::setStrokeColor</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokedasharray.xml b/reference/imagick/imagickdraw/setstrokedasharray.xml
index 19e12b1008..d893fd3554 100644
--- a/reference/imagick/imagickdraw/setstrokedasharray.xml
+++ b/reference/imagick/imagickdraw/setstrokedasharray.xml
@@ -47,13 +47,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeDashArray</function></title>
+      <title><function>ImagickDraw::setStrokeDashArray</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokedashoffset.xml b/reference/imagick/imagickdraw/setstrokedashoffset.xml
index 52eb07745d..ce76725c7a 100644
--- a/reference/imagick/imagickdraw/setstrokedashoffset.xml
+++ b/reference/imagick/imagickdraw/setstrokedashoffset.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeDashOffset</function></title>
+      <title><function>ImagickDraw::setStrokeDashOffset</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokelinecap.xml b/reference/imagick/imagickdraw/setstrokelinecap.xml
index 60b2eed467..88d9a4cabb 100644
--- a/reference/imagick/imagickdraw/setstrokelinecap.xml
+++ b/reference/imagick/imagickdraw/setstrokelinecap.xml
@@ -27,7 +27,8 @@
      <term><parameter>linecap</parameter></term>
      <listitem>
       <para>
-       LINECAP_ constant
+       One of the <link linkend="imagick.constants.linecap">LINECAP</link> constant
+       (<literal>imagick::LINECAP_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -42,13 +43,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeLineCap</function></title>
+      <title><function>ImagickDraw::setStrokeLineCap</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokelinejoin.xml b/reference/imagick/imagickdraw/setstrokelinejoin.xml
index c271ba30b6..edb5260c4a 100644
--- a/reference/imagick/imagickdraw/setstrokelinejoin.xml
+++ b/reference/imagick/imagickdraw/setstrokelinejoin.xml
@@ -27,7 +27,8 @@
      <term><parameter>linejoin</parameter></term>
      <listitem>
       <para>
-       LINEJOIN_ constant
+       One of the <link linkend="imagick.constants.linejoin">LINEJOIN</link> constant
+       (<literal>imagick::LINEJOIN_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -42,13 +43,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeLineJoin</function></title>
+      <title><function>ImagickDraw::setStrokeLineJoin</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokemiterlimit.xml b/reference/imagick/imagickdraw/setstrokemiterlimit.xml
index e25b31a2ec..cf6f15d2b2 100644
--- a/reference/imagick/imagickdraw/setstrokemiterlimit.xml
+++ b/reference/imagick/imagickdraw/setstrokemiterlimit.xml
@@ -45,13 +45,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeMiterLimit</function></title>
+      <title><function>ImagickDraw::setStrokeMiterLimit</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokeopacity.xml b/reference/imagick/imagickdraw/setstrokeopacity.xml
index 51aa7afb77..ff9715c824 100644
--- a/reference/imagick/imagickdraw/setstrokeopacity.xml
+++ b/reference/imagick/imagickdraw/setstrokeopacity.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeOpacity</function></title>
+      <title><function>ImagickDraw::setStrokeOpacity</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setstrokepatternurl.xml b/reference/imagick/imagickdraw/setstrokepatternurl.xml
index 2edaec243c..e88602b8a7 100644
--- a/reference/imagick/imagickdraw/setstrokepatternurl.xml
+++ b/reference/imagick/imagickdraw/setstrokepatternurl.xml
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   imagick.imagickdraw.return.success;
+   &imagick.return.success;
   </para>
  </refsect1>
 
diff --git a/reference/imagick/imagickdraw/setstrokewidth.xml b/reference/imagick/imagickdraw/setstrokewidth.xml
index 92328c4b57..ec35bc039e 100644
--- a/reference/imagick/imagickdraw/setstrokewidth.xml
+++ b/reference/imagick/imagickdraw/setstrokewidth.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setStrokeWidth</function></title>
+      <title><function>ImagickDraw::setStrokeWidth</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/settextalignment.xml b/reference/imagick/imagickdraw/settextalignment.xml
index 1c2125b19d..39f86a6166 100644
--- a/reference/imagick/imagickdraw/settextalignment.xml
+++ b/reference/imagick/imagickdraw/settextalignment.xml
@@ -26,7 +26,8 @@
      <term><parameter>alignment</parameter></term>
      <listitem>
       <para>
-       ALIGN_ constant
+       One of the <link linkend="imagick.constants.align">ALIGN</link> constant
+       (<literal>imagick::ALIGN_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -41,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setTextAlignment</function></title>
+      <title><function>ImagickDraw::setTextAlignment</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/settextantialias.xml b/reference/imagick/imagickdraw/settextantialias.xml
index 53847f53fa..a07e23001b 100644
--- a/reference/imagick/imagickdraw/settextantialias.xml
+++ b/reference/imagick/imagickdraw/settextantialias.xml
@@ -40,13 +40,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setTextAntialias</function></title>
+      <title><function>ImagickDraw::setTextAntialias</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/settextdecoration.xml b/reference/imagick/imagickdraw/settextdecoration.xml
index 44cd1e99fa..629bbe0138 100644
--- a/reference/imagick/imagickdraw/settextdecoration.xml
+++ b/reference/imagick/imagickdraw/settextdecoration.xml
@@ -26,7 +26,8 @@
      <term><parameter>decoration</parameter></term>
      <listitem>
       <para>
-       DECORATION_ constant
+       One of the <link linkend="imagick.constants.decoration">DECORATION</link> constant
+       (<literal>imagick::DECORATION_*</literal>).
       </para>
      </listitem>
     </varlistentry>
@@ -41,13 +42,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setTextDecoration</function></title>
+      <title><function>ImagickDraw::setTextDecoration</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/settextundercolor.xml b/reference/imagick/imagickdraw/settextundercolor.xml
index b912cbfd81..a4dfe03539 100644
--- a/reference/imagick/imagickdraw/settextundercolor.xml
+++ b/reference/imagick/imagickdraw/settextundercolor.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setTextUnderColor</function></title>
+      <title><function>ImagickDraw::setTextUnderColor</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setvectorgraphics.xml b/reference/imagick/imagickdraw/setvectorgraphics.xml
index b2c6ca7abf..a322a17dee 100644
--- a/reference/imagick/imagickdraw/setvectorgraphics.xml
+++ b/reference/imagick/imagickdraw/setvectorgraphics.xml
@@ -15,7 +15,7 @@
   &warn.undocumented.func;
   <para>
    Sets the vector graphics associated with the specified ImagickDraw
-   object. Use this method with ImagickDraw::getVectorGraphics() as a method
+   object. Use this method with <methodname>ImagickDraw::getVectorGraphics</methodname> as a method
    to persist the vector graphics state.
   </para>
  </refsect1>
@@ -43,13 +43,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setVectorGraphics</function></title>
+      <title><function>ImagickDraw::setVectorGraphics</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/setviewbox.xml b/reference/imagick/imagickdraw/setviewbox.xml
index bef877ac30..3357e426d8 100644
--- a/reference/imagick/imagickdraw/setviewbox.xml
+++ b/reference/imagick/imagickdraw/setviewbox.xml
@@ -72,13 +72,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::setViewBox</function></title>
+      <title><function>ImagickDraw::setViewBox</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/skewx.xml b/reference/imagick/imagickdraw/skewx.xml
index a8ccfb3cf6..8aaf642315 100644
--- a/reference/imagick/imagickdraw/skewx.xml
+++ b/reference/imagick/imagickdraw/skewx.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::skewX</function></title>
+      <title><function>ImagickDraw::skewX</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/skewy.xml b/reference/imagick/imagickdraw/skewy.xml
index b5888ad5b4..c4b2cd6364 100644
--- a/reference/imagick/imagickdraw/skewy.xml
+++ b/reference/imagick/imagickdraw/skewy.xml
@@ -41,13 +41,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::skewY</function></title>
+      <title><function>ImagickDraw::skewY</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickdraw/translate.xml b/reference/imagick/imagickdraw/translate.xml
index cf4b0e7148..f0c371c19e 100644
--- a/reference/imagick/imagickdraw/translate.xml
+++ b/reference/imagick/imagickdraw/translate.xml
@@ -51,13 +51,11 @@
   </para>
  </refsect1>
 
-
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
     <example>
-      <title> <function>ImagickDraw::translate</function></title>
+      <title><function>ImagickDraw::translate</function> example</title>
       <programlisting role="php">
       <![CDATA[
 <?php
diff --git a/reference/imagick/imagickpixel/getcolorcount.xml b/reference/imagick/imagickpixel/getcolorcount.xml
index 87ae7a6d4c..8c091ec431 100644
--- a/reference/imagick/imagickpixel/getcolorcount.xml
+++ b/reference/imagick/imagickpixel/getcolorcount.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imagick/imagickpixel/gethsl.xml b/reference/imagick/imagickpixel/gethsl.xml
index 27b5e06315..48fff13df9 100644
--- a/reference/imagick/imagickpixel/gethsl.xml
+++ b/reference/imagick/imagickpixel/gethsl.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imap/functions/imap-alerts.xml b/reference/imap/functions/imap-alerts.xml
index 1aba1ce437..23bfe4f935 100644
--- a/reference/imap/functions/imap-alerts.xml
+++ b/reference/imap/functions/imap-alerts.xml
@@ -21,6 +21,12 @@
    be passed to the user.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imap/functions/imap-errors.xml b/reference/imap/functions/imap-errors.xml
index 496ec2a9f5..30991a2dc5 100644
--- a/reference/imap/functions/imap-errors.xml
+++ b/reference/imap/functions/imap-errors.xml
@@ -20,6 +20,12 @@
    subsequently cleared.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/imap/functions/imap-last-error.xml b/reference/imap/functions/imap-last-error.xml
index 669d9a127e..9ebd5449b4 100644
--- a/reference/imap/functions/imap-last-error.xml
+++ b/reference/imap/functions/imap-last-error.xml
@@ -18,6 +18,12 @@
    errors, will return the same error. 
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/assert.xml b/reference/info/functions/assert.xml
index 2e707157fa..e229096a40 100644
--- a/reference/info/functions/assert.xml
+++ b/reference/info/functions/assert.xml
@@ -224,6 +224,20 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        Declaring a function called <literal>assert()</literal> inside a namespace is
+        no longer allowed, and issues <constant>E_COMPILE_ERROR</constant>.
+       </entry>
+      </row>
+      <row>
+       <entry>7.3.0</entry>
+       <entry>
+        Declaring a function called <literal>assert()</literal> inside a namespace 
+        became deprecated. Such declaration now emits an <constant>E_DEPRECATED</constant>.
+       </entry>
+      </row>
       <row>
        <entry>7.2.0</entry>
        <entry>
diff --git a/reference/info/functions/extension-loaded.xml b/reference/info/functions/extension-loaded.xml
index 839cf4f4ef..802765c53d 100644
--- a/reference/info/functions/extension-loaded.xml
+++ b/reference/info/functions/extension-loaded.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>extension_loaded</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>extension</parameter></methodparam>
   </methodsynopsis>
   <para>
    Finds out whether the extension is loaded.
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>name</parameter></term>
+     <term><parameter>extension</parameter></term>
      <listitem>
       <para>
        The extension name. This parameter is case-insensitive.
@@ -62,7 +62,7 @@ ctype
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if the extension identified by <parameter>name</parameter>
+   Returns &true; if the extension identified by <parameter>extension</parameter>
    is loaded, &false; otherwise.
   </para>
  </refsect1>
@@ -101,7 +101,6 @@ if (!extension_loaded('gd')) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/info/functions/get-current-user.xml b/reference/info/functions/get-current-user.xml
index f6d289be51..6261ba432d 100644
--- a/reference/info/functions/get-current-user.xml
+++ b/reference/info/functions/get-current-user.xml
@@ -17,6 +17,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/get-extension-funcs.xml b/reference/info/functions/get-extension-funcs.xml
index 4a7968bc93..a686d233b3 100644
--- a/reference/info/functions/get-extension-funcs.xml
+++ b/reference/info/functions/get-extension-funcs.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>get_extension_funcs</methodname>
-   <methodparam><type>string</type><parameter>module_name</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>get_extension_funcs</methodname>
+   <methodparam><type>string</type><parameter>extension</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function returns the names of all the functions defined in
-   the module indicated by <parameter>module_name</parameter>.
+   the module indicated by <parameter>extension</parameter>.
   </para>
  </refsect1>
 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>module_name</parameter></term>
+     <term><parameter>extension</parameter></term>
      <listitem>
       <para>
        The module name.
@@ -43,7 +43,7 @@
   &reftitle.returnvalues;
   <para>
    Returns an array with all the functions, or &false; if 
-   <parameter>module_name</parameter> is not a valid extension.
+   <parameter>extension</parameter> is not a valid extension.
   </para>
  </refsect1>
 
@@ -106,7 +106,6 @@ Array
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/info/functions/get-include-path.xml b/reference/info/functions/get-include-path.xml
index 2fe3d912f3..0cb40e0923 100644
--- a/reference/info/functions/get-include-path.xml
+++ b/reference/info/functions/get-include-path.xml
@@ -18,6 +18,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/get-included-files.xml b/reference/info/functions/get-included-files.xml
index f892631b15..99e73fd833 100644
--- a/reference/info/functions/get-included-files.xml
+++ b/reference/info/functions/get-included-files.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/get-magic-quotes-gpc.xml b/reference/info/functions/get-magic-quotes-gpc.xml
index 69716ff2fd..ab1afd0ebc 100644
--- a/reference/info/functions/get-magic-quotes-gpc.xml
+++ b/reference/info/functions/get-magic-quotes-gpc.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/get-magic-quotes-runtime.xml b/reference/info/functions/get-magic-quotes-runtime.xml
index 0d7645b7d0..c34ce8d031 100644
--- a/reference/info/functions/get-magic-quotes-runtime.xml
+++ b/reference/info/functions/get-magic-quotes-runtime.xml
@@ -22,6 +22,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -80,7 +85,6 @@ if(get_magic_quotes_runtime())
   <para>
    <simplelist>
     <member><function>get_magic_quotes_gpc</function></member>
-    <member><function>set_magic_quotes_runtime</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/info/functions/get-resources.xml b/reference/info/functions/get-resources.xml
index e14925547a..a4180f9001 100644
--- a/reference/info/functions/get-resources.xml
+++ b/reference/info/functions/get-resources.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>get_resources</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>type</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns an array of all currently active <type>resource</type>s, optionally
@@ -52,6 +52,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>type</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -114,7 +136,6 @@ array(0) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/info/functions/getenv.xml b/reference/info/functions/getenv.xml
index 2cfb6eea0e..b32784daab 100644
--- a/reference/info/functions/getenv.xml
+++ b/reference/info/functions/getenv.xml
@@ -82,7 +82,7 @@
       </entry>
      </row>
      <row>
-      <entry>5.5.38, 5.6.24, 7.0.9</entry>
+      <entry>7.0.9</entry>
       <entry>
        The <parameter>local_only</parameter> parameter has been added.
       </entry>
@@ -92,19 +92,6 @@
   </informaltable>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    If PHP is running in a SAPI such as Fast CGI, this function will 
-    always return the value of an environment variable set by the SAPI, 
-    even if <function>putenv</function> has been used to set a local 
-    environment variable of the same name. Use the <parameter>local_only</parameter> 
-    parameter to return the value of locally-set environment variables.
-   </para>
-  </warning>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -129,6 +116,19 @@ $ip = getenv('REMOTE_ADDR', true) ?: getenv('REMOTE_ADDR')
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <warning>
+   <para>
+    If PHP is running in a SAPI such as Fast CGI, this function will
+    always return the value of an environment variable set by the SAPI,
+    even if <function>putenv</function> has been used to set a local
+    environment variable of the same name. Use the <parameter>local_only</parameter>
+    parameter to return the value of locally-set environment variables.
+   </para>
+  </warning>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/info/functions/getlastmod.xml b/reference/info/functions/getlastmod.xml
index 5593336eb4..5ecc185549 100644
--- a/reference/info/functions/getlastmod.xml
+++ b/reference/info/functions/getlastmod.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/getmygid.xml b/reference/info/functions/getmygid.xml
index e3e3fce237..d2a971058d 100644
--- a/reference/info/functions/getmygid.xml
+++ b/reference/info/functions/getmygid.xml
@@ -17,6 +17,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/getmyinode.xml b/reference/info/functions/getmyinode.xml
index 353e8dfb9f..7f15d83e24 100644
--- a/reference/info/functions/getmyinode.xml
+++ b/reference/info/functions/getmyinode.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/getmypid.xml b/reference/info/functions/getmypid.xml
index b038b77c86..06c661db43 100644
--- a/reference/info/functions/getmypid.xml
+++ b/reference/info/functions/getmypid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/getmyuid.xml b/reference/info/functions/getmyuid.xml
index 66df66b4d1..20f6d6598b 100644
--- a/reference/info/functions/getmyuid.xml
+++ b/reference/info/functions/getmyuid.xml
@@ -17,6 +17,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/getopt.xml b/reference/info/functions/getopt.xml
index 3e37392ae7..5cb030d958 100644
--- a/reference/info/functions/getopt.xml
+++ b/reference/info/functions/getopt.xml
@@ -262,9 +262,9 @@ array(2) {
 <![CDATA[
 <?php
 // Script example.php
-$optind = null;
-$opts = getopt('a:b:', [], $optind);
-$pos_args = array_slice($argv, $optind);
+$rest_index = null;
+$opts = getopt('a:b:', [], $rest_index);
+$pos_args = array_slice($argv, $rest_index);
 var_dump($pos_args);
 ]]>
     </programlisting>
diff --git a/reference/info/functions/getrusage.xml b/reference/info/functions/getrusage.xml
index c4062af01a..dc1f838d8c 100644
--- a/reference/info/functions/getrusage.xml
+++ b/reference/info/functions/getrusage.xml
@@ -44,6 +44,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>7.0.0</entry>
+       <entry>
+        This function is now supported on Windows.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -76,30 +100,6 @@ echo $dat["ru_stime.tv_usec"]; // system time used (microseconds)
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        This function is now supported on Windows.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/info/functions/ini-get-all.xml b/reference/info/functions/ini-get-all.xml
index dd124e2e9c..2f4ce55211 100644
--- a/reference/info/functions/ini-get-all.xml
+++ b/reference/info/functions/ini-get-all.xml
@@ -73,16 +73,6 @@
    </para>
   </note>
  </refsect1>
- 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>ini_get_all</function> ignores "array" ini options such as
-    pdo.dsn.*.
-   </para>
-  </note>
- </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
@@ -169,6 +159,16 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    <function>ini_get_all</function> ignores "array" ini options such as
+    pdo.dsn.*.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/info/functions/ini-get.xml b/reference/info/functions/ini-get.xml
index 4876505565..92cfeb9d7a 100644
--- a/reference/info/functions/ini-get.xml
+++ b/reference/info/functions/ini-get.xml
@@ -68,7 +68,7 @@ function return_bytes($val) {
     $val = trim($val);
     $last = strtolower($val[strlen($val)-1]);
     switch($last) {
-        // The 'G' modifier is available since PHP 5.1.0
+        // The 'G' modifier is available
         case 'g':
             $val *= 1024;
         case 'm':
diff --git a/reference/info/functions/ini-restore.xml b/reference/info/functions/ini-restore.xml
index c102ba01a2..b533c99ec7 100644
--- a/reference/info/functions/ini-restore.xml
+++ b/reference/info/functions/ini-restore.xml
@@ -48,7 +48,7 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$setting = 'y2k_compliance';
+$setting = 'html_errors';
 
 echo 'Current value for \'' . $setting . '\': ' . ini_get($setting), PHP_EOL;
 
@@ -63,9 +63,9 @@ echo 'Original value for \'' . $setting . '\': ' . ini_get($setting), PHP_EOL;
     &example.outputs;
     <screen>
 <![CDATA[
-Current value for 'y2k_compliance': 1
-New value for 'y2k_compliance': 0
-Original value for 'y2k_compliance': 1
+Current value for 'html_errors': 1
+New value for 'html_errors': 0
+Original value for 'html_errors': 1
 ]]>
     </screen>
    </example>
diff --git a/reference/info/functions/main.xml b/reference/info/functions/main.xml
index 7d0a9650fc..3d0abd359f 100644
--- a/reference/info/functions/main.xml
+++ b/reference/info/functions/main.xml
@@ -58,6 +58,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/info/functions/php-ini-scanned-files.xml b/reference/info/functions/php-ini-scanned-files.xml
index b13a2ab13e..de4130d2e5 100644
--- a/reference/info/functions/php-ini-scanned-files.xml
+++ b/reference/info/functions/php-ini-scanned-files.xml
@@ -24,6 +24,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/php-sapi-name.xml b/reference/info/functions/php-sapi-name.xml
index 3cb3587afe..9c6f984eaa 100644
--- a/reference/info/functions/php-sapi-name.xml
+++ b/reference/info/functions/php-sapi-name.xml
@@ -21,6 +21,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/restore-include-path.xml b/reference/info/functions/restore-include-path.xml
index f0ee49478a..6d9d66c722 100644
--- a/reference/info/functions/restore-include-path.xml
+++ b/reference/info/functions/restore-include-path.xml
@@ -23,6 +23,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/sys-get-temp-dir.xml b/reference/info/functions/sys-get-temp-dir.xml
index 993fe15554..630c7b53e7 100644
--- a/reference/info/functions/sys-get-temp-dir.xml
+++ b/reference/info/functions/sys-get-temp-dir.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/zend-thread-id.xml b/reference/info/functions/zend-thread-id.xml
index 3260ff3b88..5b8729f5b9 100644
--- a/reference/info/functions/zend-thread-id.xml
+++ b/reference/info/functions/zend-thread-id.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/info/functions/zend-version.xml b/reference/info/functions/zend-version.xml
index a97f2e1a48..e9a72ac048 100644
--- a/reference/info/functions/zend-version.xml
+++ b/reference/info/functions/zend-version.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/ingres-ii/book.xml b/reference/ingres-ii/book.xml
deleted file mode 100644
index 22605a6d8d..0000000000
--- a/reference/ingres-ii/book.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
- 
-<book xml:id="book.ingres" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Ingres DBMS, EDBC, and Enterprise Access Gateways</title>
- <titleabbrev>Ingres</titleabbrev>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.ingres">
-  &reftitle.intro;
-  <para>
-   The Ingres driver for PHP enables you to connect to and query the Ingres
-   DBMS, EDBC, and Enterprise Access Gateways.
-  </para>
-  <note>
-   <para>
-    &pecl.moved-ver;5.1.0.
-   </para>
-  </note>
- </preface>
- <!-- }}} -->
- 
- &reference.ingres-ii.setup;
- &reference.ingres-ii.constants;
- &reference.ingres-ii.examples;
- &reference.ingres-ii.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ingres-ii/configure.xml b/reference/ingres-ii/configure.xml
deleted file mode 100644
index 1605fabce4..0000000000
--- a/reference/ingres-ii/configure.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="ingres.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.moved;
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;ingres">&url.pecl.package;ingres</link>.
- </para>
- <para>
-  You can download the DLL for this PECL extension from <link
-  xlink:href="&url.ingres.peclext;">&url.ingres.peclext;</link>.
- </para>
- <para>
-  To have these functions available, you must <link
-  xlink:href="&url.pecl.package;ingres">download</link> and compile
-  this extension, enabling Ingres support using the
-  <option role="configure">--with-ingres[=DIR]</option> option, where DIR is
-  the Ingres base directory. If the <varname>II_SYSTEM</varname> environment variable is not  
-  set correctly you may need to use 
-  <option role="configure">--with-ingres=DIR</option>
-  to specify your Ingres installation directory.
- </para>
- <para>
-  PHP code written for version 2.x and later is not backward-compatible with
-  earlier versions of this PHP extension. However, it is possible to run two 
-  incompatible releases within the same PHP environment using the <option
-  role="configure">--enable-ingres2</option> option. This configuration option
-  renames the extension to ingres2, changing function names, configuration 
-  settings, and constants. For example, with this option enabled,
-  <function>ingres_connect</function> becomes
-  <function>ingres2_connect</function>.
- </para>
- <para>
-  To use this extension the system environment variable II_SYSTEM must be
-  defined. Linux and UNIX users will also need to define the shared library
-  search path, for example, <varname>LD_LIBRARY_PATH</varname>. When used with the Apache web server 
-  these variables must be 
-  set explicitly in the startup script for Apache. In addition, the <literal>PassEnv</literal>
-  directive is required for the Ingres extension to load the correct shared 
-  libraries. For example:
- </para>
- <example>
-  <title>Example usage of PassEnv for Ingres</title>
-  <programlisting>
-<![CDATA[
-<IfModule mod_env.c>
-    PassEnv II_SYSTEM
-    PassEnv LD_LIBRARY_PATH
-</IfModule>
-]]>
-  </programlisting>
- </example>
- <note>
-  <para>
-   For example configurations for different web servers and operating
-   systems see <link
-    xlink:href="&url.ingres.wiki;Ingres_Articles#Ingres_and_Web_Servers">&url.ingres.wiki;Ingres_Articles#Ingres_and_Web_Servers</link>.
-  </para>
- </note>
- 
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/constants.xml b/reference/ingres-ii/constants.xml
deleted file mode 100644
index 98f8f8f861..0000000000
--- a/reference/ingres-ii/constants.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="ingres.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.ingres-assoc">
-   <term>
-    <constant>INGRES_ASSOC</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Columns are returned into the array having the fieldname as the array
-      index. Used with <function>ingres_fetch_array</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-num">
-   <term>
-    <constant>INGRES_NUM</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Columns are returned into the array having a numerical index to the
-      fields. By default this index starts at 1, the first field in the result.
-      To change this value, see <link
-      linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-      Used with <function>ingres_fetch_array</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-both">
-   <term>
-    <constant>INGRES_BOTH</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Columns are returned into the array having both a numerical index and
-      the fieldname as the array index.  Used with 
-      <function>ingres_fetch_array</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-    <varlistentry xml:id="constant.ingres-ext-version">
-   <term>
-    <constant>INGRES_EXT_VERSION</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the version of the Ingres Extension. Available since version 1.2.0 of the PECL extension.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-api-version">
-   <term>
-    <constant>INGRES_API_VERSION</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the version of Ingres OpenAPI that the extension was built against. Available since version 1.2.0 of the PECL extension.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-cursor-readonly">
-   <term>
-    <constant>INGRES_CURSOR_READONLY</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Specifies that Ingres cursors should be opened in "readonly" mode.
-      Available since version 1.2.0 of the PECL extension. Used with <link
-      linkend="ini.ingres.cursor-mode">ingres.cursor_mode</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-cursor-update">
-   <term>
-    <constant>INGRES_CURSOR_UPDATE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Specifies that Ingres cursors should be opened "for update."
-      Available since version 1.2.0 of the PECL extension. Used with <link
-      linkend="ini.ingres.cursor-mode">ingres.cursor_mode</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-multinational">
-   <term>
-    <constant>INGRES_DATE_MULTINATIONAL</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of MULTINATIONAL. Available
-     since version 1.2.0 of the PECL extension. 
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-multinational4">
-   <term>
-    <constant>INGRES_DATE_MULTINATIONAL4</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of MULTINATIONAL4. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-finnish">
-   <term>
-    <constant>INGRES_DATE_FINNISH</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of FINNISH. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-iso">
-   <term>
-    <constant>INGRES_DATE_ISO</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of ISO. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-iso4">
-   <term>
-    <constant>INGRES_DATE_ISO4</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of ISO4. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-german">
-   <term>
-    <constant>INGRES_DATE_GERMAN</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of GERMAN. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-mdy">
-   <term>
-    <constant>INGRES_DATE_MDY</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of MDY. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-dmy">
-   <term>
-    <constant>INGRES_DATE_DMY</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of DMY. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-date-ymd">
-   <term>
-    <constant>INGRES_DATE_YMD</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equivalent to the II_DATE_FORMAT setting of YMD. Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-money-leading">
-   <term>
-    <constant>INGRES_MONEY_LEADING</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the currency character that should be placed at the start of a money
-     value. Equivalent to setting II_MONEY_FORMAT to "L:". Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-money-trailing">
-   <term>
-    <constant>INGRES_MONEY_TRAILING</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the currency character that should be placed at the end of a money
-     value. Equivalent to setting II_MONEY_FORMAT to "T:". Available since version 1.2.0 of the PECL extension.
-     Used with
-     <function>ingres_connect</function>, <function>ingres_pconnect</function>
-     and <function>ingres_set_environment</function>. See <link
-     linkend="function.ingres-set-environment.options">options</link>
-     in <function>ingres_set_environment</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-btree">
-   <term>
-    <constant>INGRES_STRUCTURE_BTREE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table or index structure to BTREE when used in combination with the
-     options or index_structure option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-cbtree">
-   <term>
-    <constant>INGRES_STRUCTURE_CBTREE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table or index structure to COMPRESSED BTREE when used in combination with the
-     options or index_structure option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-hash">
-   <term>
-    <constant>INGRES_STRUCTURE_HASH</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table or index structure to HASH when used in combination with the
-     options or index_structure option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-chash">
-   <term>
-    <constant>INGRES_STRUCTURE_CHASH</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table or index structure to COMPRESSED HASH when used in combination with the
-     options or index_structure option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-heap">
-   <term>
-    <constant>INGRES_STRUCTURE_HEAP</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table structure to HEAP when used in combination with the
-     options option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-cheap">
-   <term>
-    <constant>INGRES_STRUCTURE_CHEAP</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table structure to COMPRESSED HEAP when used in combination with the
-     options option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-isam">
-   <term>
-    <constant>INGRES_STRUCTURE_ISAM</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table or index structure to ISAM when used in combination with the
-     options or index_structure option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ingres-structure-cisam">
-   <term>
-    <constant>INGRES_STRUCTURE_CISAM</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the default table or index structure to COMPRESSED ISAM when used in combination with the
-     options or index_structure option when connecting. Available since version 1.4.0 of the PECL extension.
-     Used with <function>ingres_connect</function> and
-     <function>ingres_pconnect</function>. See <link
-     linkend="function.ingres-connect.options">options</link>
-     in <function>ingres_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/examples.xml b/reference/ingres-ii/examples.xml
deleted file mode 100644
index 4961a83564..0000000000
--- a/reference/ingres-ii/examples.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ingres.examples" xmlns="http://docbook.org/ns/docbook">
- &reftitle.examples;
- <section xml:id="ingres.examples-basic">
-  <title>Basic usage</title>
-  <para>
-   The following simple example shows how to connect to an Ingres database, 
-   execute a query, print
-   resulting rows and disconnect from the database.
-   <example>
-    <title>Simple Ingres Example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Connecting, selecting database
-$link = ingres_connect("database", "user", "password")
-    or die("Could not connect: " . ingres_error($link));
-echo "Connected successfully";
-
-// Select from a table that exists in all Ingres databases
-$query = "SELECT * FROM iitables";
-$result = ingres_query($link,$query) or die("Query failed: " .
-ingres_error($link));
-
-// Print results in HTML
-// relid - table name
-// relowner - table owner
-echo "<table>\n";
-while ($iitables = ingres_fetch_object($result)) {
-    echo "\t<tr>\n";
-    echo "\t\t<td>" . $iitables->relid . "</td>\n";
-    echo "\t\t<td>" . $iitables->relowner . "</td>\n";
-    echo "\t</tr>\n";
-}
-echo "</table>\n";
-
-// Free results
-ingres_free_result($result);
-
-// Commit transaction
-ingres_commit($link);
-
-// Closing connection
-ingres_close($link);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </section>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ingres-ii/functions/ingres-autocommit-state.xml b/reference/ingres-ii/functions/ingres-autocommit-state.xml
deleted file mode 100644
index d6933615cc..0000000000
--- a/reference/ingres-ii/functions/ingres-autocommit-state.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-autocommit-state" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_autocommit_state</refname>
-  <refpurpose>Test if the connection is using autocommit</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_autocommit_state</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_autocommit_state</function> is called to determine whether
-   the current link has autocommit enabled or not. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if autocommit is enabled or &false; when autocommit is
-   disabled
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_autocommit</function></member>
-    <member><function>ingres_query</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-autocommit.xml b/reference/ingres-ii/functions/ingres-autocommit.xml
deleted file mode 100644
index 0eedb4c2c0..0000000000
--- a/reference/ingres-ii/functions/ingres-autocommit.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-autocommit" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_autocommit</refname>
-  <refpurpose>Switch autocommit on or off</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_autocommit</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_autocommit</function> is called before opening a
-   transaction (before the first call to
-   <function>ingres_query</function> or just after a call to
-   <function>ingres_rollback</function> or
-   <function>ingres_commit</function>) to switch the
-   autocommit mode of the server on or off (when the script begins
-   the autocommit mode is off).
-  </para>
-  <para>
-   When autocommit mode is on, every query is automatically
-   committed by the server, as if <function>ingres_commit</function>
-   was called after every call to <function>ingres_query</function>.
-   To see if autocommit is enabled use, 
-   <function>ingres_autocommit_state</function>.
-  </para>
-  <para>
-   By default Ingres will rollback any uncommitted transactions at the end of
-   a request. Use this function or <function>ingres_commit</function> to
-   ensure your data is committed to the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_autocommit_state</function></member>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_rollback</function></member>
-    <member><function>ingres_commit</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-charset.xml b/reference/ingres-ii/functions/ingres-charset.xml
deleted file mode 100644
index dec1d4aab1..0000000000
--- a/reference/ingres-ii/functions/ingres-charset.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-charset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_charset</refname>
-  <refpurpose>Returns the installation character set</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ingres_charset</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_charset</function> is called to determine the character
-   set being used by the Ingres client, from II_CHARSETxx (where xx is the
-   installation code).
-  </para>
-   <note>
-    <para>
-     You can override the value returned by using the function
-     <function>putenv</function>. Changing the value of II_CHARSETxx in a
-     running Ingres installation can cause data corruption.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string with the value for II_CHARSETxx or returns NULL if the value
-   could not be determined.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>ingres_charset</function> - Get the installation character set</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-echo ingres_charset($link) . "\n";
-
-ingres_close($link);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_connect</function></member>
-    <member><function>ingres_query</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-close.xml b/reference/ingres-ii/functions/ingres-close.xml
deleted file mode 100644
index e18855af88..0000000000
--- a/reference/ingres-ii/functions/ingres-close.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_close</refname>
-  <refpurpose>Close an Ingres database connection</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_close</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_close</function> closes the connection to
-   the Ingres server that is associated with the specified link.
-  </para>
-  <para>
-   <function>ingres_close</function> is usually unnecessary, as it
-   will not close persistent connections and all non-persistent connections
-   are automatically closed at the end of the script.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_connect</function></member>
-    <member><function>ingres_pconnect</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-commit.xml b/reference/ingres-ii/functions/ingres-commit.xml
deleted file mode 100644
index c01ffa2e9c..0000000000
--- a/reference/ingres-ii/functions/ingres-commit.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-commit" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_commit</refname>
-  <refpurpose>Commit a transaction</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_commit</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_commit</function> commits the currently open
-   transaction, making all changes made to the database permanent.
-  </para>
-  <para>
-   This closes the transaction. A new transaction can be opened by sending a
-   query with <function>ingres_query</function>.
-  </para>
-  <para>
-   You can also have the server commit automatically after every
-   query by calling <function>ingres_autocommit</function> before
-   opening the transaction.
-  </para>
-  <para>
-   By default Ingres will roll back any uncommitted transactions at the end of
-   a request. Use this function or <function>ingres_autocommit</function> to
-   ensure your that data is committed to the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_rollback</function></member>
-    <member><function>ingres_autocommit</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-connect.xml b/reference/ingres-ii/functions/ingres-connect.xml
deleted file mode 100644
index 4964b642f5..0000000000
--- a/reference/ingres-ii/functions/ingres-connect.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-connect" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_connect</refname>
-  <refpurpose>Open a connection to an Ingres database</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ingres_connect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>database</parameter></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>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_connect</function> opens a connection with the
-   given Ingres <parameter>database</parameter>.
-  </para>
-  <para>
-   The connection is closed when the script ends or when
-   <function>ingres_close</function> is called on this link.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   If some parameters are missing, <function>ingres_connect</function>
-   uses the values in &php.ini; for
-   <parameter>ingres.default_database</parameter>,
-   <parameter>ingres.default_user</parameter> and
-   <parameter>ingres.default_password</parameter>.
-  </para>
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database name. Must follow the syntax:
-      </para>
-      <para>
-       <varname>[vnode::]dbname[/svr_class]</varname>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>username</parameter></term>
-     <listitem>
-      <para>
-       The Ingres user name
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>password</parameter></term>
-     <listitem>
-      <para>
-       The password associated with <parameter>username</parameter>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="function.ingres-connect.options">
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       <function>ingres_connect</function> options
-       <informaltable>
-        <tgroup cols="4">
-         <thead>
-          <row valign="top">
-           <entry>Option name</entry>
-           <entry>Option type</entry>
-           <entry>Description</entry>
-           <entry>Example</entry>
-          </row>
-         </thead>
-         <tbody>
-          <row valign="top">
-           <entry>date_century_boundary</entry>
-           <entry><type>int</type></entry>
-           <entry>The threshold by which a 2-digit year is determined to be in
-           the current century or in the next century. Equivalent to II_DATE_CENTURY_BOUNDARY. </entry>
-           <entry>50</entry>
-          </row>
-          <row valign="top">
-           <entry>group</entry>
-           <entry><type>string</type></entry>
-           <entry>Specifies the group ID of the user, equivalent to the "-G"
-           flag</entry>
-           <entry>payroll</entry>
-          </row>
-          <row valign="top">
-           <entry>role</entry>
-           <entry><type>string</type></entry>
-           <entry>The role ID of the application. If a role password is
-           required, the parameter value should be specified as "role/password"</entry>
-          </row>
-          <row valign="top">
-           <entry>effective_user</entry>
-           <entry><type>string</type></entry>
-           <entry>The ingres user account being impersonated, equivalent to the "-u" flag</entry>
-           <entry>another_user</entry>
-          </row>
-          <row valign="top">
-           <entry>dbms_password</entry>
-           <entry><type>string</type></entry>
-           <entry>The internal database password for the user connecting to Ingres</entry>
-           <entry>s3cr3t</entry>
-          </row>
-          <row valign="top">
-           <entry>table_structure</entry>
-           <entry><type>string</type></entry>
-           <entry><para>
-             The default structure for new tables.
-             Valid values for table_structure are:
-            <itemizedlist>
-             <listitem><simpara>INGRES_STRUCTURE_BTREE</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_HASH</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_HEAP</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_ISAM</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_CBTREE</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_CISAM</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_CHASH</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_CHEAP</simpara></listitem>
-            </itemizedlist>
-            </para>
-           </entry>
-           <entry>INGRES_STRUCTURE_BTREE</entry>
-          </row>
-          <row valign="top">
-           <entry>index_structure</entry>
-           <entry><type>string</type></entry>
-           <entry><para>
-             The default structure for new secondary indexes. Valid values
-           for index_structure are:
-            <itemizedlist>
-             <listitem><simpara>INGRES_STRUCTURE_CBTREE</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_CISAM</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_CHASH</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_BTREE</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_HASH</simpara></listitem>
-             <listitem><simpara>INGRES_STRUCTURE_ISAM</simpara></listitem>
-            </itemizedlist>
-            </para>
-           </entry>
-           <entry>INGRES_STRUCTURE_HASH</entry>
-          </row>
-          <row valign="top">
-           <entry>login_local</entry>
-           <entry><type>bool</type></entry>
-           <entry>Determines how the connection user ID and password are
-           used when a VNODE is included in the target database string.
-           If set to TRUE, the user ID and password are used to locally access
-           the VNODE, and the VNODE login information is used to establish the DBMS
-           connection. If set to FALSE, the process user ID is used to access
-           the VNODE, and the connection user ID and password are used in place
-           of the VNODE login information to establish the DBMS connection.
-           This parameter is ignored if no VNODE is included in the target
-           database string. The default is FALSE.</entry>
-           <entry>TRUE</entry>
-          </row>
-          <row valign="top">
-           <entry>timezone</entry>
-           <entry><type>string</type></entry>
-           <entry>Controls the timezone of the session. If not set it will
-           default to the value defined by II_TIMEZONE_NAME. If
-           II_TIMEZONE_NAME is not defined, NA-PACIFIC (GMT-8 with Daylight
-           Savings) is used.</entry>
-          </row>
-          <row valign="top">
-           <entry>date_format</entry>
-           <entry><type>int</type></entry>
-           <entry><para>Sets the allowable input and output format for Ingres dates.
-           Defaults to the value defined by II_DATE_FORMAT. If II_DATE_FORMAT is
-           not set the default date format is US, e.g. mm/dd/yy. Valid values
-           for date_format are:
-            <itemizedlist>
-             <listitem><simpara>INGRES_DATE_DMY</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_FINISH</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_GERMAN</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_ISO</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_ISO4</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_MDY</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_MULTINATIONAL</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_MULTINATIONAL4</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_YMD</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_US</simpara></listitem>
-            </itemizedlist>
-            </para>
-           </entry>
-           <entry>INGRES_DATE_MULTINATIONAL4</entry>
-          </row>
-          <row valign="top">
-           <entry>decimal_separator</entry>
-           <entry><type>string</type></entry>
-           <entry>The character identifier for decimal data</entry>
-           <entry>","</entry>
-          </row>
-          <row valign="top">
-           <entry>money_lort</entry>
-           <entry><type>int</type></entry>
-           <entry><para>Leading or trailing currency sign. Valid values for money_lort
-           are:
-            <itemizedlist>
-             <listitem><simpara>INGRES_MONEY_LEADING</simpara></listitem>
-             <listitem><simpara>INGRES_MONEY_TRAILING</simpara></listitem>
-            </itemizedlist>
-            </para>
-           </entry>
-           <entry>INGRES_MONEY_TRAILING</entry>
-          </row>
-          <row valign="top">
-           <entry>money_sign</entry>
-           <entry><type>string</type></entry>
-           <entry>The currency symbol to be used with the MONEY datatype</entry>
-           <entry>€</entry>
-          </row>
-          <row valign="top">
-           <entry>money_precision</entry>
-           <entry><type>int</type></entry>
-           <entry>The precision of the MONEY datatype</entry>
-           <entry>3</entry>
-          </row>
-          <row valign="top">
-           <entry>float4_precision</entry>
-           <entry><type>int</type></entry>
-           <entry>Precision of the FLOAT4 datatype</entry>
-           <entry>10</entry>
-          </row>
-          <row valign="top">
-           <entry>float8_precision</entry>
-           <entry><type>int</type></entry>
-           <entry>Precision of the FLOAT8 data</entry>
-           <entry>10</entry>
-          </row>
-          <row valign="top">
-           <entry>blob_segment_length</entry>
-           <entry><type>int</type></entry>
-           <entry>The amount of data in bytes to fetch at a time when retrieving
-           BLOB or CLOB data, defaults to 4096 bytes when not explicitly set</entry>
-           <entry>8192</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </informaltable>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a Ingres link resource on success&return.falseforfailure;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Open a connection to an Ingres database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("mydb", "user", "pass")
-    or die("Could not connect");
-echo "Connected successfully";
-ingres_close($link);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_pconnect</function></member>
-    <member><function>ingres_close</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-cursor.xml b/reference/ingres-ii/functions/ingres-cursor.xml
deleted file mode 100644
index 24533fe33f..0000000000
--- a/reference/ingres-ii/functions/ingres-cursor.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-cursor" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_cursor</refname>
-  <refpurpose>Get a cursor name for a given result resource</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ingres_cursor</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a string with the active cursor name. If no cursor is active then 
-   NULL is returned.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the active cursor name. If no cursor is
-   active then NULL is returned.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Get cursor name for a query resource</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_prepare($link, "select * from table");
-
-$cursor_name = ingres_cursor($result);
-
-echo $cursor_name;
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_prepare</function></member>
-    <member><function>ingres_execute</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-errno.xml b/reference/ingres-ii/functions/ingres-errno.xml
deleted file mode 100644
index abad6863bf..0000000000
--- a/reference/ingres-ii/functions/ingres-errno.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-errno" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_errno</refname>
-  <refpurpose>Get the last Ingres error number generated</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_errno</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an integer containing the last error number. If no error was
-   reported 0 is returned.
-  </para>
-  <para>
-   If a <parameter>link</parameter> resource is passed to
-   <function>ingres_errno</function> it returns the last error recorded for
-   the link. If no link is passed, then <function>ingres_errno</function>
-   returns the last error reported using the default link.
-  </para>
-  <para>
-   The function, <function>ingres_errno</function>, should always be called
-   after executing a database query.  Calling another function before
-   <function>ingres_errno</function> is called will reset or change any
-   error code from the last Ingres function call.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer containing the last error number. If no error was
-   reported, 0 is returned.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Get the last Ingres error number generated</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link, "select * from table");
-
-$error_code = ingres_errno($link);
-
-if ( $error_code != 0 ) {
-   echo "An error occurred - " . $error_code;
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_error</function></member>
-    <member><function>ingres_errsqlstate</function></member>
-    <member><function>ingres_next_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-error.xml b/reference/ingres-ii/functions/ingres-error.xml
deleted file mode 100644
index d3f6e3ea3d..0000000000
--- a/reference/ingres-ii/functions/ingres-error.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-error" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_error</refname>
-  <refpurpose>Get a meaningful error message for the last error generated</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ingres_error</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a string containing the last error, or NULL if no error has
-   occurred.
-  </para>
-  <para>
-   If a <parameter>link</parameter> resource is passed to
-   <function>ingres_error</function>, it returns the last error recorded for
-   the link. If no link is passed then <function>ingres_error</function>
-   returns the last error reported using the default link.
-  </para>
-  <para>
-   The function, <function>ingres_error</function>, should always be called
-   after executing any database query.  Calling another function before
-   <function>ingres_error</function> is called will reset or change any
-   error message from the last Ingres function call.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the last error, or NULL if no error has
-   occurred.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Get a message for the last error generated</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link, "select * from table");
-
-$error_text = ingres_error();
-
-if (!is_null($error_text)) {
-   echo "An error occurred - " . $error_text;
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_errsqlstate</function></member>
-    <member><function>ingres_next_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-errsqlstate.xml b/reference/ingres-ii/functions/ingres-errsqlstate.xml
deleted file mode 100644
index f6804d6f9d..0000000000
--- a/reference/ingres-ii/functions/ingres-errsqlstate.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-errsqlstate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_errsqlstate</refname>
-  <refpurpose>Get the last SQLSTATE error code generated</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ingres_errsqlstate</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a string containing the last SQLSTATE, or NULL if no error has
-   occurred.
-  </para>
-  <para>
-   If a <parameter>link</parameter> resource is passed to
-   <function>ingres_errsqlstate</function>, it returns the last error
-   recorded for the link. If no link is passed, then
-   <function>ingres_errsqlstate</function> returns the last error reported
-   using the default link.
-  </para>
-  <para>
-   The function, <function>ingres_errsqlstate</function>, should always be
-   called after executing any database query.  Calling another function
-   before <function>ingres_errsqlstate</function> is called will reset or
-   change any error message from the last Ingres function call.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the last SQLSTATE, or NULL if no error has
-   occurred.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Get the last SQLSTATE error code generated</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link, "select * from table");
-
-$error_sqlstate = ingres_errsqlstate($link);
-
-if (!is_null($error_sqlstate)) {
-   echo "An error occurred - " . $error_sqlstate;
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_error</function></member>
-    <member><function>ingres_next_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-escape-string.xml b/reference/ingres-ii/functions/ingres-escape-string.xml
deleted file mode 100644
index 9cdd77018b..0000000000
--- a/reference/ingres-ii/functions/ingres-escape-string.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-escape-string" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_escape_string</refname>
-  <refpurpose>Escape special characters for use in a query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ingres_escape_string</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source_string</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_escape_string</function> is used to escape certain
-   characters within a string before it is sent to the database server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>source_string</parameter></term>
-     <listitem>
-      <para>
-       The source string to be parsed
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the escaped data.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Escape special characters for use in a query</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$last_name = "O'Connor";
-
-$sql = sprintf("select * from user_profile where up_last = '%s'", ingres_escape_string( $link, $last_name));
-
-$result = ingres_query($link, $sql);
-
-while ($user = ingres_fetch_object($result))
-{
-  echo $user->up_first . '<BR/>';
-}
-
-ingres_commit($link);
-
-ingres_close($link);
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-execute.xml b/reference/ingres-ii/functions/ingres-execute.xml
deleted file mode 100644
index f2ea6bde66..0000000000
--- a/reference/ingres-ii/functions/ingres-execute.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-execute" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_execute</refname>
-  <refpurpose>Execute a prepared query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_execute</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>types</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Execute a query prepared using <function>ingres_prepare</function>.
-  </para>
-
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link linkend="ini.ingres.describe">ingres.describe</link>,
-    <link linkend="ini.ingres.scrollable">ingres.scrollable</link> and
-    <link linkend="ini.ingres.utf8">ingres.utf8</link> directives in 
-    <link linkend="ingres.configuration">Runtime Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The result query identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>params</parameter></term>
-     <listitem>
-      <para>
-       An array of parameter values to be used with the query
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>types</parameter></term>
-     <listitem>
-      <para>
-       A string containing a sequence of types for the parameter values
-       passed. See the <link
-       linkend="function.ingres-query.types">types</link> parameter in
-       <function>ingres_query</function> for the list of type codes.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  &return.success;
-  </para>
- </refsect1>
-
-<!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A simple select using <function>ingres_query</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$result = ingres_query($link, "select * from user_profile");
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Passing query parameters to <function>ingres_query</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$params[] = "Emma";
-$query = "select * from user_profile where up_first = ?";
-$result = ingres_query($link, $query, $params);
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Inserting a BLOB with parameter types</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-//Open a photo
-$fh = fopen("photo.jpg","r");
-$blob_data = stream_get_contents($fh);
-fclose($fh);
-
-//Prepare parameters
-$params[] = $blob_data;
-$params[] = 1201;
-
-//Define parameter types
-$param_types = "Bi";
-
-$query = "update user_profile set up_image = ? where up_id = ?";
-$result = ingres_query($link, $query , $params, $param_types);
-
-if (ingres_errno())
-{
-    echo ingres_errno() . "-" . ingres_error() . "\n";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
--->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_unbuffered_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-    <member><function>ingres_commit</function></member>
-    <member><function>ingres_rollback</function></member>
-    <member><function>ingres_autocommit</function></member>
-    <member><function>ingres_set_environment</function></member>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-fetch-array.xml b/reference/ingres-ii/functions/ingres-fetch-array.xml
deleted file mode 100644
index 478ad253d4..0000000000
--- a/reference/ingres-ii/functions/ingres-fetch-array.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-fetch-array" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_fetch_array</refname>
-  <refpurpose>Fetch a row of result into an array</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ingres_fetch_array</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>result_type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is an extended version of
-   <function>ingres_fetch_row</function>.  In addition to storing
-   the data in the numeric indices of the result array, it also
-   stores the data in associative indices, using the field names as
-   keys.
-  </para>
-  <para>
-   If two or more columns of the result have the same field names,
-   the last column will take precedence. To access the another
-   column or columns of the same name, you must use the numeric index of the
-   column or make an alias for the column. For example:
-   <informalexample>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$result = ingres_query($link, "select ap_place as city, ap_ccode as country from airport where ap_iatacode = 'VLL'"); 
-$result = ingres_fetch_array($result);
-$foo = $result["city"];
-$bar = $result["country"];
-
-?>
-]]>
-    </programlisting>
-   </informalexample>
-  </para>
-  <para>
-   With regard to speed, the function is identical to
-   <function>ingres_fetch_object</function>, and almost as quick as
-   <function>ingres_fetch_row</function> (the difference is
-   insignificant).
-  </para>
-  <para>
-   By default, arrays created by <function>ingres_fetch_array</function> start
-   from position 1 and not 0 as with other DBMS extensions. The starting position
-   can be adjusted to 0 using the configuration parameter <link
-   linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>, <link
-    linkend="ini.ingres.fetch-buffer-size">ingres.fetch_buffer_size</link>
-    and <link linkend="ini.ingres.utf8">ingres.utf8</link>
-    directives in <link linkend="ingres.configuration">Runtime
-    Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>result_type</parameter></term>
-     <listitem>
-      <para>
-       The result type. This <parameter>result_type</parameter> can be <constant>INGRES_NUM</constant> for
-       enumerated array, <constant>INGRES_ASSOC</constant> for associative array, or
-       <constant>INGRES_BOTH</constant> (default).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array that corresponds to the fetched row,
-   or &false; if there are no more rows
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Fetch a row of result into an array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link,"select * from table");
-while ($row = ingres_fetch_array($result)) {
-    echo $row["user_id"];  // using associative array
-    echo $row["fullname"];
-    echo $row[1];          // using enumerated array
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_num_fields</function></member>
-    <member><function>ingres_field_name</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-fetch-assoc.xml b/reference/ingres-ii/functions/ingres-fetch-assoc.xml
deleted file mode 100644
index 4566357a6d..0000000000
--- a/reference/ingres-ii/functions/ingres-fetch-assoc.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-fetch-assoc" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_fetch_assoc</refname>
-  <refpurpose>Fetch a row of result into an associative array</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ingres_fetch_assoc</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is stores the data fetched from a query executed using
-   <function>ingres_query</function> in an associative array, using the
-   field names as keys.
-  </para>
-  <para>
-   With regard to speed, the function is identical to
-   <function>ingres_fetch_object</function>, and almost as quick as
-   <function>ingres_fetch_row</function> (the difference is
-   insignificant).
-  </para>
-  <para>
-   By default, arrays created by <function>ingres_fetch_assoc</function> start
-   from position 1 and not 0 as with other DBMS extensions. The starting position
-   can be adjusted to 0 using the configuration parameter <link
-   linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>, <link
-    linkend="ini.ingres.fetch-buffer-size">ingres.fetch_buffer_size</link>
-    and <link linkend="ini.ingres.utf8">ingres.utf8</link>
-    directives in <link linkend="ingres.configuration">Runtime
-    Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array that corresponds to the fetched row,
-   or &false; if there are no more rows
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Fetch a row into an associative array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link,"select * from table");
-while ($row = ingres_fetch_assoc($result)) {
-    echo $row["user_id"];  // using associative array
-    echo $row["fullname"];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_num_fields</function></member>
-    <member><function>ingres_field_name</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-fetch-object.xml b/reference/ingres-ii/functions/ingres-fetch-object.xml
deleted file mode 100644
index fee8dd7902..0000000000
--- a/reference/ingres-ii/functions/ingres-fetch-object.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-fetch-object" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_fetch_object</refname>
-  <refpurpose>Fetch a row of result into an object</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>ingres_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>result_type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is similar to
-   <function>ingres_fetch_array</function>, with one difference - an
-   object is returned instead of an array.  Indirectly, this means
-   that you can access the data only by the field names and not by
-   their offsets (numbers are illegal property names).
-  </para>
-  <para>
-   With regard to speed, the function is identical to
-   <function>ingres_fetch_array</function>, and almost as quick as
-   <function>ingres_fetch_row</function> (the difference is
-   insignificant).
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link
-    linkend="ini.ingres.fetch-buffer-size">ingres.fetch_buffer_size</link>
-    and <link linkend="ini.ingres.utf8">ingres.utf8</link>
-    directives in <link linkend="ingres.configuration">Runtime
-    Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>result_type</parameter></term>
-     <listitem>
-      <para>
-       (Optional argument.) <parameter>result_type</parameter> is a
-       constant and can take the following values: <constant>INGRES_ASSOC</constant>,
-       <constant>INGRES_NUM</constant>, and <constant>INGRES_BOTH</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an object that corresponds to the fetched row,
-   or &false; if there are no more rows
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Fetch a row into an object</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-$result = ingres_query($link, "select * from table");
-while ($row = ingres_fetch_object($result)) {
-    echo $row->user_id;
-    echo $row->fullname;
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_num_fields</function></member>
-    <member><function>ingres_field_name</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-fetch-proc-return.xml b/reference/ingres-ii/functions/ingres-fetch-proc-return.xml
deleted file mode 100644
index c7b7233a06..0000000000
--- a/reference/ingres-ii/functions/ingres-fetch-proc-return.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-fetch-proc-return" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_fetch_proc_return</refname>
-  <refpurpose>Get the return value from a procedure call</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_fetch_proc_return</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is used to retrieve the return value following the execution
-   of an Ingres database procedure (stored procedure). 
-  </para>
-  <note>
-   <para>
-    If used with a row-producing procedure, this function should be called after all the
-    rows from the procedure have been fetched using
-    <function>ingres_fetch_array</function>,
-    <function>ingres_fetch_object</function> or
-    <function>ingres_fetch_row</function>. This function will eliminate any
-    rows yet to be fetched should there be any left over.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The result identifier for a query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an <type>int</type> if there is a return value otherwise it will
-   return &null;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Get the return value from a procedure call</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$link = ingres_connect($database);
-
-if ( ingres_errno() != 0 ) {
-    $error_text = ingres_error();
-    die($error_text);
-}
-
-$result = ingres_query($link, "execute procedure php_proc (value = 1000)");
-
-if ( ingres_errno() != 0 ) {
-    $error_text = ingres_error();
-    die($error_text);
-}
-
-echo "return value - " . ingres_fetch_proc_return($result) . "\n";
-
-ingres_close($link);
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-fetch-row.xml b/reference/ingres-ii/functions/ingres-fetch-row.xml
deleted file mode 100644
index 9b130318d2..0000000000
--- a/reference/ingres-ii/functions/ingres-fetch-row.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-fetch-row" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_fetch_row</refname>
-  <refpurpose>Fetch a row of result into an enumerated array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ingres_fetch_row</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_fetch_row</function> returns an array that
-   corresponds to the fetched row, or &false; if there are no more
-   rows. Each result column is stored in an array offset, starting
-   at offset 1.
-  </para>
-  <para>
-   Subsequent calls to <function>ingres_fetch_row</function>
-   return the next row in the result set, or &false; if there are no
-   more rows.
-  </para>
-  <para>
-   By default, arrays created by <function>ingres_fetch_row</function> start
-   from position 1 and not 0 as with other DBMS extensions. The starting position
-   can be adjusted to 0 using the configuration parameter <link
-   linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>, <link
-    linkend="ini.ingres.fetch-buffer-size">ingres.fetch_buffer_size</link>
-    and <link linkend="ini.ingres.utf8">ingres.utf8</link>
-    directives in <link linkend="ingres.configuration">Runtime
-    Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array that corresponds to the fetched row,
-   or &false; if there are no more rows
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Fetch a row of result into an enumerated array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link, "select * from table");
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_num_fields</function></member>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-field-length.xml b/reference/ingres-ii/functions/ingres-field-length.xml
deleted file mode 100644
index bbd85e3703..0000000000
--- a/reference/ingres-ii/functions/ingres-field-length.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-field-length" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_field_length</refname>
-  <refpurpose>Get the length of a field</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_field_length</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_field_length</function> returns the length of a
-   field.  This is the number of bytes the server uses to store
-   the field.  For detailed information, see the Ingres <literal>OpenAPI User
-   Guide</literal>, Appendix <literal>"Data Types"</literal> in the Ingres documentation.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-    in <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       <parameter>index</parameter> is the column number whose length
-       will be retrieved.
-      </para>
-      <para>
-       The possible values of <parameter>index</parameter> depend upon
-       the value
-       of <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-       If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>1</literal> (the default)
-       then <parameter>index</parameter> must be
-       between <literal>1</literal> and the value returned
-       by <function>ingres_num_fields</function>. If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>0</literal> then <parameter>index</parameter> must
-       be between <literal>0</literal>
-       and <function>ingres_num_fields</function><literal> -
-       1</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the length of a field.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-field-name.xml b/reference/ingres-ii/functions/ingres-field-name.xml
deleted file mode 100644
index 0f439dac6e..0000000000
--- a/reference/ingres-ii/functions/ingres-field-name.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-field-name" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_field_name</refname>
-  <refpurpose>Get the name of a field in a query result</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>ingres_field_name</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_field_name</function> returns the name of a field
-   in a query result.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-    in <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       <parameter>index</parameter> is the field whose name will be
-       retrieved.
-      </para>
-      <para>
-       The possible values of <parameter>index</parameter> depend upon
-       the value
-       of <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-       If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>1</literal> (the default)
-       then <parameter>index</parameter> must be
-       between <literal>1</literal> and the value returned
-       by <function>ingres_num_fields</function>. If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>0</literal> then <parameter>index</parameter> must
-       be between <literal>0</literal>
-       and <function>ingres_num_fields</function><literal> -
-       1</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the name of a field
-   in a query result&return.falseforfailure;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-field-nullable.xml b/reference/ingres-ii/functions/ingres-field-nullable.xml
deleted file mode 100644
index 3f3076b547..0000000000
--- a/reference/ingres-ii/functions/ingres-field-nullable.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-field-nullable" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_field_nullable</refname>
-  <refpurpose>Test if a field is nullable</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_field_nullable</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Test if a field is nullable.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-    in <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       <parameter>index</parameter> is the field whose nullability will be
-       retrieved.
-      </para>
-      <para>
-       The possible values of <parameter>index</parameter> depend upon
-       the value
-       of <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-       If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>1</literal> (the default)
-       then <parameter>index</parameter> must be
-       between <literal>1</literal> and the value returned
-       by <function>ingres_num_fields</function>. If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>0</literal> then <parameter>index</parameter> must
-       be between <literal>0</literal>
-       and <function>ingres_num_fields</function><literal> -
-       1</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>ingres_field_nullable</function> returns &true; if the
-   field can be set to the &null; value and &false; if it cannot
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-field-precision.xml b/reference/ingres-ii/functions/ingres-field-precision.xml
deleted file mode 100644
index f9bcf04e7e..0000000000
--- a/reference/ingres-ii/functions/ingres-field-precision.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-field-precision" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_field_precision</refname>
-  <refpurpose>Get the precision of a field</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_field_precision</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_field_precision</function> returns the precision
-   of a field. This value is used only for decimal, float, and money
-   SQL data types. For detailed information, see the Ingres <literal>OpenAPI
-   User Guide</literal>, Appendix "Data Types" in the Ingres documentation.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-    in <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       <parameter>index</parameter> is the field whose precision will be
-       retrieved.
-      </para>
-      <para>
-       The possible values of <parameter>index</parameter> depend upon
-       the value
-       of <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-       If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>1</literal> (the default)
-       then <parameter>index</parameter> must be
-       between <literal>1</literal> and the value returned
-       by <function>ingres_num_fields</function>. If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>0</literal> then <parameter>index</parameter> must
-       be between <literal>0</literal>
-       and <function>ingres_num_fields</function><literal> -
-       1</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the field precision as an integer
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-field-scale.xml b/reference/ingres-ii/functions/ingres-field-scale.xml
deleted file mode 100644
index f5cd1b4e8e..0000000000
--- a/reference/ingres-ii/functions/ingres-field-scale.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-field-scale" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_field_scale</refname>
-  <refpurpose>Get the scale of a field</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_field_scale</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_field_scale</function> returns the scale of a
-   field.  This value is used only for the decimal SQL data
-   type. For detailed information, see the Ingres <literal>OpenAPI User
-   Guide</literal>, Appendix <literal>"Data Types"</literal> in the Ingres documentation.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-    in <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       <parameter>index</parameter> is the field whose scale will be
-       retrieved.
-      </para>
-      <para>
-       The possible values of <parameter>index</parameter> depend upon
-       the value
-       of <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-       If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>1</literal> (the default)
-       then <parameter>index</parameter> must be
-       between <literal>1</literal> and the value returned
-       by <function>ingres_num_fields</function>. If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>0</literal> then <parameter>index</parameter> must
-       be between <literal>0</literal>
-       and <function>ingres_num_fields</function><literal> -
-       1</literal>.
-      </para>
-    </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the scale of the field, as an integer
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-field-type.xml b/reference/ingres-ii/functions/ingres-field-type.xml
deleted file mode 100644
index f45b34a2c2..0000000000
--- a/reference/ingres-ii/functions/ingres-field-type.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-field-type" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_field_type</refname>
-  <refpurpose>Get the type of a field in a query result</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>ingres_field_type</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the type of a field in a query result.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See <link
-    linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-    in <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       <parameter>index</parameter> is the field whose type will be
-       retrieved.
-      </para>
-      <para>
-       The possible values of <parameter>index</parameter> depend upon
-       the value
-       of <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>.
-       If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>1</literal> (the default)
-       then <parameter>index</parameter> must be
-       between <literal>1</literal> and the value returned
-       by <function>ingres_num_fields</function>. If <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is <literal>0</literal> then <parameter>index</parameter> must
-       be between <literal>0</literal>
-       and <function>ingres_num_fields</function><literal> -
-       1</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>ingres_field_type</function> returns the type of a
-   field in a query result&return.falseforfailure;.  Examples of
-   types returned are <literal>IIAPI_BYTE_TYPE</literal>,
-   <literal>IIAPI_CHA_TYPE</literal>, <literal>IIAPI_DTE_TYPE</literal>,
-   <literal>IIAPI_FLT_TYPE</literal>, <literal>IIAPI_INT_TYPE</literal>,
-   <literal>IIAPI_VCH_TYPE</literal>. Some of these types can map to more
-   than one SQL type depending on the length of the field (see
-   <function>ingres_field_length</function>). For example
-   IIAPI_FLT_TYPE can be a float4 or a float8. For detailed
-   information, see the Ingres <literal>OpenAPI User Guide</literal>, Appendix 
-   "Data Types" in the Ingres documentation.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-free-result.xml b/reference/ingres-ii/functions/ingres-free-result.xml
deleted file mode 100644
index b54db1e144..0000000000
--- a/reference/ingres-ii/functions/ingres-free-result.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-free-result" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_free_result</refname>
-  <refpurpose>Free the resources associated with a result identifier</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_free_result</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success; 
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Free a result resource</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect($database, $user, $password);
-
-$result = ingres_query($link, "select * from table");
-
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-ingres_free_result($result);
-
-ingres_close($link)
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-next-error.xml b/reference/ingres-ii/functions/ingres-next-error.xml
deleted file mode 100644
index f0fcd983a2..0000000000
--- a/reference/ingres-ii/functions/ingres-next-error.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-next-error" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_next_error</refname>
-  <refpurpose>Get the next Ingres error</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_next_error</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the next Ingres error for the last executed query. Each call to
-   <function>ingres_next_error</function> can be followed by a call to
-   <function>ingres_errno</function>, <function>ingres_error</function> 
-   or <function>ingres_errsqlstate</function> to get the respective error
-   number, error text, or SQL STATE. While
-   <function>ingres_next_error</function> returns &true;, there are more errors
-   to fetch.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>ingres_next_error</function> returns &true; if there is another
-   error to retrieve or &false; when there are no more errors
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_error</function></member>
-    <member><function>ingres_errsqlstate</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-num-fields.xml b/reference/ingres-ii/functions/ingres-num-fields.xml
deleted file mode 100644
index c4f6edc1ba..0000000000
--- a/reference/ingres-ii/functions/ingres-num-fields.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-num-fields" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_num_fields</refname>
-  <refpurpose>Get the number of fields returned by the last query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_num_fields</function> returns the number of
-   fields in the results returned by the Ingres server after a call
-   to <function>ingres_query</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The query result identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of fields
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-num-rows.xml b/reference/ingres-ii/functions/ingres-num-rows.xml
deleted file mode 100644
index e38e485d2f..0000000000
--- a/reference/ingres-ii/functions/ingres-num-rows.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-num-rows" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_num_rows</refname>
-  <refpurpose>Get the number of rows affected or returned by a query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ingres_num_rows</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function primarily is meant to get the number of rows
-   modified in the database. However, it can be used to retrieve the number of
-   rows to fetch for a SELECT statement.
-  </para>
-  <note>
-   <para>
-    If <link
-    linkend="ini.ingres.scrollable">scrollable cursors</link> are disabled and
-    this function is called before
-    using <function>ingres_fetch_array</function>,
-    <function>ingres_fetch_object</function>, or
-    <function>ingres_fetch_row</function>, the server will delete
-    the result's data and the script will be unable to get them.
-   </para>
-   <para>
-    Instead, you should retrieve the result's data using one of
-    these fetch functions in a loop until it returns &false;,
-    indicating that no more results are available.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The result identifier for a query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   For delete, insert, or update queries,
-   <function>ingres_num_rows</function> returns the number of rows
-   affected by the query. For other queries,
-   <function>ingres_num_rows</function> returns the number of rows
-   in the query's result.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-pconnect.xml b/reference/ingres-ii/functions/ingres-pconnect.xml
deleted file mode 100644
index a0cac9b749..0000000000
--- a/reference/ingres-ii/functions/ingres-pconnect.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-pconnect" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_pconnect</refname>
-  <refpurpose>Open a persistent connection to an Ingres database</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ingres_pconnect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>database</parameter></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>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Open a persistent connection to an Ingres database.
-  </para>
-  <para>
-   There are only two differences between this function and 
-   <function>ingres_connect</function>: First, when connecting, the
-   function will initially try to find a (persistent) link that is
-   already opened with the same parameters.  If one is found, an
-   identifier for it will be returned instead of opening a new
-   connection. Second, the connection to the Ingres server will not
-   be closed when the execution of the script ends.  Instead, the
-   link will remain open for future use
-   (<function>ingres_close</function> will not close links
-   established by <function>ingres_pconnect</function>). This type
-   of link is therefore called "persistent".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database name. Must follow the syntax:
-      </para>
-      <para>
-       <varname>[vnode::]dbname[/svr_class]</varname>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>username</parameter></term>
-     <listitem>
-      <para>
-       The Ingres user name
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>password</parameter></term>
-     <listitem>
-      <para>
-       The password associated with <parameter>username</parameter>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       See <function>ingres_connect</function> for the list of options that
-       can be passed
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an Ingres link resource on success&return.falseforfailure;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_connect</function></member>
-    <member><function>ingres_close</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-prepare.xml b/reference/ingres-ii/functions/ingres-prepare.xml
deleted file mode 100644
index b70933baa6..0000000000
--- a/reference/ingres-ii/functions/ingres-prepare.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-prepare" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_prepare</refname>
-  <refpurpose>Prepare a query for later execution</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ingres_prepare</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Prepares a query for execution by <function>ingres_execute</function>.
-  </para>
-  <para>
-   The query becomes part of the currently open transaction.  If
-   there is no open transaction, <function>ingres_query</function>
-   opens a new transaction. To close the transaction, you can 
-   call either <function>ingres_commit</function> to commit the changes
-   made to the database or <function>ingres_rollback</function> to
-   cancel these changes. When the script ends, any open transaction
-   is rolled back (by calling
-   <function>ingres_rollback</function>). You can also use
-   <function>ingres_autocommit</function> before opening a new
-   transaction to have every SQL query immediately committed.
-  </para>
-
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link linkend="ini.ingres.describe">ingres.describe</link>,
-    <link linkend="ini.ingres.scrollable">ingres.scrollable</link> and
-    <link linkend="ini.ingres.utf8">ingres.utf8</link> directives in 
-    <link linkend="ingres.configuration">Runtime Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       A valid SQL query (see the Ingres <literal>SQL reference
-       guide</literal>) in the Ingres documentation.
-       See the <link linkend="function.ingres-query.query">query</link>
-       parameter in <function>ingres_query</function> for a list of SQL
-       statements which cannot be executed using
-       <function>ingres_prepare</function>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>ingres_prepare</function> returns a query result identifier that
-   is used with <function>ingres_execute</function> to execute the query. To see 
-   if an error occurred, use <function>ingres_errno</function>, 
-   <function>ingres_error</function>, or 
-   <function>ingres_errsqlstate</function>.
-  </para>
- </refsect1>
-
-<!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A simple select using <function>ingres_query</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$result = ingres_query($link, "select * from user_profile");
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Passing query parameters to <function>ingres_query</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$params[] = "Emma";
-$query = "select * from user_profile where up_first = ?";
-$result = ingres_query($link, $query, $params);
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Inserting a BLOB with parameter types</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-//Open a photo
-$fh = fopen("photo.jpg","r");
-$blob_data = stream_get_contents($fh);
-fclose($fh);
-
-//Prepare parameters
-$params[] = $blob_data;
-$params[] = 1201;
-
-//Define parameter types
-$param_types = "Bi";
-
-$query = "update user_profile set up_image = ? where up_id = ?";
-$result = ingres_query($link, $query , $params, $param_types);
-
-if (ingres_errno())
-{
-    echo ingres_errno() . "-" . ingres_error() . "\n";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_unbuffered_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-    <member><function>ingres_commit</function></member>
-    <member><function>ingres_rollback</function></member>
-    <member><function>ingres_autocommit</function></member>
-    <member><function>ingres_set_environment</function></member>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-query.xml b/reference/ingres-ii/functions/ingres-query.xml
deleted file mode 100644
index a56f6b3b13..0000000000
--- a/reference/ingres-ii/functions/ingres-query.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-query" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_query</refname>
-  <refpurpose>Send an SQL query to Ingres</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ingres_query</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>types</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_query</function> sends the given
-   <parameter>query</parameter> to the Ingres server. 
-  </para>
-  <para>
-   The query becomes part of the currently open transaction.  If
-   there is no open transaction, <function>ingres_query</function>
-   opens a new transaction. To close the transaction, you can 
-   call either <function>ingres_commit</function> to commit the changes
-   made to the database or <function>ingres_rollback</function> to
-   cancel these changes. When the script ends, any open transaction
-   is rolled back (by calling
-   <function>ingres_rollback</function>). You can also use
-   <function>ingres_autocommit</function> before opening a new
-   transaction to have every SQL query immediately committed.
-  </para>
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link linkend="ini.ingres.describe">ingres.describe</link>,
-    <link linkend="ini.ingres.scrollable">ingres.scrollable</link> and
-    <link linkend="ini.ingres.utf8">ingres.utf8</link> directives in 
-    <link linkend="ingres.configuration">Runtime Configuration</link>
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="function.ingres-query.query">
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       A valid SQL query (see the Ingres <literal>SQL reference
-       guide</literal>) in the Ingres documentation.
-      </para>
-      <para>
-       Data inside the query should be <link
-       linkend="function.ingres-escape-string">properly escaped</link>.
-      </para>
-      <para>
-       The following types of SQL queries cannot be sent with this function:
-       <itemizedlist>
-        <listitem>
-         <simpara>
-          <literal>close</literal> (see <function>ingres_close</function>)
-         </simpara>
-        </listitem>
-       <listitem>
-         <simpara>
-          <literal>commit</literal> (see <function>ingres_commit</function>)
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          <literal>connect</literal> (see <function>ingres_connect</function>)
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          <literal>disconnect</literal> (see <function>ingres_close</function>)
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara><literal>get dbevent</literal></simpara>
-        </listitem>
-        <listitem>
-         <simpara><literal>prepare to commit</literal></simpara>
-        </listitem>
-        <listitem>
-         <simpara>
-          <literal>rollback</literal> (see <function>ingres_rollback</function>)
-         </simpara>
-        </listitem>
-        <listitem><simpara><literal>savepoint</literal></simpara></listitem>
-        <listitem>
-         <simpara>
-          <literal>set autocommit</literal> (see <function>ingres_autocommit</function>)
-         </simpara>
-        </listitem>
-        <listitem>
-         <simpara>all cursor-related queries are unsupported</simpara>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>params</parameter></term>
-     <listitem>
-      <para>
-       An array of parameter values to be used with the query
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="function.ingres-query.types">
-     <term><parameter>types</parameter></term>
-     <listitem>
-      <para>
-       A string containing a sequence of types for the parameter values
-       passed. When <link linkend="ini.ingres.describe">ingres.describe</link>
-       is enabled, this parameter can be ignored as the driver automatically
-       fetches the expected parameter types from the server.
-      </para>
-      <informaltable>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Type code</entry>
-          <entry>Ingres type</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>a</entry>
-          <entry><type>BOOLEAN</type></entry>
-         </row>
-         <row>
-          <entry>b</entry>
-          <entry><type>BYTE</type></entry>
-         </row>
-         <row>
-          <entry>B</entry>
-          <entry><type>LONG BYTE/BLOB</type></entry>
-         </row>
-         <row>
-          <entry>c</entry>
-          <entry><type>CHAR</type></entry>
-         </row>
-         <row>
-          <entry>d</entry>
-          <entry><type>DATE/ANSIDATE/TIMESTAMP/TIME</type></entry>
-         </row>
-         <row>
-          <entry>f</entry>
-          <entry><type>FLOAT</type></entry>
-         </row>
-         <row>
-          <entry>i</entry>
-          <entry><type>INTEGER</type></entry>
-         </row>
-         <row>
-          <entry>L</entry>
-          <entry><type>LONG TEXT</type></entry>
-         </row>
-         <row>
-          <entry>m</entry>
-          <entry><type>MONEY</type></entry>
-         </row>
-         <row>
-          <entry>M</entry>
-          <entry><type>LONG NVARCHAR</type></entry>
-         </row>
-         <row>
-          <entry>n</entry>
-          <entry><type>NCHAR</type></entry>
-         </row>
-         <row>
-          <entry>N</entry>
-          <entry><type>NVARCHAR</type></entry>
-         </row>
-         <row>
-          <entry>t</entry>
-          <entry><type>TEXT</type></entry>
-         </row>
-         <row>
-          <entry>v</entry>
-          <entry><type>VARCHAR</type></entry>
-         </row>
-         <row>
-          <entry>V</entry>
-          <entry><type>LONG VARCHAR</type></entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>ingres_query</function> returns a query result identifier on
-   success else it returns &false;. To see if an error
-   occurred use <function>ingres_errno</function>, 
-   <function>ingres_error</function> or 
-   <function>ingres_errsqlstate</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Send a simple select</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$result = ingres_query($link, "select * from user_profile");
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Passing query parameters to <function>ingres_query</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$params[] = "Emma";
-$query = "select * from user_profile where up_first = ?";
-$result = ingres_query($link, $query, $params);
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Inserting a BLOB with parameter types</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-//Open a photo
-$fh = fopen("photo.jpg","r");
-$blob_data = stream_get_contents($fh);
-fclose($fh);
-
-//Prepare parameters
-$params[] = $blob_data;
-$params[] = 1201;
-
-//Define parameter types
-$param_types = "Bi";
-
-$query = "update user_profile set up_image = ? where up_id = ?";
-$result = ingres_query($link, $query , $params, $param_types);
-
-if (ingres_errno())
-{
-    echo ingres_errno() . "-" . ingres_error() . "\n";
-}
-
-ingres_commit($link);
-
-ingres_close($link);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_unbuffered_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-    <member><function>ingres_commit</function></member>
-    <member><function>ingres_rollback</function></member>
-    <member><function>ingres_autocommit</function></member>
-    <member><function>ingres_set_environment</function></member>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-result-seek.xml b/reference/ingres-ii/functions/ingres-result-seek.xml
deleted file mode 100644
index 0e0d3938f2..0000000000
--- a/reference/ingres-ii/functions/ingres-result-seek.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-result-seek" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_result_seek</refname>
-  <refpurpose>Set the row position before fetching data</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_result_seek</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>position</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is used to position the cursor associated with the result
-   resource before issuing a fetch.  If <link
-   linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-   is set to 0 then the first row is 0 else it is 1.
-   <function>ingres_result_seek</function> can be used only with queries that
-   make use of <link linkend="ini.ingres.scrollable">scrollable
-   cursors</link>. It cannot be used with
-   <function>ingres_unbuffered_query</function>.
-  </para>
-
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link linkend="ini.ingres.scrollable">ingres.scrollable</link>
-    and <link linkend="ini.ingres.array-index-start">ingres.array_index_start</link> directives in 
-    <link linkend="ingres.configuration">Runtime Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       The result identifier for a query
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>position</parameter></term>
-     <listitem>
-      <para>
-       The row to position the cursor on. If <link
-       linkend="ini.ingres.array-index-start">ingres.array_index_start</link>
-       is set to 0, then the first row is 0, else it is 1
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Position the cursor on the 3rd row</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$result=ingres_query($link, "select * from airport where ap_ccode = 'ES' order by ap_place asc");
-
-/* goto row 3 */
-if (!ingres_result_seek($result, 3))
-{
-    echo ingres_errno() . " - " . ingres_error . "\n";
-    die("i died");
-}
-else
-{
-    $airport = ingres_fetch_object ($result);
-    {
-        echo $airport->ap_iatacode . " - " .  $airport->ap_name . "\n";
-    }
-}
-
-ingres_commit($link);
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-rollback.xml b/reference/ingres-ii/functions/ingres-rollback.xml
deleted file mode 100644
index 92545e8b4b..0000000000
--- a/reference/ingres-ii/functions/ingres-rollback.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-rollback" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_rollback</refname>
-  <refpurpose>Roll back a transaction</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_rollback</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_rollback</function> rolls back the currently
-   open transaction, actually cancelling all changes made to the
-   database during the transaction.
-  </para>
-  <para>
-   This closes the transaction. A new transaction can be opened by sending a
-   query with <function>ingres_query</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_commit</function></member>
-    <member><function>ingres_autocommit</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-set-environment.xml b/reference/ingres-ii/functions/ingres-set-environment.xml
deleted file mode 100644
index 016ab5f310..0000000000
--- a/reference/ingres-ii/functions/ingres-set-environment.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-set-environment" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_set_environment</refname>
-  <refpurpose>Set environment features controlling output options</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ingres_set_environment</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_set_environment</function> is called to set environmental
-   options that affect the output of certain values from Ingres, such as the
-   timezone, date format, decimal character separator, and float precision.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="function.ingres-set-environment.options">
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       An enumerated <type>array</type> of option name/value pairs. The following table
-       lists the option name and the expected type
-      </para>
-      <para>
-       <informaltable>
-        <tgroup cols="2">
-         <thead>
-          <row valign="top">
-           <entry>Option name</entry>
-           <entry>Option type</entry>
-           <entry>Description</entry>
-           <entry>Example</entry>
-          </row>
-         </thead>
-         <tbody>
-          <row valign="top">
-           <entry>date_century_boundary</entry>
-           <entry><type>int</type></entry>
-           <entry>The threshold by which a 2-digit year is determined to be in
-           the current century or in the next century. Equivalent to II_DATE_CENTURY_BOUNDARY</entry>
-           <entry>50</entry>
-          </row>
-          <row valign="top">
-           <entry>timezone</entry>
-           <entry><type>string</type></entry>
-           <entry>Controls the timezone of the session. If not set, it will
-           default the value defined by II_TIMEZONE_NAME. If
-           II_TIMEZONE_NAME is not defined, NA-PACIFIC (GMT-8 with Daylight
-           Savings) is used.</entry>
-           <entry>UNITED-KINGDOM</entry>
-          </row>
-          <row valign="top">
-           <entry>date_format</entry>
-           <entry><type>int</type></entry>
-           <entry><para>Sets the allowable input and output format for Ingres dates.
-           Defaults to the value defined by II_DATE_FORMAT. If II_DATE_FORMAT is
-           not set, the default date format is US, for example mm/dd/yy. Valid values
-           for date_format are:
-            <itemizedlist>
-             <listitem><simpara>INGRES_DATE_DMY</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_FINISH</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_GERMAN</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_ISO</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_ISO4</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_MDY</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_MULTINATIONAL</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_MULTINATIONAL4</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_YMD</simpara></listitem>
-             <listitem><simpara>INGRES_DATE_US</simpara></listitem>
-            </itemizedlist>
-            </para>
-           </entry>
-           <entry>INGRES_DATE_ISO4</entry>
-          </row>
-          <row valign="top">
-           <entry>decimal_separator</entry>
-           <entry><type>string</type></entry>
-           <entry>The character identifier for decimal data</entry>
-           <entry>","</entry>
-          </row>
-          <row valign="top">
-           <entry>money_lort</entry>
-           <entry><type>int</type></entry>
-           <entry><para>Leading or trailing currency sign. Valid values for money_lort
-           are:
-            <itemizedlist>
-             <listitem><simpara>INGRES_MONEY_LEADING</simpara></listitem>
-             <listitem><simpara>INGRES_MONEY_TRAILING</simpara></listitem>
-            </itemizedlist>
-            </para>
-           </entry>
-           <entry>INGRES_MONEY_LEADING</entry>
-          </row>
-          <row valign="top">
-           <entry>money_sign</entry>
-           <entry><type>string</type></entry>
-           <entry>The currency symbol to be used with the MONEY datatype</entry>
-           <entry>€</entry>
-          </row>
-          <row valign="top">
-           <entry>money_precision</entry>
-           <entry><type>int</type></entry>
-           <entry>The precision of the MONEY datatype</entry>
-           <entry>2</entry>
-          </row>
-          <row valign="top">
-           <entry>float4_precision</entry>
-           <entry><type>int</type></entry>
-           <entry>Precision of the FLOAT4 datatype</entry>
-           <entry>10</entry>
-          </row>
-          <row valign="top">
-           <entry>float8_precision</entry>
-           <entry><type>int</type></entry>
-           <entry>Precision of the FLOAT8 data</entry>
-           <entry>10</entry>
-          </row>
-          <row valign="top">
-           <entry>blob_segment_length</entry>
-           <entry><type>int</type></entry>
-           <entry>The amount of data in bytes to fetch at a time when retrieving
-           BLOB or CLOB data. Defaults to 4096 bytes when not set explicitly</entry>
-           <entry>8192</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </informaltable>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Set date_format to ISO4</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array( "date_format" => INGRES_DATE_ISO4 );
-
-if (ingres_set_environment($link, $options))
-{
-    $result=ingres_query($link,"select date('now') as date");
-
-    while ( $object = ingres_fetch_object ($result) ) {
-        echo $object->date."\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Set timezone to HONG-KONG</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array( "timezone" => "HONG-KONG");
-
-if (ingres_set_environment($link, $options))
-{
-    $result=ingres_query($link,"select date('now') as date");
-
-    while ( $object = ingres_fetch_object ($result) ) {
-        echo $object->date."\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_connect</function></member>
-    <member><function>ingres_query</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/functions/ingres-unbuffered-query.xml b/reference/ingres-ii/functions/ingres-unbuffered-query.xml
deleted file mode 100644
index 1fabc70c40..0000000000
--- a/reference/ingres-ii/functions/ingres-unbuffered-query.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ingres-unbuffered-query" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ingres_unbuffered_query</refname>
-  <refpurpose>Send an unbuffered  SQL query to Ingres</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ingres_unbuffered_query</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>types</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>ingres_unbuffered_query</function> sends the given
-   <parameter>query</parameter> to the Ingres server. 
-  </para>
-  <para>
-   The query becomes part of the currently open transaction.  If
-   there is no open transaction, <function>ingres_unbuffered_query</function>
-   opens a new transaction. To close the transaction, you can 
-   call either <function>ingres_commit</function> to commit the changes
-   made to the database or <function>ingres_rollback</function> to
-   cancel these changes. When the script ends, any open transaction
-   is rolled back (by calling
-   <function>ingres_rollback</function>). You can also use
-   <function>ingres_autocommit</function> before opening a new
-   transaction to have every SQL query immediately committed.
-   Ingres allows only a single unbuffered statement to be active at any
-   one time. The extension will close any active unbuffered statements before
-   executing any SQL. In addition you cannot use
-   <function>ingres_result_seek</function> to position the row before
-   fetching.
-  </para>
-
-  <note>
-   <title>Related Configurations</title>
-   <para>
-    See also the <link linkend="ini.ingres.describe">ingres.describe</link>
-    and <link linkend="ini.ingres.utf8">ingres.utf8</link> directives in 
-    <link linkend="ingres.configuration">Runtime Configuration</link>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       A valid SQL query (see the Ingres <emphasis>SQL reference
-       guide</emphasis>) in the Ingres documentation.
-       See the <link linkend="function.ingres-query.query">query</link>
-       parameter in <function>ingres_query</function> for a list of SQL
-       statements that cannot be executed via
-       <function>ingres_unbuffered_query</function>.
-      </para>
-      <para>
-       Data inside the query should be <link
-       linkend="function.ingres-escape-string">properly escaped</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>params</parameter></term>
-     <listitem>
-      <para>
-       An array of parameter values to be used with the query
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>types</parameter></term>
-     <listitem>
-      <para>
-       A string containing a sequence of types for the parameter values
-       passed. See the <link
-       linkend="function.ingres-query.types">types</link> parameter in
-       <function>ingres_query</function> for the list of type codes.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>ingres_unbuffered_query</function> returns a query result identifier when
-   there are rows to fetch; else it returns &false; when there are no rows, as
-   is the case of an INSERT, UPDATE, or DELETE statement. To see if an error
-   occurred, use <function>ingres_errno</function>, 
-   <function>ingres_error</function>, or 
-   <function>ingres_errsqlstate</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Issue a simple un-buffered select</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$result = ingres_unbuffered_query($link, "select * from user_profile");
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Passing query parameters to <function>ingres_unbuffered_query</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-$params[] = "Emma";
-$query = "select * from user_profile where up_first = ?";
-$result = ingres_unbuffered_query($link, $query, $params);
-while ($row = ingres_fetch_row($result)) {
-    echo $row[1];
-    echo $row[2];
-}
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Inserting a BLOB with parameter types</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = ingres_connect("demodb");
-
-//Open a photo
-$fh = fopen("photo.jpg","r");
-$blob_data = stream_get_contents($fh);
-fclose($fh);
-
-//Prepare parameters
-$params[] = $blob_data;
-$params[] = 1201;
-
-//Define parameter types
-$param_types = "Bi";
-
-$query = "update user_profile set up_image = ? where up_id = ?";
-$result = ingres_unbuffered_query($link, $query , $params, $param_types);
-
-if (ingres_errno())
-{
-    echo ingres_errno() . "-" . ingres_error() . "\n";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ingres_query</function></member>
-    <member><function>ingres_fetch_array</function></member>
-    <member><function>ingres_fetch_assoc</function></member>
-    <member><function>ingres_fetch_object</function></member>
-    <member><function>ingres_fetch_row</function></member>
-    <member><function>ingres_commit</function></member>
-    <member><function>ingres_rollback</function></member>
-    <member><function>ingres_autocommit</function></member>
-    <member><function>ingres_set_environment</function></member>
-    <member><function>ingres_errno</function></member>
-    <member><function>ingres_error</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ingres-ii/ini.xml b/reference/ingres-ii/ini.xml
deleted file mode 100644
index 9df1fc4892..0000000000
--- a/reference/ingres-ii/ini.xml
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="ingres.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
- <table>
-  <title>Ingres configuration options</title>
-  <tgroup cols="4">
-   <thead align="left">
-    <row>
-     <entry>&Name;</entry>
-     <entry>&Default;</entry>
-     <entry>&Changeable;</entry>
-     <entry>&Changelog;</entry>
-    </row>
-   </thead>
-   <tbody xml:id="ingres.configuration.list">
-    <row>
-     <entry><link
-     linkend="ini.ingres.allow-persistent">ingres.allow_persistent</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_SYSTEM</entry>
-     <entry>Available since ingres 1.0.0</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.array-index-start">ingres.array_index_start</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.4.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.auto">ingres.auto</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.0.0.</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.blob-segment-length">ingres.blob_segment_length</link></entry>
-     <entry>"4096"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.2.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.cursor-mode">ingres.cursor_mode</link></entry>
-     <entry>"0"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.1.0.</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.default-database">ingres.default_database</link></entry>
-     <entry>NULL</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.0.0</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.default-password">ingres.default_password</link></entry>
-     <entry>NULL</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.0.0</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.default-user">ingres.default_user</link></entry>
-     <entry>NULL</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.0.0</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.describe">ingres.describe</link></entry>
-     <entry>1</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.1.0</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.fetch-buffer-size">ingres.fetch_buffer_size</link></entry>
-     <entry>100</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.1.0</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.max-links">ingres.max_links</link></entry>
-     <entry>"-1"</entry>
-     <entry>PHP_INI_SYSTEM</entry>
-     <entry>Available since ingres 1.0.0</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.max-persistent">ingres.max_persistent</link></entry>
-     <entry>"-1"</entry>
-     <entry>PHP_INI_SYSTEM</entry>
-     <entry>Available since ingres 1.0.0</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.reuse-connection">ingres.reuse_connection</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.0.0</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.scrollable">ingres.scrollable</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.0.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.trace">ingres.trace</link></entry>
-     <entry>"0"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.0.0.</entry>
-    </row>
-    <row>
-     <entry><link
-     linkend="ini.ingres.trace-connect">ingres.trace_connect</link></entry>
-     <entry>"0"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 1.2.1.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ingres.utf8">ingres.utf8</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since ingres 2.0.0.</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
- &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-    <varlistentry xml:id="ini.ingres.allow-persistent">
-    <term>
-     <parameter>ingres.allow_persistent</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies whether to allow
-      <link linkend="features.persistent-connections">persistent connections</link>
-      to Ingres
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.array-index-start">
-    <term>
-     <parameter>ingres.array_index_start</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the start value for an integer key for arrays
-      generated by <function>ingres_fetch_row</function> or 
-      <function>ingres_fetch_array</function>. By default 
-      <parameter>ingres.array_index_start</parameter> is set to 1. If you wish
-      to make the ingres extension behave like other database extensions set
-      this configuration option to 0.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.auto">
-    <term>
-     <parameter>ingres.auto</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-       Enables or disables autocommit emulation. Ingres cannot have multiple cursors
-       open with autocommit enabled. When enabled, the driver emulates autocommit.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.blob-segment-length">
-    <term>
-     <parameter>ingres.blob_segment_length</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the amount of memory to use when reading BLOB data, in bytes
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.cursor-mode">
-    <term>
-     <parameter>ingres.cursor_mode</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the default mode for cursors opened with ingres_prepare(). Valid values
-      are <constant>INGRES_CURSOR_UPDATE</constant> or <constant>INGRES_CURSOR_READONLY</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.default-database">
-    <term>
-     <parameter>ingres.default_database</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the default database name to use when connecting to the database
-      server if no other name is specified. Does not apply in
-      &sqlsafemode;.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.default-password">
-    <term>
-     <parameter>ingres.default_password</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the default password to use when connecting to the database
-      server if no other name is specified. Does not apply in
-      &sqlsafemode;.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.default-user">
-    <term>
-     <parameter>ingres.default_user</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the default user name to use when connecting to the database
-      server if no other name is specified. Does not apply in
-      &sqlsafemode;.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.describe">
-    <term>
-     <parameter>ingres.describe</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Enables the use of <literal>DESCRIBE INPUT</literal> to determine the expected data types
-      for queries that use parameters. Available with Ingres 9.1.0 and later.
-      When disabled, queries that have parameters passed may need to manually
-      describe the types of those parameters using the <link
-      linkend="function.ingres-query.types">types</link> parameter in
-      <function>ingres_query</function>.
-     </para>
-     <note>
-      <para>
-       Enabling this feature with <function>ingres_query</function>  will cause additional
-       communications traffic between this extension and the server. To
-       minimize this additional traffic, use <function>ingres_prepare</function> and
-       <function>ingres_execute</function>.
-      </para>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.fetch-buffer-size">
-    <term>
-     <parameter>ingres.fetch_buffer_size</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the number of pre-fetch rows that <function>ingres_fetch_array</function>,
-      <function>ingres_fetch_object</function> and 
-      <function>ingres_fetch_row</function> will try and fetch in one fetch operation.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.max-links">
-    <term>
-     <parameter>ingres.max_links</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the maximum number of Ingres sessions allowed per process or thread.
-      The number of sessions should not exceed the total number of
-      connected sessions configured within Ingres.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.max-persistent">
-    <term>
-     <parameter>ingres.max_persistent</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Specifies the maximum number of persistent Ingres sessions allowed per process or
-      thread. The number of sessions should not exceed the total 
-      number of connected sessions configured within Ingres.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.reuse-connection">
-    <term>
-     <parameter>ingres.reuse_connection</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Reuses an existing active connection if connecting to the same database
-      with the same user name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.scrollable">
-    <term>
-     <parameter>ingres.scrollable</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-     Enables support for scrollable cursors. When fetching CLOB or BLOB data, this
-     should be set to &false;. Available with Ingres 9.2.0 or later.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.trace">
-    <term>
-     <parameter>ingres.trace</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Enables simple tracing using <constant>E_NOTICE</constant> messages
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.trace-connect">
-    <term>
-     <parameter>ingres.trace_connect</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Prints <constant>E_NOTICE</constant> messages during
-      <function>ingres_connect</function> or <function>ingres_pconnect</function> calls
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.ingres.utf8">
-    <term>
-     <parameter>ingres.utf8</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Assumes that strings being passed to National Character column types 
-      (<literal>NVARCHAR</literal> or <literal>NCHAR</literal>) are using UTF8 encoding and converts them to UTF16 
-      for the server
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ingres-ii/reference.xml b/reference/ingres-ii/reference.xml
deleted file mode 100644
index 13741b366a..0000000000
--- a/reference/ingres-ii/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <reference xml:id="ref.ingres" xmlns="http://docbook.org/ns/docbook">
-  <title>Ingres &Functions;</title>
-
-&reference.ingres-ii.entities.functions;
-
- </reference>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ingres-ii/setup.xml b/reference/ingres-ii/setup.xml
deleted file mode 100644
index f1c993624b..0000000000
--- a/reference/ingres-ii/setup.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ingres.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="ingres.requirements">
-  &reftitle.required;
-  <para>
-   To use or build the PHP extension for Ingres you must have a working Ingres
-   client environment. You can download the client software for Ingres from 
-   <link xlink:href="&url.ingres.downloads;">&url.ingres.downloads;</link>.
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.ingres-ii.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.ingres-ii.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="ingres.resources">
-  &reftitle.resources;
-  <para>
-   <function>ingres_connect</function> and
-   <function>ingres_pconnect</function> return an Ingres link identifier.
-  </para>
-  <para>
-   <function>ingres_query</function> and <function>ingres_unbuffered_query</function> return an Ingres result identifier.
-  </para>
- </section>
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ingres-ii/versions.xml b/reference/ingres-ii/versions.xml
deleted file mode 100644
index 4d76950806..0000000000
--- a/reference/ingres-ii/versions.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions>
- <function name='ingres_autocommit' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_autocommit_state' from='PECL ingres &gt;= 2.0.0'/>
- <function name='ingres_close' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_commit' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_connect' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_cursor' from='PECL ingres &gt;= 1.1.0'/>
- <function name='ingres_charset' from='PECL ingres &gt;= 2.1.0'/>
- <function name='ingres_errno' from='PECL ingres &gt;= 1.1.0'/>
- <function name='ingres_error' from='PECL ingres &gt;= 1.1.0'/>
- <function name='ingres_errsqlstate' from='PECL ingres &gt;= 1.1.0'/>
- <function name='ingres_execute' from='PECL ingres &gt;= 1.1.0'/>
- <function name='ingres_escape_string' from='PECL ingres &gt;= 2.1.0'/>
- <function name='ingres_fetch_array' from='PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_fetch_assoc' from='PECL ingres &gt;= 2.2.2'/>
- <function name='ingres_fetch_object' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_fetch_proc_return' from='PECL ingres &gt;= 1.4.0'/>
- <function name='ingres_fetch_row' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_field_length' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_field_name' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_field_nullable' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_field_precision' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_field_scale' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_field_type' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_free_result' from='PECL ingres &gt;= 2.0.0'/>
- <function name='ingres_next_error' from='PECL ingres &gt;= 2.0.0'/>
- <function name='ingres_num_fields' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_num_rows' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_pconnect' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_prepare' from='PECL ingres &gt;= 1.1.0'/>
- <function name='ingres_query' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_result_seek' from='PECL ingres &gt;= 2.1.0'/>
- <function name='ingres_rollback' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.1.0, PECL ingres &gt;= 1.0.0'/>
- <function name='ingres_set_environment' from='PECL ingres &gt;= 1.2.0'/>
- <!-- <function name='ingres_unbuffered_query' from='PECL ingres &gt;= 1.2.0'/> -->
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/inotify/book.xml b/reference/inotify/book.xml
index 62d51a78c0..b030f1a1da 100644
--- a/reference/inotify/book.xml
+++ b/reference/inotify/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.inotify" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Inotify</title>
  
  <!-- {{{ preface -->
diff --git a/reference/inotify/functions/inotify-init.xml b/reference/inotify/functions/inotify-init.xml
index 3acbf2f768..e3f566c568 100644
--- a/reference/inotify/functions/inotify-init.xml
+++ b/reference/inotify/functions/inotify-init.xml
@@ -18,6 +18,11 @@
    <function>inotify_add_watch</function>
   </para>
  </refsect1><!-- }}} -->
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
diff --git a/reference/intl/collator/asort.xml b/reference/intl/collator/asort.xml
index 8db6521af3..670950d837 100644
--- a/reference/intl/collator/asort.xml
+++ b/reference/intl/collator/asort.xml
@@ -82,9 +82,9 @@
        </itemizedlist>
       </para>
       <para>
-       Default $sort_flag value is
+       Default <parameter>flags</parameter> value is
        <constant>Collator::SORT_REGULAR</constant>.
-       It is also used if an invalid $sort_flag value has been specified.
+       It is also used if an invalid <parameter>flags</parameter> value has been specified.
       </para>
      </listitem>
     </varlistentry>
@@ -104,7 +104,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title><function>collator_asort</function>example</title>
+    <title><function>collator_asort</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/intl/collator/compare.xml b/reference/intl/collator/compare.xml
index e588f94d9e..f0a2d03240 100644
--- a/reference/intl/collator/compare.xml
+++ b/reference/intl/collator/compare.xml
@@ -87,10 +87,7 @@
      </para>
     </listitem>
    </itemizedlist>
-   On error
-   <type>bool</type>
-   &false;
-   is returned.
+   Returns &false; on failure.
   </para>
   &return.falseproblem;
  </refsect1>
@@ -99,7 +96,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title><function>collator_compare</function>example</title>
+    <title><function>collator_compare</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/intl/collator/construct.xml b/reference/intl/collator/construct.xml
index b44ae6c982..f47bbccb8d 100644
--- a/reference/intl/collator/construct.xml
+++ b/reference/intl/collator/construct.xml
@@ -12,7 +12,7 @@
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
   </constructorsynopsis>
   <para>
-   Creates a new instance of Collator.
+   Creates a new instance of <classname>Collator</classname>.
   </para>
  </refsect1>
 
@@ -25,12 +25,12 @@
      <listitem>
       <para>
        The locale whose collation rules should be used. Special values for
-       locales can be passed in - if null is passed for the locale, the
-       default locale's collation rules will be used. If "root" is passed, 
-       UCA rules will be used.
+       locales can be passed in - if &null; is passed for the locale, the
+       default locale's collation rules will be used. If "root" is passed,
+       <link xlink:href="&url.icu.uca;">UCA</link> rules will be used.
       </para>
       <para>
-       The Locale attribute is typically the most important attribute for
+       The <parameter>locale</parameter> attribute is typically the most important attribute for
        correct sorting and matching, according to the user expectations in
        different countries and regions. The default
        <link xlink:href="&url.icu.uca;">UCA</link>
@@ -68,17 +68,16 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns Collator instance.
+   Returns <classname>Collator</classname> instance.
   </para>
  </refsect1>
 
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   Returns an "empty" object on error. You can use
-   <function>intl_get_error_code</function>
-   and/or
-   <function>intl_get_error_message</function>
+   Returns an "empty" object on error. 
+   Use <function>intl_get_error_code</function>
+   and/or <function>intl_get_error_message</function>
    to know what happened.
   </para>
  </refsect1>
@@ -91,7 +90,7 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$coll = new Collator( 'en_CA' );
+$coll = new Collator('en_CA');
 ?>
 ]]>
     </programlisting>
diff --git a/reference/intl/collator/create.xml b/reference/intl/collator/create.xml
index cd3666d281..32014e32f1 100644
--- a/reference/intl/collator/create.xml
+++ b/reference/intl/collator/create.xml
@@ -35,7 +35,7 @@
      <listitem>
       <para>
        The locale containing the required collation rules. Special values for
-       locales can be passed in - if null is passed for the locale, the
+       locales can be passed in - if &null; is passed for the locale, the
        default locale collation rules will be used. If empty string ("") or
        "root" are passed, <link xlink:href="&url.icu.uca;">UCA</link> rules will be used.
       </para>
diff --git a/reference/intl/collator/get-attribute.xml b/reference/intl/collator/get-attribute.xml
index 6ccd4325f4..2c37d53fca 100644
--- a/reference/intl/collator/get-attribute.xml
+++ b/reference/intl/collator/get-attribute.xml
@@ -57,7 +57,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Attribute value, or <type>bool</type> &false; on error.
+   Attribute value,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/intl/collator/get-locale.xml b/reference/intl/collator/get-locale.xml
index 85832a8c8f..e218cabaed 100644
--- a/reference/intl/collator/get-locale.xml
+++ b/reference/intl/collator/get-locale.xml
@@ -61,8 +61,7 @@
   &reftitle.returnvalues;
   <para>
    Real locale name from which the collation data comes. If the collator was
-   instantiated from rules or an error occurred, returns
-   <type>bool</type> &false;.
+   instantiated from rules or an error occurred, returns &false;.
   </para>
  </refsect1>
 
diff --git a/reference/intl/collator/get-sort-key.xml b/reference/intl/collator/get-sort-key.xml
index 0b5b3ccd45..1fbf215cbc 100644
--- a/reference/intl/collator/get-sort-key.xml
+++ b/reference/intl/collator/get-sort-key.xml
@@ -62,28 +62,6 @@
   &return.falseproblem;
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>5.3.15, 5.4.5</entry>
-      <entry>
-       Sort keys do no longer contain any <literal>NUL</literal> bytes.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/intl/collator/get-strength.xml b/reference/intl/collator/get-strength.xml
index f90ee3ec91..142f3e737c 100644
--- a/reference/intl/collator/get-strength.xml
+++ b/reference/intl/collator/get-strength.xml
@@ -48,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns current collation strength, or <type>bool</type> &false; on error.
+   Returns current collation strength,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/intl/collator/set-attribute.xml b/reference/intl/collator/set-attribute.xml
index 25c1cf700a..aca102bc33 100644
--- a/reference/intl/collator/set-attribute.xml
+++ b/reference/intl/collator/set-attribute.xml
@@ -39,7 +39,7 @@
      <term><parameter>object</parameter></term>
      <listitem>
       <para>
-       <classname>Collator</classname> <type>object</type>.
+       <classname>Collator</classname> object.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/intl/collator/set-strength.xml b/reference/intl/collator/set-strength.xml
index 2b8ec65262..f51808c71c 100644
--- a/reference/intl/collator/set-strength.xml
+++ b/reference/intl/collator/set-strength.xml
@@ -37,21 +37,21 @@
    <orderedlist>
     <listitem>
      <para> 
-      <emphasis> Primary Level</emphasis>:
+      <emphasis>Primary Level</emphasis>:
       Typically, this is used to denote differences between base characters
       (for example, "a" &lt; "b"). It is the strongest difference. For
       example, dictionaries are divided into different sections by base
-      character. This is also called the level1 strength.
+      character. This is also called the <literal>level 1</literal> strength.
      </para>
     </listitem>
     <listitem>
      <para> 
-      <emphasis> Secondary Level</emphasis>:
+      <emphasis>Secondary Level</emphasis>:
       Accents in the characters are considered secondary differences (for
       example, "as" &lt; "às" &lt; "at"). Other differences between letters
       can also be considered secondary differences, depending on the language.
       A secondary difference is ignored when there is a primary difference
-      anywhere in the strings. This is also called the level2 strength.
+      anywhere in the strings. This is also called the <literal>level 2</literal> strength.
       <note>
        <para>
         Note: In some languages (such as Danish), certain accented letters are
@@ -64,40 +64,40 @@
     </listitem>
     <listitem>
      <para> 
-      <emphasis> Tertiary Level</emphasis>:
+      <emphasis>Tertiary Level</emphasis>:
       Upper and lower case differences in characters are distinguished at
       the tertiary level (for example, "ao" &lt; "Ao" &lt; "aò"). In addition,
       a variant of a letter differs from the base form on the tertiary level
       (such as "A" and " "). Another example is the difference between large
       and small Kana. A tertiary difference is ignored when there is a primary
       or secondary difference anywhere in the strings. This is also called the
-      level3 strength.
+      <literal>level 3</literal> strength.
      </para>
     </listitem>
     <listitem>
      <para> 
-      <emphasis> Quaternary Level</emphasis>:
-      When punctuation is ignored (see Ignoring Punctuations ) at level 13,
+      <emphasis>Quaternary Level</emphasis>:
+      When punctuation is ignored (see Ignoring Punctuations ) at levels 1-3,
       an additional level can be used to distinguish words with and without
       punctuation (for example, "ab" &lt; "a-b" &lt; "aB"). This difference is
       ignored when there is a primary, secondary or tertiary difference. This
-      is also known as the level4 strength. The quaternary level should only
+      is also known as the <literal>level 4</literal> strength. The quaternary level should only
       be used if ignoring punctuation is required or when processing Japanese
       text (see Hiragana processing).
      </para>
     </listitem>
     <listitem>
      <para> 
-      <emphasis> Identical Level</emphasis>:
+      <emphasis>Identical Level</emphasis>:
       When all other levels are equal, the identical level is used as a
       tiebreaker. The Unicode code point values of the NFD form of each string
       are compared at this level, just in case there is no difference at
-      levels 14. For example, Hebrew cantillation marks are only distinguished
+      levels 1-4. For example, Hebrew cantillation marks are only distinguished
       at this level. This level should be used sparingly, as only code point
       values differences between two strings is an extremely rare occurrence.
       Using this level substantially decreases the performance for both
       incremental comparison and sort key generation (as well as increasing
-      the sort key length). It is also known as level 5 strength.
+      the sort key length). It is also known as <literal>level 5</literal> strength.
      </para>
     </listitem>
    </orderedlist>
diff --git a/reference/intl/dateformatter/get-timezone-id.xml b/reference/intl/dateformatter/get-timezone-id.xml
index f42286dc72..7f95d22e32 100644
--- a/reference/intl/dateformatter/get-timezone-id.xml
+++ b/reference/intl/dateformatter/get-timezone-id.xml
@@ -65,9 +65,9 @@ $fmt = datefmt_create(
     'America/Los_Angeles',
     IntlDateFormatter::GREGORIAN
 );
-echo 'timezone_id of the formatter is : ' . datefmt_get_timezone_id($fmt);
-datefmt_set_timezone_id($fmt, 'CN');
-echo 'Now timezone_id of the formatter is : ' . datefmt_get_timezone_id($fmt);
+echo 'timezone_id of the formatter is: ' . datefmt_get_timezone_id($fmt) . "\n";
+datefmt_set_timezone($fmt, 'Europe/Madrid');
+echo 'Now timezone_id of the formatter is: ' . datefmt_get_timezone_id($fmt);
 
 ?>
 ]]>
@@ -85,9 +85,9 @@ $fmt = new IntlDateFormatter(
     'America/Los_Angeles',
     IntlDateFormatter::GREGORIAN
 );
-echo 'timezone_id of the formatter is : ' . $fmt->getTimezoneId();
-$fmt->setTimezoneId('CN');
-echo 'Now timezone_id of the formatter is : ' . $fmt->getTimezoneId();
+echo 'timezone_id of the formatter is: ' . $fmt->getTimezoneId() . "\n";
+$fmt->setTimezone('Europe/Madrid');
+echo 'Now timezone_id of the formatter is: ' . $fmt->getTimezoneId();
 
 ?>
 ]]>
@@ -96,8 +96,8 @@ echo 'Now timezone_id of the formatter is : ' . $fmt->getTimezoneId();
   &example.outputs;
   <screen>
 <![CDATA[
-timezone_id of the formatter is : America/Los_Angeles
-Now timezone_id of the formatter is : CN
+timezone_id of the formatter is: America/Los_Angeles
+Now timezone_id of the formatter is: Europe/Madrid
 ]]>
   </screen>
  </refsect1>
@@ -106,7 +106,7 @@ Now timezone_id of the formatter is : CN
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>datefmt_set_timezone_id</function></member>
+    <member><function>datefmt_set_timezone</function></member>
      <member><function>datefmt_create</function></member>
    </simplelist>
   </para>
diff --git a/reference/intl/functions/intl-get-error-code.xml b/reference/intl/functions/intl-get-error-code.xml
index 26c26e836e..0ffdd11089 100644
--- a/reference/intl/functions/intl-get-error-code.xml
+++ b/reference/intl/functions/intl-get-error-code.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/intl/functions/intl-get-error-message.xml b/reference/intl/functions/intl-get-error-message.xml
index e599b14012..c4fab7f55d 100644
--- a/reference/intl/functions/intl-get-error-message.xml
+++ b/reference/intl/functions/intl-get-error-message.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/intl/ini.xml b/reference/intl/ini.xml
index 88e3ee5627..405afbf3dc 100644
--- a/reference/intl/ini.xml
+++ b/reference/intl/ini.xml
@@ -34,7 +34,7 @@
       <entry><link linkend="ini.intl.use-exceptions">intl.use_exceptions</link></entry>
       <entry>0</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 5.5 and PECL 3.0.0a1</entry>
+      <entry>Available since PECL 3.0.0a1</entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/intl/intlcalendar/geterrormessage.xml b/reference/intl/intlcalendar/geterrormessage.xml
index b5e797633b..a862283d31 100644
--- a/reference/intl/intlcalendar/geterrormessage.xml
+++ b/reference/intl/intlcalendar/geterrormessage.xml
@@ -48,7 +48,7 @@
   &reftitle.returnvalues;
   <para>
    The error message associated with last error that occurred in a function call
-   on this object, or a string indicating the non-existance of an error.
+   on this object, or a string indicating the non-existence of an error.
   </para>
  </refsect1>
 
diff --git a/reference/intl/intlchar/chartype.xml b/reference/intl/intlchar/chartype.xml
index 5020cacc51..65a40e30b6 100644
--- a/reference/intl/intlchar/chartype.xml
+++ b/reference/intl/intlchar/chartype.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>IntlChar::charType</methodname>
-   <methodparam><type>mixed</type><parameter>codepoint</parameter></methodparam>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>int</type><type>null</type></type><methodname>IntlChar::charType</methodname>
+   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>codepoint</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns the general category value for the code point.
@@ -82,6 +82,7 @@ var_dump(IntlChar::charType("A") === IntlChar::CHAR_CATEGORY_UPPERCASE_LETTER);
 var_dump(IntlChar::charType(".") === IntlChar::CHAR_CATEGORY_OTHER_PUNCTUATION);
 var_dump(IntlChar::charType("\t") === IntlChar::CHAR_CATEGORY_CONTROL_CHAR);
 var_dump(IntlChar::charType("\u{2603}") === IntlChar::CHAR_CATEGORY_OTHER_SYMBOL);
+var_dump(IntlChar::charType("multiple chars") === null);
 ?>
 ]]>
    </programlisting>
@@ -92,6 +93,7 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
+bool(true)
 ]]>
    </screen>
   </example>
diff --git a/reference/intl/intlchar/chr.xml b/reference/intl/intlchar/chr.xml
index b6776cadfb..68ee72709b 100644
--- a/reference/intl/intlchar/chr.xml
+++ b/reference/intl/intlchar/chr.xml
@@ -17,7 +17,7 @@
    Returns a string containing the character specified by the Unicode code point value.
   </para>
   <para>
-   This function compliments <function>IntlChar::ord</function>.
+   This function complements <function>IntlChar::ord</function>.
   </para>
  </refsect1>
 
@@ -71,6 +71,7 @@ string(3) "☃"
   <para>
    <simplelist>
     <member><function>IntlChar::ord</function></member>
+    <member><function>mb_chr</function></member>
     <member><function>chr</function></member>
    </simplelist>
   </para>
diff --git a/reference/intl/intlchar/getpropertyenum.xml b/reference/intl/intlchar/getpropertyenum.xml
index 63d84bc325..3451f3305d 100644
--- a/reference/intl/intlchar/getpropertyenum.xml
+++ b/reference/intl/intlchar/getpropertyenum.xml
@@ -22,7 +22,7 @@
    <constant>IntlChar::PROPERTY_GENERAL_CATEGORY_MASK</constant>. These names are not in PropertyAliases.txt.
   </para>
   <para>
-   This function compliments <function>IntlChar::getPropertyName</function>.
+   This function complements <function>IntlChar::getPropertyName</function>.
   </para>
  </refsect1>
 
diff --git a/reference/intl/intlchar/getpropertyname.xml b/reference/intl/intlchar/getpropertyname.xml
index c5b76b3d5a..96259e5ac2 100644
--- a/reference/intl/intlchar/getpropertyname.xml
+++ b/reference/intl/intlchar/getpropertyname.xml
@@ -22,7 +22,7 @@
    synthetic names "gcm" / "General_Category_Mask". These names are not in PropertyAliases.txt.
   </para>
   <para>
-   This function compliments <function>IntlChar::getPropertyEnum</function>.
+   This function complements <function>IntlChar::getPropertyEnum</function>.
   </para>
  </refsect1>
 
diff --git a/reference/intl/intlchar/isxdigit.xml b/reference/intl/intlchar/isxdigit.xml
index 085d4acf67..e59c1fdf8e 100644
--- a/reference/intl/intlchar/isxdigit.xml
+++ b/reference/intl/intlchar/isxdigit.xml
@@ -46,22 +46,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    In order to narrow the definition of hexadecimal digits to only ASCII characters use:
-   </para>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-$isASCIIHexadecimal = IntlChar::ord($codepoint) <= 0x7F && IntlChar::isxdigit($codepoint);
-?>
-]]>
-   </programlisting>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -86,6 +70,22 @@ bool(false)
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    In order to narrow the definition of hexadecimal digits to only ASCII characters use:
+   </para>
+   <programlisting role="php">
+    <![CDATA[
+<?php
+$isASCIIHexadecimal = IntlChar::ord($codepoint) <= 0x7F && IntlChar::isxdigit($codepoint);
+?>
+]]>
+   </programlisting>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/intl/intlchar/ord.xml b/reference/intl/intlchar/ord.xml
index 280d8d40bd..d7f9a46e63 100644
--- a/reference/intl/intlchar/ord.xml
+++ b/reference/intl/intlchar/ord.xml
@@ -17,7 +17,7 @@
    Returns the Unicode code point value of the given character.
   </para>
   <para>
-   This function compliments <function>IntlChar::chr</function>.
+   This function complements <function>IntlChar::chr</function>.
   </para>
  </refsect1>
 
@@ -27,9 +27,7 @@
    <varlistentry>
     <term><parameter>character</parameter></term>
     <listitem>
-     <para>
-      A Unicode character.
-     </para>
+     &intl.codepoint.parameter;
     </listitem>
    </varlistentry>
   </variablelist>
@@ -70,9 +68,8 @@ int(9731)
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>IntlChar::isalnum</function></member>
-    <member><function>IntlChar::isdigit</function></member>
     <member><function>IntlChar::chr</function></member>
+    <member><function>mb_ord</function></member>
     <member><function>ord</function></member>
    </simplelist>
   </para>
diff --git a/reference/intl/locale/compose-locale.xml b/reference/intl/locale/compose-locale.xml
index ddeb9af1b6..b43c944aee 100644
--- a/reference/intl/locale/compose-locale.xml
+++ b/reference/intl/locale/compose-locale.xml
@@ -42,22 +42,22 @@
      <term><parameter>subtags</parameter></term>
      <listitem>
       <para>
-       an array containing a list of key-value pairs, where the keys identify
+       An &array; containing a list of key-value pairs, where the keys identify
        the particular locale ID subtags, and the values are the associated
-       subtag values. 
+       subtag values.
        <note>
         <para>
-         The 'variant' and 'private' subtags can take maximum 15 values
-         whereas 'extlang' can take maximum 3 values.e.g. Variants are allowed
+         The <literal>'variant'</literal> and <literal>'private'</literal> subtags can take maximum 15 values
+         whereas <literal>'extlang'</literal> can take maximum 3 values. For instance, variants are allowed
          with the suffix ranging from 0-14. Hence the keys for the input array
-         can be variant0, variant1, ...,variant14. In the returned locale id,
-         the subtag is ordered by suffix resulting in variant0 followed by
-         variant1 followed by variant2 and so on.
+         can be <literal>variant0</literal>, <literal>variant1</literal>, …,<literal>variant14</literal>. In the returned locale id,
+         the subtag is ordered by suffix resulting in <literal>variant0</literal> followed by
+         <literal>variant1</literal> followed by <literal>variant2</literal> and so on.
         </para>
         <para>
-         The 'variant', 'private' and 'extlang' multiple values can be specified both
-         as array under specific key (e.g. 'variant') and as multiple numbered keys
-         (e.g. 'variant0', 'variant1', etc.).
+         Alternatively, the <literal>'variant'</literal>, <literal>'private'</literal> and <literal>'extlang'</literal> values can be specified
+         as array under specific key (e.g. <literal>'variant'</literal>).
+         In this case no limits on the number of recognized subtags apply.
         </para>
        </note>
       </para>
@@ -83,15 +83,15 @@
     <![CDATA[
 <?php
 $arr = array(
-    'language'=>'en' ,
-    'script'  =>'Hans' ,
+    'language'=>'en',
+    'script'  =>'Hans',
     'region'  =>'CN',
-    'variant2'=>'rozaj' ,
-    'variant1'=>'nedis' ,
-    'private1'=>'prv1' ,
-    'private2'=>'prv2'
+    'variant2'=>'rozaj',
+    'variant1'=>'nedis',
+    'private1'=>'prv1',
+    'private2'=>'prv2',
 );
-echo locale_compose( $arr );
+echo locale_compose($arr);
 ?>
 ]]>
    </programlisting>
@@ -103,14 +103,14 @@ echo locale_compose( $arr );
 <?php
 $arr = array(
     'language'=>'en' ,
-    'script'  =>'Hans' ,
+    'script'  =>'Hans',
     'region'  =>'CN',
-    'variant2'=>'rozaj' ,
-    'variant1'=>'nedis' ,
-    'private1'=>'prv1' ,
-    'private2'=>'prv2'
+    'variant2'=>'rozaj',
+    'variant1'=>'nedis',
+    'private1'=>'prv1',
+    'private2'=>'prv2',
 );
-echo Locale::composeLocale( $arr );
+echo Locale::composeLocale($arr);
 ?>
 ]]>
    </programlisting>
@@ -119,6 +119,47 @@ echo Locale::composeLocale( $arr );
   <screen>
 <![CDATA[
 Locale: en_Hans_CN_nedis_rozaj_x_prv1_prv2
+]]>
+  </screen>
+
+  <example xml:id="locale.composelocale.example.limits">
+   <title>Subtag limits</title>
+   <para>
+    If <parameter>subtags</parameter> are given as separate keys with numeric suffix,
+    unsupported keys are silently ignored (in this case <literal>'extlang3'</literal>),
+    and ordered in the result by numeric suffix.
+    There are no limits, if subtags are given as &array;; the order is as given.
+   </para>
+   <programlisting role="php">
+    <![CDATA[
+<?php
+$arr = array(
+    'language' => 'en',
+    'script'   => 'Hans',
+    'region'   => 'CN',
+    'extlang3' => 'd',
+    'extlang2' => 'c',
+    'extlang1' => 'b',
+    'extlang0' => 'a',
+);
+echo locale_compose($arr), PHP_EOL;
+
+$arr = array(
+    'language' => 'en',
+    'script'   => 'Hans',
+    'region'   => 'CN',
+    'extlang'  => ['a', 'b', 'c', 'd'],
+);
+echo locale_compose($arr), PHP_EOL;
+?>
+]]>
+   </programlisting>
+  </example>
+  &example.outputs;
+  <screen>
+<![CDATA[
+en_a_b_c_Hans_CN
+en_a_b_c_d_Hans_CN
 ]]>
   </screen>
  </refsect1>
diff --git a/reference/intl/versions.xml b/reference/intl/versions.xml
index 12c676286e..47d021cde7 100644
--- a/reference/intl/versions.xml
+++ b/reference/intl/versions.xml
@@ -4,437 +4,437 @@
   Do NOT translate this file
 -->
 <versions>
- <function name="intlexception" from="PHP 5 &gt; 5.5.0, PHP 7, PECL intl &gt; 3.0.0a1"/>
+ <function name="intlexception" from="PHP 5 &gt; 5.5.0, PHP 7, PHP 8, PECL intl &gt; 3.0.0a1"/>
  <!-- Methods -->
- <function name="collator" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::sort" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::sortwithsortkeys" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::asort" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::getattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::getsortkey" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 1.0.3"/>
- <function name="collator::setattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::getstrength" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::setstrength" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
+ <function name="collator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::sort" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::sortwithsortkeys" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::asort" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::getattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::getsortkey" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 1.0.3"/>
+ <function name="collator::setattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::getstrength" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::setstrength" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
 
- <function name="intlcalendar" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::createinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getkeywordvaluesforlocale" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getnow" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getavailablelocales" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::get" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::gettime" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::settime" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::add" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::settimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::after" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::before" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::set" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::roll" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::clear" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::fielddifference" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getactualmaximum" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getactualminimum" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getdayofweektype" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getfirstdayofweek" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getgreatestminimum" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getleastmaximum" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getlocale" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getmaximum" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getminimaldaysinfirstweek" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getminimum" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::gettimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::gettype" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getweekendtransition" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::indaylighttime" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::isequivalentto" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::islenient" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::isset" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::isweekend" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::setfirstdayofweek" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::setlenient" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::equals" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getrepeatedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::getskippedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::setrepeatedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::setskippedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::setminimaldaysinfirstweek" from="PHP 5 &gt;= 5.5.1, PHP 7"/>
- <function name="intlcalendar::fromdatetime" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a2"/>
- <function name="intlcalendar::todatetime" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a2"/>
- <function name="intlcalendar::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intlcalendar::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::createinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getkeywordvaluesforlocale" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getnow" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getavailablelocales" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::get" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::gettime" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::settime" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::add" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::settimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::after" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::before" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::set" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::roll" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::clear" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::fielddifference" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getactualmaximum" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getactualminimum" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getdayofweektype" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getfirstdayofweek" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getgreatestminimum" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getleastmaximum" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getlocale" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getmaximum" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getminimaldaysinfirstweek" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getminimum" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::gettimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::gettype" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getweekendtransition" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::indaylighttime" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::isequivalentto" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::islenient" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::isset" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::isweekend" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::setfirstdayofweek" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::setlenient" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::equals" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getrepeatedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::getskippedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::setrepeatedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::setskippedwalltimeoption" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::setminimaldaysinfirstweek" from="PHP 5 &gt;= 5.5.1, PHP 7, PHP 8"/>
+ <function name="intlcalendar::fromdatetime" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a2"/>
+ <function name="intlcalendar::todatetime" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a2"/>
+ <function name="intlcalendar::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intlcalendar::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
 
- <function name="intlchar" from="PHP 7"/>
- <function name="intlchar::charage" from="PHP 7"/>
- <function name="intlchar::chardigitvalue" from="PHP 7"/>
- <function name="intlchar::chardirection" from="PHP 7"/>
- <function name="intlchar::charfromname" from="PHP 7"/>
- <function name="intlchar::charmirror" from="PHP 7"/>
- <function name="intlchar::charname" from="PHP 7"/>
- <function name="intlchar::chartype" from="PHP 7"/>
- <function name="intlchar::chr" from="PHP 7"/>
- <function name="intlchar::digit" from="PHP 7"/>
- <function name="intlchar::enumcharnames" from="PHP 7"/>
- <function name="intlchar::enumchartypes" from="PHP 7"/>
- <function name="intlchar::foldcase" from="PHP 7"/>
- <function name="intlchar::fordigit" from="PHP 7"/>
- <function name="intlchar::getbidipairedbracket" from="PHP 7"/>
- <function name="intlchar::getblockcode" from="PHP 7"/>
- <function name="intlchar::getcombiningclass" from="PHP 7"/>
- <function name="intlchar::getfc-nfkc-closure" from="PHP 7"/>
- <function name="intlchar::getintpropertymaxvalue" from="PHP 7"/>
- <function name="intlchar::getintpropertyminvalue" from="PHP 7"/>
- <function name="intlchar::getintpropertyvalue" from="PHP 7"/>
- <function name="intlchar::getnumericvalue" from="PHP 7"/>
- <function name="intlchar::getpropertyenum" from="PHP 7"/>
- <function name="intlchar::getpropertyname" from="PHP 7"/>
- <function name="intlchar::getpropertyvalueenum" from="PHP 7"/>
- <function name="intlchar::getpropertyvaluename" from="PHP 7"/>
- <function name="intlchar::getunicodeversion" from="PHP 7"/>
- <function name="intlchar::hasbinaryproperty" from="PHP 7"/>
- <function name="intlchar::isalnum" from="PHP 7"/>
- <function name="intlchar::isalpha" from="PHP 7"/>
- <function name="intlchar::isbase" from="PHP 7"/>
- <function name="intlchar::isblank" from="PHP 7"/>
- <function name="intlchar::iscntrl" from="PHP 7"/>
- <function name="intlchar::isdefined" from="PHP 7"/>
- <function name="intlchar::isdigit" from="PHP 7"/>
- <function name="intlchar::isgraph" from="PHP 7"/>
- <function name="intlchar::isidignorable" from="PHP 7"/>
- <function name="intlchar::isidpart" from="PHP 7"/>
- <function name="intlchar::isidstart" from="PHP 7"/>
- <function name="intlchar::isisocontrol" from="PHP 7"/>
- <function name="intlchar::isjavaidpart" from="PHP 7"/>
- <function name="intlchar::isjavaidstart" from="PHP 7"/>
- <function name="intlchar::isjavaspacechar" from="PHP 7"/>
- <function name="intlchar::islower" from="PHP 7"/>
- <function name="intlchar::ismirrored" from="PHP 7"/>
- <function name="intlchar::isprint" from="PHP 7"/>
- <function name="intlchar::ispunct" from="PHP 7"/>
- <function name="intlchar::isspace" from="PHP 7"/>
- <function name="intlchar::istitle" from="PHP 7"/>
- <function name="intlchar::isualphabetic" from="PHP 7"/>
- <function name="intlchar::isulowercase" from="PHP 7"/>
- <function name="intlchar::isupper" from="PHP 7"/>
- <function name="intlchar::isuuppercase" from="PHP 7"/>
- <function name="intlchar::isuwhitespace" from="PHP 7"/>
- <function name="intlchar::iswhitespace" from="PHP 7"/>
- <function name="intlchar::isxdigit" from="PHP 7"/>
- <function name="intlchar::ord" from="PHP 7"/>
- <function name="intlchar::tolower" from="PHP 7"/>
- <function name="intlchar::totitle" from="PHP 7"/>
- <function name="intlchar::toupper" from="PHP 7"/>
+ <function name="intlchar" from="PHP 7, PHP 8"/>
+ <function name="intlchar::charage" from="PHP 7, PHP 8"/>
+ <function name="intlchar::chardigitvalue" from="PHP 7, PHP 8"/>
+ <function name="intlchar::chardirection" from="PHP 7, PHP 8"/>
+ <function name="intlchar::charfromname" from="PHP 7, PHP 8"/>
+ <function name="intlchar::charmirror" from="PHP 7, PHP 8"/>
+ <function name="intlchar::charname" from="PHP 7, PHP 8"/>
+ <function name="intlchar::chartype" from="PHP 7, PHP 8"/>
+ <function name="intlchar::chr" from="PHP 7, PHP 8"/>
+ <function name="intlchar::digit" from="PHP 7, PHP 8"/>
+ <function name="intlchar::enumcharnames" from="PHP 7, PHP 8"/>
+ <function name="intlchar::enumchartypes" from="PHP 7, PHP 8"/>
+ <function name="intlchar::foldcase" from="PHP 7, PHP 8"/>
+ <function name="intlchar::fordigit" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getbidipairedbracket" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getblockcode" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getcombiningclass" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getfc-nfkc-closure" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getintpropertymaxvalue" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getintpropertyminvalue" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getintpropertyvalue" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getnumericvalue" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getpropertyenum" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getpropertyname" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getpropertyvalueenum" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getpropertyvaluename" from="PHP 7, PHP 8"/>
+ <function name="intlchar::getunicodeversion" from="PHP 7, PHP 8"/>
+ <function name="intlchar::hasbinaryproperty" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isalnum" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isalpha" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isbase" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isblank" from="PHP 7, PHP 8"/>
+ <function name="intlchar::iscntrl" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isdefined" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isdigit" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isgraph" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isidignorable" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isidpart" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isidstart" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isisocontrol" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isjavaidpart" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isjavaidstart" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isjavaspacechar" from="PHP 7, PHP 8"/>
+ <function name="intlchar::islower" from="PHP 7, PHP 8"/>
+ <function name="intlchar::ismirrored" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isprint" from="PHP 7, PHP 8"/>
+ <function name="intlchar::ispunct" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isspace" from="PHP 7, PHP 8"/>
+ <function name="intlchar::istitle" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isualphabetic" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isulowercase" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isupper" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isuuppercase" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isuwhitespace" from="PHP 7, PHP 8"/>
+ <function name="intlchar::iswhitespace" from="PHP 7, PHP 8"/>
+ <function name="intlchar::isxdigit" from="PHP 7, PHP 8"/>
+ <function name="intlchar::ord" from="PHP 7, PHP 8"/>
+ <function name="intlchar::tolower" from="PHP 7, PHP 8"/>
+ <function name="intlchar::totitle" from="PHP 7, PHP 8"/>
+ <function name="intlchar::toupper" from="PHP 7, PHP 8"/>
 
- <function name="intltimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::createtimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::fromdatetimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::createdefault" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getgmt" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::createenumeration" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::createtimezoneidenumeration" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intltimezone::countequivalentids" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getcanonicalid" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::gettzdataversion" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getequivalentid" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getid" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getidforwindowsid" from="PHP 7 &gt;= 7.1.0"/>
- <function name="intltimezone::getregion" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intltimezone::getunknown" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intltimezone::usedaylighttime" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getoffset" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getrawoffset" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::hassamerules" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getdisplayname" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getdstsavings" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::todatetimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="intltimezone::getwindowsid" from="PHP 7 &gt;= 7.1.0"/>
+ <function name="intltimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::createtimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::fromdatetimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::createdefault" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getgmt" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::createenumeration" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::createtimezoneidenumeration" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intltimezone::countequivalentids" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getcanonicalid" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::gettzdataversion" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getequivalentid" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getid" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getidforwindowsid" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="intltimezone::getregion" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intltimezone::getunknown" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intltimezone::usedaylighttime" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getoffset" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getrawoffset" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::hassamerules" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getdisplayname" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getdstsavings" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::todatetimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="intltimezone::getwindowsid" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
 
- <function name="intldateformatter" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::getdatetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::gettimetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::getcalendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::getcalendarobject" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL intl &gt;= 3.0.0"/>
- <function name="intldateformatter::setcalendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::gettimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL intl &gt;= 3.0.0"/>
- <function name="intldateformatter::settimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL intl &gt;= 3.0.0"/>
- <function name="intldateformatter::gettimezoneid" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::setpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::getpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::setlenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::islenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::format" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::formatobject" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL intl &gt;= 3.0.0"/>
- <function name="intldateformatter::parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::localtime" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intldateformatter::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::getdatetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::gettimetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::getcalendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::getcalendarobject" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL intl &gt;= 3.0.0"/>
+ <function name="intldateformatter::setcalendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::gettimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL intl &gt;= 3.0.0"/>
+ <function name="intldateformatter::settimezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL intl &gt;= 3.0.0"/>
+ <function name="intldateformatter::gettimezoneid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::setpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::getpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::setlenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::islenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::format" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::formatobject" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL intl &gt;= 3.0.0"/>
+ <function name="intldateformatter::parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::localtime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intldateformatter::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
 
- <function name="locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getdefault" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::setdefault" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getprimarylanguage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getscript" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getregion" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getkeywords" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getdisplayscript" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getdisplayregion" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getdisplayname" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getdisplaylanguage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getdisplayvariant" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::composelocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::parselocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::getallvariants" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::filtermatches" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::lookup" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::canonicalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale::acceptfromhttp" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
+ <function name="locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getdefault" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::setdefault" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getprimarylanguage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getscript" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getregion" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getkeywords" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getdisplayscript" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getdisplayregion" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getdisplayname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getdisplaylanguage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getdisplayvariant" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::composelocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::parselocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::getallvariants" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::filtermatches" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::lookup" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::canonicalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale::acceptfromhttp" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
 
- <function name="messageformatter" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::format" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::formatmessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::parsemessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::setpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::getpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="messageformatter::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::format" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::formatmessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::parsemessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::setpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::getpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="messageformatter::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
 
- <function name="normalizer" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="normalizer::normalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="normalizer::isnormalized" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="normalizer::getrawdecomposition" from="PHP 7 &gt;= 7.3"/>
+ <function name="normalizer" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="normalizer::normalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="normalizer::isnormalized" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="normalizer::getrawdecomposition" from="PHP 7 &gt;= 7.3, PHP 8"/>
 
- <function name="numberformatter" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::format" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::formatcurrency" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::parsecurrency" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::setattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::getattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::settextattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::gettextattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::setsymbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::getsymbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::setpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::getpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numberformatter::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::format" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::formatcurrency" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::parsecurrency" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::setattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::getattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::settextattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::gettextattribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::setsymbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::getsymbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::setpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::getpattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::getlocale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::geterrorcode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numberformatter::geterrormessage" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
 
- <function name="intlbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::createwordinstance" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::createlineinstance" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::createcharacterinstance" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::createsentenceinstance" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::createtitleinstance" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::createcodepointinstance" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::gettext" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::settext" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::first" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::last" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::previous" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::next" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::current" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::following" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::preceding" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::isboundary" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::getlocale" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::getpartsiterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlbreakiterator::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="intlbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::createwordinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::createlineinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::createcharacterinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::createsentenceinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::createtitleinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::createcodepointinstance" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::gettext" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::settext" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::first" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::last" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::previous" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::next" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::current" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::following" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::preceding" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::isboundary" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::getlocale" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::getpartsiterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlbreakiterator::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
  
- <function name="intlcodepointbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlcodepointbreakiterator::getlastcodepoint" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="intlcodepointbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlcodepointbreakiterator::getlastcodepoint" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
 
- <function name="intlpartsiterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlpartsiterator::getbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="intlpartsiterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlpartsiterator::getbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
 
- <function name="intlrulebasedbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlrulebasedbreakiterator::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlrulebasedbreakiterator::getrules" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlrulebasedbreakiterator::getrulestatus" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlrulebasedbreakiterator::getrulestatusvec" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlrulebasedbreakiterator::getbinaryrules" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="intlrulebasedbreakiterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlrulebasedbreakiterator::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlrulebasedbreakiterator::getrules" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlrulebasedbreakiterator::getrulestatus" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlrulebasedbreakiterator::getrulestatusvec" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlrulebasedbreakiterator::getbinaryrules" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
  
- <function name="intlgregoriancalendar" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlgregoriancalendar::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlgregoriancalendar::setgregorianchange" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlgregoriancalendar::getgregorianchange" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intlgregoriancalendar::isleapyear" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="intlgregoriancalendar" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlgregoriancalendar::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlgregoriancalendar::setgregorianchange" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlgregoriancalendar::getgregorianchange" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intlgregoriancalendar::isleapyear" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
  
- <function name="intliterator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="intliterator::current" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="IntlIterator::key" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="IntlIterator::next" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="IntlIterator::rewind" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="IntlIterator::valid" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
+ <function name="intliterator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="intliterator::current" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="IntlIterator::key" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="IntlIterator::next" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="IntlIterator::rewind" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="IntlIterator::valid" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
 
- <function name="resourcebundle" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-count" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-create" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle--construct" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-geterrorcode" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-get-error-code" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-geterrormessage" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-get-error-message" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-get" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-getlocales" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="resourcebundle-locales" from="PHP 5 &gt;= 5.3.2, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="spoofchecker" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="spoofchecker-areconfusable" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="spoofchecker--construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="spoofchecker-issuspicious" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="spoofchecker-setallowedlocales" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="spoofchecker-setchecks" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator--construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-create" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-createfromrules" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-create-from-rules" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-createinverse" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-create-inverse" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-geterrorcode" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-get-error-code" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-geterrormessage" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-get-error-message" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-listids" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-list-ids" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
- <function name="transliterator-transliterate" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::count" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::create" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::__construct" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::geterrorcode" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle_get_error_code" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::geterrormessage" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle_get_error_message" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::get" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle::getlocales" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="resourcebundle_locales" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="spoofchecker" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="spoofchecker::areconfusable" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="spoofchecker::construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="spoofchecker::issuspicious" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="spoofchecker::setallowedlocales" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="spoofchecker::setchecks" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::create" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::createfromrules" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::create-from-rules" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::createinverse" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::create-inverse" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::geterrorcode" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::get-error-code" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::geterrormessage" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::get-error-message" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::listids" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::list-ids" from="PHP 5 &gt;= 5.4.0, PHP 7, PECL intl &gt;= 2.0.0"/>
+ <function name="transliterator::transliterate" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8, PECL intl &gt;= 2.0.0"/>
 
- <function name="uconverter" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::setsourceencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::setdestinationencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getsourceencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getdestinationencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getsourcetype" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getdestinationtype" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getsubstchars" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::setsubstchars" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::toucallback" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::fromucallback" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::convert" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::transcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::reasontext" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getavailable" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getaliases" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
- <function name="uconverter::getstandards" from="PHP 5 &gt;= 5.5.0, PHP 7, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::__construct" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::setsourceencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::setdestinationencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getsourceencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getdestinationencoding" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getsourcetype" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getdestinationtype" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getsubstchars" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::setsubstchars" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::toucallback" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::fromucallback" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::convert" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::transcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::geterrorcode" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::geterrormessage" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::reasontext" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getavailable" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getaliases" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
+ <function name="uconverter::getstandards" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8, PECL &gt;= 3.0.0a1"/>
 
  <!-- Functions -->
- <function name="collator_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_get_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_set_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_get_sort_key" from="PHP 5 &gt;= 5.3.2, PHP 7"/>
- <function name="collator_get_strength" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_set_strength" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_sort" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_sort_with_sort_keys" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_asort" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="collator_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_datetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_timetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_calendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_set_calendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_timezone_id" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_set_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_is_lenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_set_lenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_format" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_localtime" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="datefmt_format_object" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="datefmt_get_calendar_object" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="datefmt_get_timezone" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="datefmt_set_timezone" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="grapheme_strlen" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_strpos" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_stripos" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_strrpos" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_strripos" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_substr" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_strstr" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_stristr" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="grapheme_extract" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intl_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intl_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intl_is_failure" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="intl_error_name" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="idn_to_ascii" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.2, PECL idn &gt;= 0.1"/>
- <function name="idn_to_utf8" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.2, PECL idn &gt;= 0.1"/>
- <function name="locale_get_default" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_set_default" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_primary_language" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_script" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_region" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_keywords" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_display_script" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_display_region" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_display_name" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_display_language" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_display_variant" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_compose" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_get_all_variants" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_filter_matches" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_canonicalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_lookup" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="locale_accept_from_http" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_format" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_format_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_parse_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_set_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_get_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="msgfmt_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="normalizer_normalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="normalizer_is_normalized" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_format" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_format_currency" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_parse_currency" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_set_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_set_text_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_text_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_set_symbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_symbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_set_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
- <function name="numfmt_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_get_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_set_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_get_sort_key" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8"/>
+ <function name="collator_get_strength" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_set_strength" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_sort" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_sort_with_sort_keys" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_asort" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="collator_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_datetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_timetype" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_calendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_set_calendar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_timezone_id" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_set_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_is_lenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_set_lenient" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_format" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_localtime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="datefmt_format_object" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="datefmt_get_calendar_object" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="datefmt_get_timezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="datefmt_set_timezone" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="grapheme_strlen" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_strpos" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_stripos" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_strrpos" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_strripos" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_substr" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_strstr" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_stristr" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="grapheme_extract" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intl_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intl_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intl_is_failure" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="intl_error_name" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="idn_to_ascii" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.2, PECL idn &gt;= 0.1"/>
+ <function name="idn_to_utf8" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.2, PECL idn &gt;= 0.1"/>
+ <function name="locale_get_default" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_set_default" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_primary_language" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_script" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_region" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_keywords" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_display_script" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_display_region" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_display_name" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_display_language" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_display_variant" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_compose" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_get_all_variants" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_filter_matches" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_canonicalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_lookup" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="locale_accept_from_http" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_format" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_format_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_parse_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_set_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_get_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="msgfmt_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="normalizer_normalize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="normalizer_is_normalized" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_create" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_format" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_parse" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_format_currency" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_parse_currency" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_set_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_set_text_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_text_attribute" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_set_symbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_symbol" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_set_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_pattern" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_locale" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_error_code" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
+ <function name="numfmt_get_error_message" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL intl &gt;= 1.0.0"/>
 </versions>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/json/book.xml b/reference/json/book.xml
index e108b37503..871dcfbc4f 100644
--- a/reference/json/book.xml
+++ b/reference/json/book.xml
@@ -2,7 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.json" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundled" ?>
+ <?phpdoc extension-membership="core" ?>
  <title>JavaScript Object Notation</title>
  <titleabbrev>JSON</titleabbrev>
 
@@ -11,9 +11,8 @@
   <para>
    This extension implements the <link
    xlink:href="&url.json;">JavaScript Object Notation (JSON)</link>
-   data-interchange format. The decoding in PHP 5 is handled by a parser based on
-   the JSON_checker by Douglas Crockford. PHP 7 comes with a completely new and
-   improved parser that is specifically written for PHP and licensed under the
+   data-interchange format. PHP comes with a parser 
+   that is specifically written for PHP and licensed under the
    PHP license.
   </para>
   &json.implementation.superset;
diff --git a/reference/json/constants.xml b/reference/json/constants.xml
index e29835ed26..80af6fc131 100644
--- a/reference/json/constants.xml
+++ b/reference/json/constants.xml
@@ -18,7 +18,6 @@
    <listitem>
     <simpara>
      No error has occurred.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -30,7 +29,6 @@
    <listitem>
     <simpara>
      The maximum stack depth has been exceeded.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -42,7 +40,6 @@
    <listitem>
     <simpara>
      Occurs with underflow or with the modes mismatch.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -54,7 +51,6 @@
    <listitem>
     <simpara>
      Control character error, possibly incorrectly encoded.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -66,7 +62,6 @@
    <listitem>
     <simpara>
      Syntax error.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -78,7 +73,6 @@
    <listitem>
     <simpara>
      Malformed UTF-8 characters, possibly incorrectly encoded.
-     Available as of PHP 5.3.3.
     </simpara>
    </listitem>
   </varlistentry>
@@ -93,7 +87,6 @@
      recursive references and cannot be encoded.
      If the <constant>JSON_PARTIAL_OUTPUT_ON_ERROR</constant> option was
      given, &null; will be encoded in the place of the recursive reference.
-     Available as of PHP 5.5.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -110,7 +103,6 @@
      If the <constant>JSON_PARTIAL_OUTPUT_ON_ERROR</constant> option was
      given, <literal>0</literal> will be encoded in the place of these
      special numbers.
-     Available as of PHP 5.5.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -125,7 +117,6 @@
      <function>json_encode</function>, such as a &resource;.
      If the <constant>JSON_PARTIAL_OUTPUT_ON_ERROR</constant> option was
      given, &null; will be encoded in the place of the unsupported value.
-     Available as of PHP 5.5.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -139,7 +130,6 @@
      A key starting with \u0000 character was in the string passed to
      <function>json_decode</function> when decoding a JSON object into a PHP
      object.
-     Available as of PHP 7.0.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -152,7 +142,6 @@
     <simpara>
      Single unpaired UTF-16 surrogate in unicode escape contained in the
      JSON string passed to <function>json_decode</function>.
-     Available as of PHP 7.0.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -171,7 +160,6 @@
    <listitem>
     <simpara>
      Decodes large integers as their original string value.
-     Available as of PHP 5.4.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -185,7 +173,6 @@
      Decodes JSON objects as PHP array. This option can be added automatically
      by calling <function>json_decode</function> with the second parameter
      equal to &true;.
-     Available as of PHP 5.4.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -204,7 +191,6 @@
    <listitem>
     <simpara>
      All &lt; and &gt; are converted to \u003C and \u003E.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -216,7 +202,6 @@
    <listitem>
     <simpara>
      All &amp; are converted to \u0026.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -228,7 +213,6 @@
    <listitem>
     <simpara>
      All ' are converted to \u0027.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -240,7 +224,6 @@
    <listitem>
     <simpara>
      All " are converted to \u0022.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -254,7 +237,6 @@
      Outputs an object rather than an array when a non-associative array is
      used. Especially useful when the recipient of the output is expecting
      an object and the array is empty.
-     Available as of PHP 5.3.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -266,7 +248,6 @@
    <listitem>
     <simpara>
      Encodes numeric strings as numbers.
-     Available as of PHP 5.3.3.
     </simpara>
    </listitem>
   </varlistentry>
@@ -278,7 +259,6 @@
    <listitem>
     <simpara>
      Use whitespace in returned data to format it.
-     Available as of PHP 5.4.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -290,7 +270,6 @@
    <listitem>
     <simpara>
      Don't escape <literal>/</literal>.
-     Available as of PHP 5.4.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -303,7 +282,6 @@
     <simpara>
      Encode multibyte Unicode characters literally (default is to escape as
      \uXXXX).
-     Available as of PHP 5.4.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -315,7 +293,6 @@
    <listitem>
     <simpara>
      Substitute some unencodable values instead of failing.
-     Available as of PHP 5.5.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -327,7 +304,6 @@
    <listitem>
     <simpara>
      Ensures that &float; values are always encoded as a float value.
-     Available as of PHP 5.6.6.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/json/functions/json-last-error.xml b/reference/json/functions/json-last-error.xml
index 8323ef6492..d01353b653 100644
--- a/reference/json/functions/json-last-error.xml
+++ b/reference/json/functions/json-last-error.xml
@@ -68,12 +68,12 @@
      <row>
       <entry><constant>JSON_ERROR_UTF8</constant></entry>
       <entry>Malformed UTF-8 characters, possibly incorrectly encoded</entry>
-      <entry>PHP 5.3.3</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_RECURSION</constant></entry>
       <entry>One or more recursive references in the value to be encoded</entry>
-      <entry>PHP 5.5.0</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_INF_OR_NAN</constant></entry>
@@ -83,22 +83,22 @@
        or <link linkend="function.is-infinite"><constant>INF</constant></link>
        values in the value to be encoded
       </entry>
-      <entry>PHP 5.5.0</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_UNSUPPORTED_TYPE</constant></entry>
       <entry>A value of a type that cannot be encoded was given</entry>
-      <entry>PHP 5.5.0</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_INVALID_PROPERTY_NAME</constant></entry>
       <entry>A property name that cannot be encoded was given</entry>
-      <entry>PHP 7.0.0</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_UTF16</constant></entry>
       <entry>Malformed UTF-16 characters, possibly incorrectly encoded</entry>
-      <entry>PHP 7.0.0</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/json/jsonserializable.xml b/reference/json/jsonserializable.xml
index 504a1fc4fa..a642742a7e 100644
--- a/reference/json/jsonserializable.xml
+++ b/reference/json/jsonserializable.xml
@@ -28,9 +28,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>JsonSerializable</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/reference/ldap/constants.xml b/reference/ldap/constants.xml
index 600dead073..2e5863412a 100644
--- a/reference/ldap/constants.xml
+++ b/reference/ldap/constants.xml
@@ -395,7 +395,7 @@
    </term>
    <listitem>
     <simpara>
-     Specifies the certificate checking checking strategy. This must be one of: <constant>LDAP_OPT_X_TLS_NEVER</constant>,<constant>LDAP_OPT_X_TLS_HARD</constant>, <constant>LDAP_OPT_X_TLS_DEMAND</constant>,
+     Specifies the certificate checking strategy. This must be one of: <constant>LDAP_OPT_X_TLS_NEVER</constant>,<constant>LDAP_OPT_X_TLS_HARD</constant>, <constant>LDAP_OPT_X_TLS_DEMAND</constant>,
 <constant>LDAP_OPT_X_TLS_ALLOW</constant>, <constant>LDAP_OPT_X_TLS_TRY</constant>.
      (Available as of PHP 7.0.0)
     </simpara>
diff --git a/reference/ldap/functions/ldap-add.xml b/reference/ldap/functions/ldap-add.xml
index bf57591a36..9185410433 100644
--- a/reference/ldap/functions/ldap-add.xml
+++ b/reference/ldap/functions/ldap-add.xml
@@ -28,7 +28,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-bind.xml b/reference/ldap/functions/ldap-bind.xml
index ee42631879..18cfdc0a6c 100644
--- a/reference/ldap/functions/ldap-bind.xml
+++ b/reference/ldap/functions/ldap-bind.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-compare.xml b/reference/ldap/functions/ldap-compare.xml
index dc20cae0aa..23231d0da4 100644
--- a/reference/ldap/functions/ldap-compare.xml
+++ b/reference/ldap/functions/ldap-compare.xml
@@ -30,7 +30,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-control-paged-result-response.xml b/reference/ldap/functions/ldap-control-paged-result-response.xml
index 454b38c8b8..9add8e7826 100644
--- a/reference/ldap/functions/ldap-control-paged-result-response.xml
+++ b/reference/ldap/functions/ldap-control-paged-result-response.xml
@@ -34,7 +34,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink">
      <term><parameter>link</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-control-paged-result.xml b/reference/ldap/functions/ldap-control-paged-result.xml
index 43c9cd1d74..29ef730d4b 100644
--- a/reference/ldap/functions/ldap-control-paged-result.xml
+++ b/reference/ldap/functions/ldap-control-paged-result.xml
@@ -34,7 +34,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink">
      <term><parameter>link</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-count-entries.xml b/reference/ldap/functions/ldap-count-entries.xml
index 44c2c110ab..d23db1e38d 100644
--- a/reference/ldap/functions/ldap-count-entries.xml
+++ b/reference/ldap/functions/ldap-count-entries.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
@@ -35,7 +35,7 @@
      <term><parameter>result</parameter></term>
      <listitem>
       <para>
-       The internal LDAP result.
+       &ldap.parameter.result;
       </para>
      </listitem>
     </varlistentry>
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns number of entries in the result or &false; on error.
+   Returns number of entries in the result,&return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -55,7 +55,7 @@
   &reftitle.examples;
   <para>
    <example xml:id="ldap-count-entries.example.basic">
-    <title><function>ldap-count-entries</function> example</title>
+    <title><function>ldap_count_entries</function> example</title>
     <para>
      Retrieve number of entries in the result.
     </para>
diff --git a/reference/sphinx/sphinxclient/setconnecttimeout.xml b/reference/ldap/functions/ldap-count-references.xml
similarity index 50%
rename from reference/sphinx/sphinxclient/setconnecttimeout.xml
rename to reference/ldap/functions/ldap-count-references.xml
index a7c6820e52..f35ed6ea62 100644
--- a/reference/sphinx/sphinxclient/setconnecttimeout.xml
+++ b/reference/ldap/functions/ldap-count-references.xml
@@ -1,57 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setconnecttimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="function.ldap-count-references" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>SphinxClient::setConnectTimeout</refname>
-  <refpurpose>Set connection timeout</refpurpose>
+  <refname>ldap_count_references</refname>
+  <refpurpose>Counts the number of references in a search result</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setConnectTimeout</methodname>
-   <methodparam><type>float</type><parameter>timeout</parameter></methodparam>
+   <type>int</type><methodname>ldap_count_references</methodname>
+   <methodparam><type>resource</type><parameter>ldap</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Sets connection timeout (in seconds) for searchd connection.
+   Counts the number of references in a search result.
   </para>
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>timeout</parameter></term>
-     <listitem>
-      <para>
-       Timeout in seconds.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
+  <variablelist>
+   <varlistentry>
+    <term><parameter>ldap</parameter></term>
+    <listitem>
+     <para>
+      &ldap.parameter.ldap;
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>result</parameter></term>
+    <listitem>
+     <para>
+      &ldap.parameter.result;
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   Returns the number of references in a search result.
   </para>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setmaxquerytime" /></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>ldap_connect</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ldap/functions/ldap-delete.xml b/reference/ldap/functions/ldap-delete.xml
index a383be16f3..95b8f293b9 100644
--- a/reference/ldap/functions/ldap-delete.xml
+++ b/reference/ldap/functions/ldap-delete.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-errno.xml b/reference/ldap/functions/ldap-errno.xml
index a21ba67c0f..69f71fd4f1 100644
--- a/reference/ldap/functions/ldap-errno.xml
+++ b/reference/ldap/functions/ldap-errno.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-error.xml b/reference/ldap/functions/ldap-error.xml
index b4d1527e70..58ad1419d3 100644
--- a/reference/ldap/functions/ldap-error.xml
+++ b/reference/ldap/functions/ldap-error.xml
@@ -35,7 +35,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-exop-passwd.xml b/reference/ldap/functions/ldap-exop-passwd.xml
index a968e1bb4c..460a85f2f4 100644
--- a/reference/ldap/functions/ldap-exop-passwd.xml
+++ b/reference/ldap/functions/ldap-exop-passwd.xml
@@ -28,7 +28,7 @@
     <term><parameter>ldap</parameter></term>
     <listitem>
      <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+      &ldap.parameter.ldap;
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ldap/functions/ldap-exop-refresh.xml b/reference/ldap/functions/ldap-exop-refresh.xml
index 3986e4b03c..f1ef92839b 100644
--- a/reference/ldap/functions/ldap-exop-refresh.xml
+++ b/reference/ldap/functions/ldap-exop-refresh.xml
@@ -26,7 +26,7 @@
     <term><parameter>ldap</parameter></term>
     <listitem>
      <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+      &ldap.parameter.ldap;
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ldap/functions/ldap-exop-whoami.xml b/reference/ldap/functions/ldap-exop-whoami.xml
index 34ed4407b1..3cc497b6bf 100644
--- a/reference/ldap/functions/ldap-exop-whoami.xml
+++ b/reference/ldap/functions/ldap-exop-whoami.xml
@@ -25,7 +25,7 @@
     <term><parameter>ldap</parameter></term>
     <listitem>
      <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+      &ldap.parameter.ldap;
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ldap/functions/ldap-exop.xml b/reference/ldap/functions/ldap-exop.xml
index 669aa40497..3f5d9db60a 100644
--- a/reference/ldap/functions/ldap-exop.xml
+++ b/reference/ldap/functions/ldap-exop.xml
@@ -32,7 +32,7 @@
     <term><parameter>link</parameter></term>
     <listitem>
      <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+      &ldap.parameter.ldap;
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ldap/functions/ldap-first-attribute.xml b/reference/ldap/functions/ldap-first-attribute.xml
index 896ecf6468..75d27c51ae 100644
--- a/reference/ldap/functions/ldap-first-attribute.xml
+++ b/reference/ldap/functions/ldap-first-attribute.xml
@@ -31,7 +31,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-first-entry.xml b/reference/ldap/functions/ldap-first-entry.xml
index d259fc25af..aa362978a8 100644
--- a/reference/ldap/functions/ldap-first-entry.xml
+++ b/reference/ldap/functions/ldap-first-entry.xml
@@ -33,7 +33,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
@@ -41,6 +41,7 @@
      <term><parameter>result</parameter></term>
      <listitem>
       <para>
+       &ldap.parameter.result;
       </para>
      </listitem>
     </varlistentry>
@@ -51,8 +52,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the result entry identifier for the first entry on success and
-   &false; on error.
+   Returns the result entry identifier for the first entry on success,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/ldap/functions/ldap-free-result.xml b/reference/ldap/functions/ldap-free-result.xml
index 5ea00fa38e..3fac0ef9f3 100644
--- a/reference/ldap/functions/ldap-free-result.xml
+++ b/reference/ldap/functions/ldap-free-result.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ldap_free_result</methodname>
-   <methodparam><type>resource</type><parameter>ldap</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
   <para>
    Frees up the memory allocated internally to store the result. All result
@@ -29,9 +29,10 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ldap</parameter></term>
+     <term><parameter>result</parameter></term>
      <listitem>
       <para>
+       &ldap.parameter.result;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-get-attributes.xml b/reference/ldap/functions/ldap-get-attributes.xml
index 3f843aaf5e..df994174c9 100644
--- a/reference/ldap/functions/ldap-get-attributes.xml
+++ b/reference/ldap/functions/ldap-get-attributes.xml
@@ -47,7 +47,7 @@ return_value["attribute"][i] = (i+1)th value of the attribute
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-get-dn.xml b/reference/ldap/functions/ldap-get-dn.xml
index bb34df9496..9b56bcdd7e 100644
--- a/reference/ldap/functions/ldap-get-dn.xml
+++ b/reference/ldap/functions/ldap-get-dn.xml
@@ -26,7 +26,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-get-entries.xml b/reference/ldap/functions/ldap-get-entries.xml
index aeb5799051..3c27b64645 100644
--- a/reference/ldap/functions/ldap-get-entries.xml
+++ b/reference/ldap/functions/ldap-get-entries.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
@@ -35,6 +35,7 @@
      <term><parameter>result</parameter></term>
      <listitem>
       <para>
+       &ldap.parameter.result;
       </para>
      </listitem>
     </varlistentry>
@@ -46,7 +47,7 @@
   &reftitle.returnvalues;
   <para>
    Returns a complete result information in a multi-dimensional array on
-   success and &false; on error.
+   success,&return.falseforfailure;.
   </para>
   <para>
    The structure of the array is as follows.
diff --git a/reference/ldap/functions/ldap-get-option.xml b/reference/ldap/functions/ldap-get-option.xml
index 31f44e2337..2c89b2ab69 100644
--- a/reference/ldap/functions/ldap-get-option.xml
+++ b/reference/ldap/functions/ldap-get-option.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-get-values-len.xml b/reference/ldap/functions/ldap-get-values-len.xml
index 852729e93b..6adc38749d 100644
--- a/reference/ldap/functions/ldap-get-values-len.xml
+++ b/reference/ldap/functions/ldap-get-values-len.xml
@@ -31,7 +31,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-get-values.xml b/reference/ldap/functions/ldap-get-values.xml
index fea0412f28..d7667a6a4c 100644
--- a/reference/ldap/functions/ldap-get-values.xml
+++ b/reference/ldap/functions/ldap-get-values.xml
@@ -38,7 +38,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-list.xml b/reference/ldap/functions/ldap-list.xml
index e913d2fd90..2857841e8f 100644
--- a/reference/ldap/functions/ldap-list.xml
+++ b/reference/ldap/functions/ldap-list.xml
@@ -41,7 +41,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-mod-add.xml b/reference/ldap/functions/ldap-mod-add.xml
index a07eddfe27..a96d7e5630 100644
--- a/reference/ldap/functions/ldap-mod-add.xml
+++ b/reference/ldap/functions/ldap-mod-add.xml
@@ -29,7 +29,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-mod-del-ext.xml b/reference/ldap/functions/ldap-mod-del-ext.xml
index 5d7a840a02..a9978aa908 100644
--- a/reference/ldap/functions/ldap-mod-del-ext.xml
+++ b/reference/ldap/functions/ldap-mod-del-ext.xml
@@ -27,6 +27,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an LDAP result identifier or &false; on error.
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -52,13 +59,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an LDAP result identifier or &false; on error.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/ldap/functions/ldap-mod-del.xml b/reference/ldap/functions/ldap-mod-del.xml
index 9c94ee8d9e..093e5db81e 100644
--- a/reference/ldap/functions/ldap-mod-del.xml
+++ b/reference/ldap/functions/ldap-mod-del.xml
@@ -30,7 +30,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-mod-replace.xml b/reference/ldap/functions/ldap-mod-replace.xml
index 2d2a5112e0..922ce4a6f9 100644
--- a/reference/ldap/functions/ldap-mod-replace.xml
+++ b/reference/ldap/functions/ldap-mod-replace.xml
@@ -29,7 +29,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-modify-batch.xml b/reference/ldap/functions/ldap-modify-batch.xml
index a2771b6784..8eb6dd8f3d 100644
--- a/reference/ldap/functions/ldap-modify-batch.xml
+++ b/reference/ldap/functions/ldap-modify-batch.xml
@@ -29,7 +29,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       An LDAP resource, returned by <function>ldap_connect</function>.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-next-attribute.xml b/reference/ldap/functions/ldap-next-attribute.xml
index dbfdf51733..3bbfbf75a2 100644
--- a/reference/ldap/functions/ldap-next-attribute.xml
+++ b/reference/ldap/functions/ldap-next-attribute.xml
@@ -29,7 +29,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-next-entry.xml b/reference/ldap/functions/ldap-next-entry.xml
index 08c0d81e60..9a4eca276d 100644
--- a/reference/ldap/functions/ldap-next-entry.xml
+++ b/reference/ldap/functions/ldap-next-entry.xml
@@ -11,14 +11,14 @@
   <methodsynopsis>
    <type class="union"><type>resource</type><type>false</type></type><methodname>ldap_next_entry</methodname>
    <methodparam><type>resource</type><parameter>ldap</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>entry</parameter></methodparam>
   </methodsynopsis>
   <para>
    Retrieve the entries stored in the result. Successive calls to the
    <function>ldap_next_entry</function> return entries one by one till there
    are no more entries. The first call to <function>ldap_next_entry</function>
    is made after the call to <function>ldap_first_entry</function> with the
-   <parameter>result</parameter> as returned from the
+   <parameter>entry</parameter> as returned from the
    <function>ldap_first_entry</function>.
   </para>
  </refsect1>
@@ -31,12 +31,12 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>result</parameter></term>
+     <term><parameter>entry</parameter></term>
      <listitem>
       <para>
       </para>
diff --git a/reference/ldap/functions/ldap-parse-exop.xml b/reference/ldap/functions/ldap-parse-exop.xml
index da3e694f9d..a52936573a 100644
--- a/reference/ldap/functions/ldap-parse-exop.xml
+++ b/reference/ldap/functions/ldap-parse-exop.xml
@@ -27,7 +27,7 @@
     <term><parameter>ldap</parameter></term>
     <listitem>
      <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+      &ldap.parameter.ldap;
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ldap/functions/ldap-parse-result.xml b/reference/ldap/functions/ldap-parse-result.xml
index ab3e08fd47..cf9fdb0e32 100644
--- a/reference/ldap/functions/ldap-parse-result.xml
+++ b/reference/ldap/functions/ldap-parse-result.xml
@@ -31,16 +31,15 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>result_identifier</parameter></term>
+     <term><parameter>result</parameter></term>
      <listitem>
       <para>
-       An LDAP result resource, returned by <function>ldap_list</function> or
-       <function>ldap_search</function>.
+       &ldap.parameter.result;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-read.xml b/reference/ldap/functions/ldap-read.xml
index fdc467fd76..205b94672f 100644
--- a/reference/ldap/functions/ldap-read.xml
+++ b/reference/ldap/functions/ldap-read.xml
@@ -35,7 +35,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-rename.xml b/reference/ldap/functions/ldap-rename.xml
index 0128fd87e4..75c5102e57 100644
--- a/reference/ldap/functions/ldap-rename.xml
+++ b/reference/ldap/functions/ldap-rename.xml
@@ -30,7 +30,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-search.xml b/reference/ldap/functions/ldap-search.xml
index 96d16259bc..9d0b84a275 100644
--- a/reference/ldap/functions/ldap-search.xml
+++ b/reference/ldap/functions/ldap-search.xml
@@ -51,7 +51,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-set-option.xml b/reference/ldap/functions/ldap-set-option.xml
index 9ee1db1053..2de1c88a16 100644
--- a/reference/ldap/functions/ldap-set-option.xml
+++ b/reference/ldap/functions/ldap-set-option.xml
@@ -27,7 +27,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ldap/functions/ldap-sort.xml b/reference/ldap/functions/ldap-sort.xml
index 29f001750c..155156ad3d 100644
--- a/reference/ldap/functions/ldap-sort.xml
+++ b/reference/ldap/functions/ldap-sort.xml
@@ -34,7 +34,7 @@
      <term><parameter>link</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
@@ -59,6 +59,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/ldap/functions/ldap-unbind.xml b/reference/ldap/functions/ldap-unbind.xml
index ba67f111b5..0ff0ada3c7 100644
--- a/reference/ldap/functions/ldap-unbind.xml
+++ b/reference/ldap/functions/ldap-unbind.xml
@@ -25,7 +25,7 @@
      <term><parameter>ldap</parameter></term>
      <listitem>
       <para>
-       An LDAP link identifier, returned by <function>ldap_connect</function>.
+       &ldap.parameter.ldap;
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/libxml/functions/libxml-clear-errors.xml b/reference/libxml/functions/libxml-clear-errors.xml
index 5aad03fcf9..54b3841bd9 100644
--- a/reference/libxml/functions/libxml-clear-errors.xml
+++ b/reference/libxml/functions/libxml-clear-errors.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/libxml/functions/libxml-disable-entity-loader.xml b/reference/libxml/functions/libxml-disable-entity-loader.xml
index 8deb2a16b3..8d9d4ab2e7 100644
--- a/reference/libxml/functions/libxml-disable-entity-loader.xml
+++ b/reference/libxml/functions/libxml-disable-entity-loader.xml
@@ -99,7 +99,7 @@
    <simplelist>
     <member><function>libxml_use_internal_errors</function></member>
     <member><function>libxml_set_external_entity_loader</function></member>
-    <member><link linkend="libxml.constants">The <constant>LIBXML_NONET</constant> constant</link></member>
+    <member><link linkend="libxml.constants">The <constant>LIBXML_NOENT</constant> constant</link></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/libxml/functions/libxml-get-errors.xml b/reference/libxml/functions/libxml-get-errors.xml
index 4fa4e212f2..dbcfac898b 100644
--- a/reference/libxml/functions/libxml-get-errors.xml
+++ b/reference/libxml/functions/libxml-get-errors.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/libxml/functions/libxml-get-last-error.xml b/reference/libxml/functions/libxml-get-last-error.xml
index 2b5364792b..c3af4140ab 100644
--- a/reference/libxml/functions/libxml-get-last-error.xml
+++ b/reference/libxml/functions/libxml-get-last-error.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/lua/book.xml b/reference/lua/book.xml
index fd9f17c361..f4373c63d1 100644
--- a/reference/lua/book.xml
+++ b/reference/lua/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.lua" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Lua</title>
  <titleabbrev>Lua</titleabbrev>
 
diff --git a/reference/lua/luaclosure/invoke.xml b/reference/lua/luaclosure/invoke.xml
index a3965ea8c7..07d43c9561 100644
--- a/reference/lua/luaclosure/invoke.xml
+++ b/reference/lua/luaclosure/invoke.xml
@@ -58,7 +58,6 @@ CODE
 );
 
 $lua->call($closure);
-/* after PHP 5.3 */
 $closure();
 ?>
 ]]>
diff --git a/reference/luasandbox/book.xml b/reference/luasandbox/book.xml
index 3995098b3a..b3fd02b1d3 100644
--- a/reference/luasandbox/book.xml
+++ b/reference/luasandbox/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.luasandbox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>LuaSandbox</title>
  <titleabbrev>LuaSandbox</titleabbrev>
 
diff --git a/reference/lzf/book.xml b/reference/lzf/book.xml
index e7dda47102..bf248551c8 100644
--- a/reference/lzf/book.xml
+++ b/reference/lzf/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.lzf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>LZF</title>
  <titleabbrev>LZF</titleabbrev>
  
diff --git a/reference/lzf/functions/lzf-optimized-for.xml b/reference/lzf/functions/lzf-optimized-for.xml
index 0a2758e01f..ac3debe64f 100644
--- a/reference/lzf/functions/lzf-optimized-for.xml
+++ b/reference/lzf/functions/lzf-optimized-for.xml
@@ -18,6 +18,12 @@
    Determines what was LZF extension optimized for during compilation.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -25,7 +31,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mail/ini.xml b/reference/mail/ini.xml
index b0cddbcb0f..94ab7023c0 100644
--- a/reference/mail/ini.xml
+++ b/reference/mail/ini.xml
@@ -20,19 +20,19 @@
      <entry><link linkend="ini.mail.add-x-header">mail.add_x_header</link></entry>
      <entry>"0"</entry>
      <entry>PHP_INI_PERDIR</entry>
-     <entry>Available since PHP 5.3.0.</entry>
+     <entry></entry>
     </row>
     <row>
      <entry><link linkend="ini.mail.log">mail.log</link></entry>
      <entry>NULL</entry>
-     <entry>PHP_INI_PERDIR</entry>
-     <entry>Available since PHP 5.3.0. (PHP_INI_SYSTEM|PHP_INI_PERDIR)</entry>
+     <entry>PHP_INI_SYSTEM|PHP_INI_PERDIR</entry>
+     <entry></entry>
     </row>
     <row>
      <entry><link linkend="ini.mail.force_extra_parameters">mail.force_extra_parameters</link></entry>
      <entry>NULL</entry>
-     <entry>PHP_INI_PERDIR</entry>
-     <entry>Available since PHP 5.0.0. (PHP_INI_SYSTEM|PHP_INI_PERDIR)</entry>
+     <entry>PHP_INI_SYSTEM|PHP_INI_PERDIR</entry>
+     <entry></entry>
     </row>
     <row>
      <entry><link linkend="ini.smtp">SMTP</link></entry>
diff --git a/reference/mailparse/book.xml b/reference/mailparse/book.xml
index 3723fd210f..2fa7e96964 100644
--- a/reference/mailparse/book.xml
+++ b/reference/mailparse/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.mailparse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Mailparse</title>
  
  <!-- {{{ preface -->
diff --git a/reference/mailparse/functions/mailparse-msg-create.xml b/reference/mailparse/functions/mailparse-msg-create.xml
index 4b8629049c..f20964653b 100644
--- a/reference/mailparse/functions/mailparse-msg-create.xml
+++ b/reference/mailparse/functions/mailparse-msg-create.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/math/constants.xml b/reference/math/constants.xml
index 9867b3684e..68570e27e4 100644
--- a/reference/math/constants.xml
+++ b/reference/math/constants.xml
@@ -80,7 +80,7 @@
       <entry><constant>M_SQRTPI</constant></entry>    
       <entry>1.77245385090551602729</entry>
       <entry>sqrt(pi)</entry>
-      <entry>PHP 5.2.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.m-2-sqrtpi">
       <entry><constant>M_2_SQRTPI</constant></entry>  
@@ -98,7 +98,7 @@
       <entry><constant>M_SQRT3</constant></entry> 
       <entry>1.73205080756887729352</entry>
       <entry>sqrt(3)</entry>
-      <entry>PHP 5.2.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.m-sqrt1-2">
       <entry><constant>M_SQRT1_2</constant></entry>   
@@ -110,37 +110,37 @@
       <entry><constant>M_LNPI</constant></entry>  
       <entry>1.14472988584940017414</entry>
       <entry>log_e(pi)</entry>
-      <entry>PHP 5.2.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.m-euler">
       <entry><constant>M_EULER</constant></entry> 
       <entry>0.57721566490153286061</entry>
       <entry>Euler constant</entry>
-      <entry>PHP 5.2.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.php-round-half-up">
       <entry><constant>PHP_ROUND_HALF_UP</constant></entry> 
       <entry>1</entry>
       <entry>Round halves up</entry>
-      <entry>PHP 5.3.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.php-round-half-down">
       <entry><constant>PHP_ROUND_HALF_DOWN</constant></entry> 
       <entry>2</entry>
       <entry>Round halves down</entry>
-      <entry>PHP 5.3.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.php-round-half-even">
       <entry><constant>PHP_ROUND_HALF_EVEN</constant></entry> 
       <entry>3</entry>
       <entry>Round halves to even numbers</entry>
-      <entry>PHP 5.3.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.php-round-half-odd">
       <entry><constant>PHP_ROUND_HALF_ODD</constant></entry> 
       <entry>4</entry>
       <entry>Round halves to odd numbers</entry>
-      <entry>PHP 5.3.0</entry>
+      <entry></entry>
      </row>
      <row xml:id="constant.nan">
       <entry><constant>NAN</constant></entry>
@@ -158,10 +158,6 @@
    </tgroup>
   </table>
  </para>
- <para>
-  All constants without a labeled PHP version above are available 
-  starting with PHP 5.0.0.
- </para>
 </appendix>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/math/functions/abs.xml b/reference/math/functions/abs.xml
index 126e2b252f..bf5da759d7 100644
--- a/reference/math/functions/abs.xml
+++ b/reference/math/functions/abs.xml
@@ -8,11 +8,11 @@
  <refsect1 role="description">
   &reftitle.description;
    <methodsynopsis>
-    <type class="union"><type>int</type><type>float</type></type><methodname>abs</methodname>
-    <methodparam><type>mixed</type><parameter>number</parameter></methodparam>
-   </methodsynopsis>
+   <type class="union"><type>int</type><type>float</type></type><methodname>abs</methodname>
+   <methodparam><type class="union"><type>int</type><type>float</type></type><parameter>num</parameter></methodparam>
+  </methodsynopsis>
   <para>
-   Returns the absolute value of <parameter>number</parameter>. 
+   Returns the absolute value of <parameter>num</parameter>. 
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>number</parameter></term>
+     <term><parameter>num</parameter></term>
      <listitem>
       <para>
        The numeric value to process
@@ -33,13 +33,37 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The absolute value of <parameter>number</parameter>. If the
-   argument <parameter>number</parameter> is
+   The absolute value of <parameter>num</parameter>. If the
+   argument <parameter>num</parameter> is
    of type <type>float</type>, the return type is also <type>float</type>,
    otherwise it is <type>int</type> (as <type>float</type> usually has a
    bigger value range than <type>int</type>).
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>num</parameter> no longer accepts internal objects which support
+       numeric conversion.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -69,7 +93,6 @@ echo abs(-5);   // 5 (integer)
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/math/functions/ceil.xml b/reference/math/functions/ceil.xml
index 87be944e79..927d7a88d0 100644
--- a/reference/math/functions/ceil.xml
+++ b/reference/math/functions/ceil.xml
@@ -8,12 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
    <methodsynopsis>
-    <type>float</type><methodname>ceil</methodname>
-    <methodparam><type>float</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
+   <type>float</type><methodname>ceil</methodname>
+   <methodparam><type class="union"><type>int</type><type>float</type></type><parameter>num</parameter></methodparam>
+  </methodsynopsis>
   <simpara>
    Returns the next highest integer value by rounding up 
-   <parameter>value</parameter> if necessary. 
+   <parameter>num</parameter> if necessary. 
   </simpara>
  </refsect1>
  <refsect1 role="parameters">
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>num</parameter></term>
      <listitem>
       <para>
        The value to round
@@ -34,13 +34,37 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <parameter>value</parameter> rounded up to the next highest
+   <parameter>num</parameter> rounded up to the next highest
    integer.
    The return value of <function>ceil</function> is still of type
    <type>float</type> as the value range of <type>float</type> is 
    usually bigger than that of <type>int</type>.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>num</parameter> no longer accepts internal objects which support
+       numeric conversion.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -68,7 +92,6 @@ echo ceil(-3.14);  // -3
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/math/functions/floor.xml b/reference/math/functions/floor.xml
index ec082a832b..f21eab1f3a 100644
--- a/reference/math/functions/floor.xml
+++ b/reference/math/functions/floor.xml
@@ -8,12 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
    <methodsynopsis>
-    <type>float</type><methodname>floor</methodname>
-    <methodparam><type>float</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
+   <type>float</type><methodname>floor</methodname>
+   <methodparam><type class="union"><type>int</type><type>float</type></type><parameter>num</parameter></methodparam>
+  </methodsynopsis>
   <simpara>
    Returns the next lowest integer value (as float) by rounding down
-   <parameter>value</parameter> if necessary. 
+   <parameter>num</parameter> if necessary. 
   </simpara>
  </refsect1>
  <refsect1 role="parameters">
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>num</parameter></term>
      <listitem>
       <para>
        The numeric value to round
@@ -34,13 +34,37 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <parameter>value</parameter> rounded to the next lowest integer.
+   <parameter>num</parameter> rounded to the next lowest integer.
    The return value of <function>floor</function> is still of type
    <type>float</type> because the value range of <type>float</type> is 
    usually bigger than that of <type>int</type>.
    This function returns &false; in case of an error (e.g. passing an array).
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>num</parameter> no longer accepts internal objects which support
+       numeric conversion.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -68,7 +92,6 @@ echo floor(-3.14); // -4
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/math/functions/getrandmax.xml b/reference/math/functions/getrandmax.xml
index d7058441cb..911f4fbc99 100644
--- a/reference/math/functions/getrandmax.xml
+++ b/reference/math/functions/getrandmax.xml
@@ -16,6 +16,12 @@
    <function>rand</function>.
   </simpara>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/math/functions/lcg-value.xml b/reference/math/functions/lcg-value.xml
index 775dbfa747..e12a9d4ced 100644
--- a/reference/math/functions/lcg-value.xml
+++ b/reference/math/functions/lcg-value.xml
@@ -19,6 +19,12 @@
   </para>
   &caution.cryptographically-insecure;
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/math/functions/mt-getrandmax.xml b/reference/math/functions/mt-getrandmax.xml
index c20e4031f2..3e533ba435 100644
--- a/reference/math/functions/mt-getrandmax.xml
+++ b/reference/math/functions/mt-getrandmax.xml
@@ -16,6 +16,12 @@
    <function>mt_rand</function>.
   </simpara>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/math/functions/pi.xml b/reference/math/functions/pi.xml
index 8882991b20..73605764fe 100644
--- a/reference/math/functions/pi.xml
+++ b/reference/math/functions/pi.xml
@@ -17,6 +17,12 @@
    identical results to <function>pi</function>.
   </simpara>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/math/functions/round.xml b/reference/math/functions/round.xml
index 6149fd0f0e..11221911ec 100644
--- a/reference/math/functions/round.xml
+++ b/reference/math/functions/round.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
    <methodsynopsis>
     <type>float</type><methodname>round</methodname>
-    <methodparam><type>float</type><parameter>val</parameter></methodparam>
+   <methodparam><type class="union"><type>int</type><type>float</type></type><parameter>num</parameter></methodparam>
     <methodparam choice="opt"><type>int</type><parameter>precision</parameter><initializer>0</initializer></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>PHP_ROUND_HALF_UP</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>PHP_ROUND_HALF_UP</constant></initializer></methodparam>
    </methodsynopsis>
   <para>
-   Returns the rounded value of <parameter>val</parameter> to
+   Returns the rounded value of <parameter>num</parameter> to
    specified <parameter>precision</parameter>
    (number of digits after the decimal point).
    <parameter>precision</parameter> can also be negative or zero (default).
@@ -41,7 +41,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>val</parameter></term>
+     <term><parameter>num</parameter></term>
      <listitem>
       <para>
        The value to round.
@@ -55,14 +55,14 @@
        The optional number of decimal digits to round to.
       </para>
       <para>
-       If the <parameter>precision</parameter> is positive, <parameter>val</parameter> is
+       If the <parameter>precision</parameter> is positive, <parameter>num</parameter> is
        rounded to <parameter>precision</parameter> significant digits after the decimal point.
       </para>
       <para>
-       If the <parameter>precision</parameter> is negative, <parameter>val</parameter> is
+       If the <parameter>precision</parameter> is negative, <parameter>num</parameter> is
        rounded to <parameter>precision</parameter> significant digits before the decimal point,
        i.e. to the nearest multiple of <literal>pow(10, -precision)</literal>, e.g. for a
-       <parameter>precision</parameter> of -1 <parameter>val</parameter> is rounded to tens,
+       <parameter>precision</parameter> of -1 <parameter>num</parameter> is rounded to tens,
        for a <parameter>precision</parameter> of -2 to hundreds, etc.
       </para>
      </listitem>
@@ -84,29 +84,29 @@
           <row>
            <entry><constant>PHP_ROUND_HALF_UP</constant></entry>
            <entry>
-            Rounds <parameter>val</parameter> away from zero when it is half way there,
+            Rounds <parameter>num</parameter> away from zero when it is half way there,
             making 1.5 into 2 and -1.5 into -2.
            </entry>
           </row>
           <row>
            <entry><constant>PHP_ROUND_HALF_DOWN</constant></entry>
            <entry>
-            Rounds <parameter>val</parameter> towards zero when it is half way there,
+            Rounds <parameter>num</parameter> towards zero when it is half way there,
             making 1.5 into 1 and -1.5 into -1.
            </entry>
           </row>
           <row>
            <entry><constant>PHP_ROUND_HALF_EVEN</constant></entry>
            <entry>
-            Rounds <parameter>val</parameter> towards the nearest even value when it is half way
+            Rounds <parameter>num</parameter> towards the nearest even value when it is half way
             there, making both 1.5 and 2.5 into 2.
            </entry>
           </row>
           <row>
            <entry><constant>PHP_ROUND_HALF_ODD</constant></entry>
            <entry>
-            Rounds <parameter>val</parameter> towards the nearest odd value when it is half way
-            there, making 1.5 into 1 and and 2.5 into 3.
+            Rounds <parameter>num</parameter> towards the nearest odd value when it is half way
+            there, making 1.5 into 1 and 2.5 into 3.
            </entry>
           </row>
          </tbody>
@@ -124,6 +124,30 @@
    The value rounded to the given <parameter>precision</parameter> as a &float;.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>num</parameter> no longer accepts internal objects which support
+       numeric conversion.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -295,7 +319,6 @@ float(-1.5)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mbstring/functions/mb-chr.xml b/reference/mbstring/functions/mb-chr.xml
index 385518c105..dfb6126940 100644
--- a/reference/mbstring/functions/mb-chr.xml
+++ b/reference/mbstring/functions/mb-chr.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.mb-chr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mb_chr</refname>
-  <refpurpose>Get a specific character</refpurpose>
+  <refpurpose>Return character by Unicode code point value</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,12 @@
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   Returns a string containing the character specified by the Unicode code point value,
+   encoded in the specified encoding.
+  </para>
+  <para>
+   This function complements <function>mb_ord</function>.
   </para>
-
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,16 +29,14 @@
     <term><parameter>codepoint</parameter></term>
     <listitem>
      <para>
-      
+      A Unicode codepoint value, e.g. <literal>128024</literal> for <emphasis>U+1F418 ELEPHANT</emphasis>
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>encoding</parameter></term>
     <listitem>
-     <para>
-      
-     </para>
+     &mbstring.encoding.parameter;
     </listitem>
    </varlistentry>
   </variablelist>
@@ -46,7 +45,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a specific character&return.falseforfailure;.
+   A string containing the requested character, if it can be represented in the specified
+   encoding &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -67,11 +67,44 @@
   </informaltable>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <example>
+   <title>&intl.codepoint.example;</title>
+   <programlisting role="php">
+    <![CDATA[
+<?php
+$values = [65, 63, 0x20AC, 128024];
+foreach ($values as $value) {
+    var_dump(mb_chr($value, 'UTF-8'));
+    var_dump(mb_chr($value, 'ISO-8859-1'));
+}
+?>
+]]>
+   </programlisting>
+   &example.outputs;
+   <screen>
+    <![CDATA[
+string(1) "A"
+string(1) "A"
+string(1) "?"
+string(1) "?"
+string(3) "€"
+bool(false)
+string(4) "🐘"
+bool(false)
+]]>
+   </screen>
+  </example>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>mb_internal_encoding</function></member>
     <member><function>mb_ord</function></member>
+    <member><function>IntlChar::ord</function></member>
     <member><function>chr</function></member>
    </simplelist>
   </para>
diff --git a/reference/mbstring/functions/mb-convert-case.xml b/reference/mbstring/functions/mb-convert-case.xml
index 87e62d7fb4..ecd368b30f 100644
--- a/reference/mbstring/functions/mb-convert-case.xml
+++ b/reference/mbstring/functions/mb-convert-case.xml
@@ -66,22 +66,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="unicode">
-  &reftitle.unicode;
-  <para>
-   By contrast to the standard case folding functions such as
-   <function>strtolower</function> and <function>strtoupper</function>,
-   case folding is performed on the basis of the Unicode character
-   properties. Thus the behaviour of this function is not affected
-   by locale settings and it can convert any characters that have
-   'alphabetic' property, such as A-umlaut (Ä). 
-  </para>
-  <para>
-   For more information about the Unicode properties, please see <link
-   xlink:href="&url.unicode.reports;">&url.unicode.reports;</link>.
-  </para>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -149,6 +133,22 @@ echo $str; // Prints Τάχιστη Αλώπηξ Βαφήσ Ψημένη Γη, 
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <para>
+   By contrast to the standard case folding functions such as
+   <function>strtolower</function> and <function>strtoupper</function>,
+   case folding is performed on the basis of the Unicode character
+   properties. Thus the behaviour of this function is not affected
+   by locale settings and it can convert any characters that have
+   'alphabetic' property, such a-umlaut (ä).
+  </para>
+  <para>
+   For more information about the Unicode properties, please see <link
+   xlink:href="&url.unicode.reports;">&url.unicode.reports;</link>.
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mbstring/functions/mb-convert-encoding.xml b/reference/mbstring/functions/mb-convert-encoding.xml
index 441e3e4f40..897585c53e 100644
--- a/reference/mbstring/functions/mb-convert-encoding.xml
+++ b/reference/mbstring/functions/mb-convert-encoding.xml
@@ -70,6 +70,16 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   As of PHP 8.0.0, a <classname>ValueError</classname> is thrown if the
+   value of <parameter>to_encoding</parameter> or 
+   <parameter>from_encoding</parameter> is an invalid encoding.
+   Prior to PHP 8.0.0, a <constant>E_WARNING</constant> was emitted instead.
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -81,6 +91,22 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <function>mb_convert_encoding</function> will now throw a
+       <classname>ValueError</classname> when 
+       <parameter>to_encoding</parameter> is passed an invalid encoding.
+      </entry>
+     </row>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <function>mb_convert_encoding</function> will now throw a
+       <classname>ValueError</classname> when 
+       <parameter>from_encoding</parameter> is passed an invalid encoding.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/mbstring/functions/mb-detect-encoding.xml b/reference/mbstring/functions/mb-detect-encoding.xml
index 65d83db195..24fee9940b 100644
--- a/reference/mbstring/functions/mb-detect-encoding.xml
+++ b/reference/mbstring/functions/mb-detect-encoding.xml
@@ -5,7 +5,7 @@
   <refname>mb_detect_encoding</refname>
   <refpurpose>Detect character encoding</refpurpose>
  </refnamediv>
-   
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -15,7 +15,19 @@
    <methodparam choice="opt"><type>bool</type><parameter>strict</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Detects character encoding in <type>string</type> <parameter>string</parameter>. 
+   Detects the most likely character encoding for <type>string</type> <parameter>string</parameter>
+   from an ordered list of candidates.
+  </para>
+  <para>
+   Automatic detection of the intended character encoding can never be entirely reliable;
+   without some additional information, it is similar to decoding an encrypted string
+   without the key. It is always preferable to use an indication of character encoding
+   stored or transmitted with the data, such as a "Content-Type" HTTP header.
+  </para>
+  <para>
+   This function is most useful with multibyte encodings, where not all sequences of
+   bytes form a valid string. If the input string contains such a sequence, that
+   encoding will be rejected, and the next encoding checked.
   </para>
  </refsect1>
 
@@ -27,7 +39,7 @@
      <term><parameter>string</parameter></term>
      <listitem>
       <para>
-       The <type>string</type> being detected.
+       The <type>string</type> being inspected.
       </para>
      </listitem>
     </varlistentry>
@@ -35,13 +47,14 @@
      <term><parameter>encodings</parameter></term>
      <listitem>
       <para>
-       <parameter>encodings</parameter> is list of character
-       encoding. Encoding order may be specified by array or comma
-       separated list string.
+       A list of character encodings to try, in order. The list may be specified as
+       an array of strings, or a single string separated by commas.
       </para>
       <para>
        If <parameter>encodings</parameter> is omitted or &null;,
-       detect_order is used.
+       the current detect_order (set with the <link linkend="ini.mbstring.detect-order">
+       mbstring.detect_order</link> configuration option, or <function>mb_detect_order</function>
+       function) will be used.
       </para>
      </listitem>
     </varlistentry>
@@ -49,21 +62,28 @@
      <term><parameter>strict</parameter></term>
      <listitem>
       <para>
-       <parameter>strict</parameter> specifies whether to use
-       the strict encoding detection or not.
-       Default is &false;.
+       Controls the behaviour when <parameter>string</parameter>
+       is not valid in any of the listed <parameter>encodings</parameter>.
+       If <parameter>strict</parameter> is set to &false;, the closest matching
+       encoding will be returned; if <parameter>strict</parameter> is set to &true;,
+       &false; will be returned.
+      </para>
+      <para>
+       The default value for <parameter>strict</parameter> can be set
+       with the <link linkend="ini.mbstring.strict-detection">
+       mbstring.strict_detection</link> configuration option.
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
   </para>
  </refsect1>
- 
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The detected character encoding or &false; if the encoding cannot be
-   detected from the given string.
+   The detected character encoding, or &false; if the string is not valid
+   in any of the listed encodings.
   </para>
  </refsect1>
 
@@ -75,25 +95,102 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-/* Detect character encoding with current detect_order */
+// Detect character encoding with current detect_order
 echo mb_detect_encoding($str);
 
-/* "auto" is expanded according to mbstring.language */
+// "auto" is expanded according to mbstring.language
 echo mb_detect_encoding($str, "auto");
 
-/* Specify "encodings" parameter by list separated by comma */
+// Specify "encodings" parameter by list separated by comma
 echo mb_detect_encoding($str, "JIS, eucjp-win, sjis-win");
 
-/* Use array to specify "encodings" parameter  */
-$ary[] = "ASCII";
-$ary[] = "JIS";
-$ary[] = "EUC-JP";
-echo mb_detect_encoding($str, $ary);
+// Use array to specify "encodings" parameter
+$encodings = [
+  "ASCII",
+  "JIS",
+  "EUC-JP"
+];
+echo mb_detect_encoding($str, $encodings);
 ?>
 ]]>
     </programlisting>
    </example>
   </para>
+  <para>
+   <example>
+    <title>Effect of <parameter>strict</parameter> parameter</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+// 'áéóú' encoded in ISO-8859-1
+$str = "\xE1\xE9\xF3\xFA";
+
+// The string is not valid ASCII or UTF-8, but UTF-8 is considered a closer match
+var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8'], false));
+var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8'], true));
+
+// If a valid encoding is found, the strict parameter does not change the result
+var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8', 'ISO-8859-1'], false));
+var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8', 'ISO-8859-1'], true));
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+string(5) "UTF-8"
+bool(false)
+string(10) "ISO-8859-1"
+string(10) "ISO-8859-1"
+]]>
+    </screen>
+   </example>
+  </para>
+  <para>
+   In some cases, the same sequence of bytes may form a valid string in multiple
+   character encodings, and it is impossible to know which interpretation was
+   intended. For instance, among many others, the byte sequence "\xC4\xA2" could be:
+  </para>
+  <para>
+   <simplelist>
+    <member>
+     "Ä¢" (U+00C4 LATIN CAPITAL LETTER A WITH DIAERESIS followed by U+00A2 CENT SIGN)
+     encoded in any of ISO-8859-1, ISO-8859-15, or Windows-1252
+    </member>
+    <member>
+     "ФЂ" (U+0424 CYRILLIC CAPITAL LETTER EF followed by U+0402 CYRILLIC CAPITAL LETTER
+     DJE) encoded in ISO-8859-5
+    </member>
+    <member>
+     "Ģ" (U+0122 LATIN CAPITAL LETTER G WITH CEDILLA) encoded in UTF-8
+    </member>
+   </simplelist>
+  </para>
+  <para>
+   <example>
+    <title>Effect of order when multiple encodings match</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+$str = "\xC4\xA2";
+
+// The string is valid in all three encodings, so the first one listed will be returned
+var_dump(mb_detect_encoding($str, ['UTF-8', 'ISO-8859-1', 'ISO-8859-5']));
+var_dump(mb_detect_encoding($str, ['ISO-8859-1', 'ISO-8859-5', 'UTF-8']));
+var_dump(mb_detect_encoding($str, ['ISO-8859-5', 'UTF-8', 'ISO-8859-1']));
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+string(5) "UTF-8"
+string(10) "ISO-8859-1"
+string(10) "ISO-8859-5"
+]]>
+    </screen>
+   </example>
+  </para>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/mbstring/functions/mb-ereg-replace-callback.xml b/reference/mbstring/functions/mb-ereg-replace-callback.xml
index f2c69cb8e9..6ec9974818 100644
--- a/reference/mbstring/functions/mb-ereg-replace-callback.xml
+++ b/reference/mbstring/functions/mb-ereg-replace-callback.xml
@@ -94,12 +94,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  
-  &note.mbstring.encoding.internal;
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -170,8 +164,7 @@ Last christmas was 12/24/2002
   </para>
   <para>
    <example>
-    <title><function>mb_ereg_replace_callback</function> using anonymous function
-      supported in PHP 5.3.0 or later</title>
+    <title><function>mb_ereg_replace_callback</function> using anonymous function</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -193,6 +186,12 @@ echo mb_ereg_replace_callback(
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+
+  &note.mbstring.encoding.internal;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mbstring/functions/mb-ord.xml b/reference/mbstring/functions/mb-ord.xml
index a316284a30..e1bedc21f6 100644
--- a/reference/mbstring/functions/mb-ord.xml
+++ b/reference/mbstring/functions/mb-ord.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.mb-ord" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mb_ord</refname>
-  <refpurpose>Get code point of character</refpurpose>
+  <refpurpose>Get Unicode code point of character</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,11 @@
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   Returns the Unicode code point value of the given character.
+  </para>
+  <para>
+   This function complements <function>mb_chr</function>.
   </para>
-
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,16 +28,14 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      A string
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>encoding</parameter></term>
     <listitem>
-     <para>
-      
-     </para>
+     &mbstring.encoding.parameter;
     </listitem>
    </varlistentry>
   </variablelist>
@@ -46,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a code point of character&return.falseforfailure;.
+   The Unicode code point for the first character of <literal>string</literal> &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -66,12 +64,39 @@
    </tgroup>
   </informaltable>
  </refsect1>
+ 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+var_dump(mb_ord("A", "UTF-8"));
+var_dump(mb_ord("🐘", "UTF-8"));
+var_dump(mb_ord("\x80", "ISO-8859-1"));
+var_dump(mb_ord("\x80", "Windows-1252"));
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+int(65)
+int(128024)
+int(128)
+int(8364)
+    </screen>
+   </example>
+  </para>
+ </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>mb_internal_encoding</function></member>
     <member><function>mb_chr</function></member>
+    <member><function>IntlChar::ord</function></member>
     <member><function>ord</function></member>
    </simplelist>
   </para>
diff --git a/reference/mbstring/functions/mb-regex-encoding.xml b/reference/mbstring/functions/mb-regex-encoding.xml
index 7455f5f01c..dd5c19e453 100644
--- a/reference/mbstring/functions/mb-regex-encoding.xml
+++ b/reference/mbstring/functions/mb-regex-encoding.xml
@@ -55,12 +55,6 @@
      </thead>
      <tbody>
       &mbstring.changelog.encoding-nullable;
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Default encoding is changed to UTF-8. It was EUC-JP Previously.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/mbstring/functions/mb-strrpos.xml b/reference/mbstring/functions/mb-strrpos.xml
index 1b17525325..5799809952 100644
--- a/reference/mbstring/functions/mb-strrpos.xml
+++ b/reference/mbstring/functions/mb-strrpos.xml
@@ -76,19 +76,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The <parameter>encoding</parameter> parameter was moved from
-    the third position to the fourth in PHP 5.2.0.  For backward
-    compatibility, <parameter>encoding</parameter> can be specified
-    as the third parameter, but doing so is deprecated and will be
-    removed in the future.
-   </simpara>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -100,6 +87,13 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       Passing the <parameter>encoding</parameter> as the third argument 
+       instead of an offset has been removed.
+      </entry>
+     </row>
      &mbstring.changelog.encoding-nullable;
     </tbody>
    </tgroup>
diff --git a/reference/mbstring/functions/mb-strtolower.xml b/reference/mbstring/functions/mb-strtolower.xml
index 69e01fd60e..e0043ac95d 100644
--- a/reference/mbstring/functions/mb-strtolower.xml
+++ b/reference/mbstring/functions/mb-strtolower.xml
@@ -48,20 +48,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="unicode">
-  &reftitle.unicode;
-  <para>
-   For more information about the Unicode properties, please see <link
-   xlink:href="&url.unicode.reports;">&url.unicode.reports;</link>.
-  </para>
-  <para>
-   By contrast to <function>strtolower</function>, 'alphabetic' is
-   determined by the Unicode character properties. Thus the behaviour
-   of this function is not affected by locale settings and it can convert
-   any characters that have 'alphabetic' property, such as A-umlaut (Ä). 
-  </para>
-</refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -95,6 +81,20 @@ echo $str; // Prints τάχιστη αλώπηξ βαφής ψημένη γη, 
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <para>
+   By contrast to <function>strtolower</function>, 'alphabetic' is
+   determined by the Unicode character properties. Thus the behaviour
+   of this function is not affected by locale settings and it can convert
+   any characters that have 'alphabetic' property, such as a-umlaut (ä).
+  </para>
+  <para>
+   For more information about the Unicode properties, please see <link
+   xlink:href="&url.unicode.reports;">&url.unicode.reports;</link>.
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mbstring/functions/mb-strtoupper.xml b/reference/mbstring/functions/mb-strtoupper.xml
index 38d2fe832b..9f96998dab 100644
--- a/reference/mbstring/functions/mb-strtoupper.xml
+++ b/reference/mbstring/functions/mb-strtoupper.xml
@@ -48,20 +48,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="unicode">
-  &reftitle.unicode;
-  <para>
-   For more information about the Unicode properties, please see <link
-   xlink:href="&url.unicode.reports;">&url.unicode.reports;</link>.
-  </para>
-  <para>
-   By contrast to <function>strtoupper</function>, 'alphabetic' is
-   determined by the Unicode character properties. Thus the behaviour of this
-   function is not affected by locale settings and it can convert any
-   characters that have 'alphabetic' property, such as a-umlaut (ä). 
-  </para>
-</refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -95,6 +81,20 @@ echo $str; // Prints ΤΆΧΙΣΤΗ ΑΛΏΠΗΞ ΒΑΦΉΣ ΨΗΜΈΝΗ ΓΗ, 
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <para>
+   By contrast to <function>strtoupper</function>, 'alphabetic' is
+   determined by the Unicode character properties. Thus the behaviour of this
+   function is not affected by locale settings and it can convert any
+   characters that have 'alphabetic' property, such as a-umlaut (ä).
+  </para>
+  <para>
+   For more information about the Unicode properties, please see <link
+   xlink:href="&url.unicode.reports;">&url.unicode.reports;</link>.
+  </para>
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mbstring/ini.xml b/reference/mbstring/ini.xml
index 56e683222f..af8ce940d5 100644
--- a/reference/mbstring/ini.xml
+++ b/reference/mbstring/ini.xml
@@ -20,9 +20,7 @@
       <entry><link linkend="ini.mbstring.language">mbstring.language</link></entry>
       <entry>"neutral"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>
-       PHP_INI_PERDIR in PHP &lt;= 5.2.6.
-      </entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mbstring.detect-order">mbstring.detect_order</link></entry>
@@ -34,25 +32,19 @@
       <entry><link linkend="ini.mbstring.http-input">mbstring.http_input</link></entry>
       <entry>"pass"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Deprecated in PHP 5.6.0.</entry>
+      <entry>Deprecated</entry>
      </row>
      <row>
       <entry><link linkend="ini.mbstring.http-output">mbstring.http_output</link></entry>
       <entry>"pass"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Deprecated in PHP 5.6.0.</entry>
+      <entry>Deprecated</entry>
      </row>
      <row>
       <entry><link linkend="ini.mbstring.internal-encoding">mbstring.internal_encoding</link></entry>
       <entry>NULL</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Deprecated in PHP 5.6.0.</entry>
-     </row>
-     <row>
-      <entry>mbstring.script_encoding</entry>
-      <entry>NULL</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Removed in PHP 5.4.0. Use <link linkend="ini.zend.script-encoding">zend.script_encoding</link> instead.</entry>
+      <entry>Deprecated</entry>
      </row>
      <row>
       <entry><link linkend="ini.mbstring.substitute-character">mbstring.substitute_character</link></entry>
@@ -65,7 +57,6 @@
       <entry>"0"</entry>
       <entry>PHP_INI_SYSTEM</entry>
       <entry>
-       PHP_INI_PERDIR in PHP &lt;= 5.2.6.
        Deprecated as of PHP 7.2.0; removed as of PHP 8.0.0.
       </entry>
      </row>
@@ -79,13 +70,13 @@
       <entry><link linkend="ini.mbstring.http-output-conv-mimetypes">mbstring.http_output_conv_mimetypes</link></entry>
       <entry>"^(text/|application/xhtml\+xml)"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available as of PHP 5.3.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.mbstring.strict-detection">mbstring.strict_detection</link></entry>
       <entry>"0"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available as of PHP 5.1.2.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
@@ -130,12 +121,14 @@
      <type>string</type>
     </term>
     <listitem>
-     &warn.deprecated.feature-5-6-0;
+     <warning>
+      <para>&removed.php.future;</para>
+     </warning>
      <para>
       Defines the default internal character encoding.
      </para>
      <para>
-      PHP 5.6 and later users should leave this empty and set
+      Users should leave this empty and set
       <link linkend="ini.default-charset"><parameter>default_charset</parameter></link>
       instead.
      </para>
@@ -147,12 +140,14 @@
      <type>string</type>
     </term>
     <listitem>
-     &warn.deprecated.feature-5-6-0;
+     <warning>
+      <para>&removed.php.future;</para>
+     </warning>
      <para>
       Defines the default HTTP input character encoding.
      </para>
      <para>
-      PHP 5.6 and later users should leave this empty and set
+      Users should leave this empty and set
       <link linkend="ini.default-charset"><parameter>default_charset</parameter></link>
       instead.
      </para>
@@ -164,12 +159,14 @@
      <type>string</type>
     </term>
     <listitem>
-     &warn.deprecated.feature-5-6-0;
+     <warning>
+      <para>&removed.php.future;</para>
+     </warning>
      <para>
       Defines the default HTTP output character encoding (output will be converted from the internal encoding to the HTTP output encoding upon output).
      </para>
      <para>
-      PHP 5.6 and later users should leave this empty and set
+      Users should leave this empty and set
       <link linkend="ini.default-charset"><parameter>default_charset</parameter></link>
       instead.
      </para>
@@ -233,7 +230,8 @@
     </term>
     <listitem>
      <para>
-      Enables the strict encoding detection.
+      Enables strict encoding detection. See <function>mb_detect_encoding</function>
+      for a description and examples.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/mbstring/ja-basic.xml b/reference/mbstring/ja-basic.xml
index 725e2ecb9e..d334c289a5 100644
--- a/reference/mbstring/ja-basic.xml
+++ b/reference/mbstring/ja-basic.xml
@@ -52,8 +52,7 @@
    </listitem>
    <listitem>
     <simpara>
-      As of PHP 5.4.0, the pictogram characters 
-      used for mobile phone service such as 
+      Emoji used for mobile phone service such as 
       <link xlink:href="&url.imode;">i-mode</link>
       or <link xlink:href="&url.ezweb;">EZweb</link>
       are supported.
diff --git a/reference/mbstring/overloading.xml b/reference/mbstring/overloading.xml
index ffce94fe9b..5d20dda36c 100644
--- a/reference/mbstring/overloading.xml
+++ b/reference/mbstring/overloading.xml
@@ -111,31 +111,6 @@
       <entry><function>substr_count</function></entry>
       <entry><function>mb_substr_count</function></entry>
      </row>
-     <row>
-      <entry>4</entry>
-      <entry><function>ereg</function></entry>
-      <entry><function>mb_ereg</function></entry>
-     </row>
-     <row>
-      <entry>4</entry>
-      <entry><function>eregi</function></entry>
-      <entry><function>mb_eregi</function></entry>
-     </row>
-     <row>
-      <entry>4</entry>
-      <entry><function>ereg_replace</function></entry>
-      <entry><function>mb_ereg_replace</function></entry>
-     </row>
-     <row>
-      <entry>4</entry>
-      <entry><function>eregi_replace</function></entry>
-      <entry><function>mb_eregi_replace</function></entry>
-     </row>
-     <row>
-      <entry>4</entry>
-      <entry><function>split</function></entry>
-      <entry><function>mb_split</function></entry>
-     </row>
     </tbody>
    </tgroup>
   </table>
diff --git a/reference/mbstring/supported-encodings.xml b/reference/mbstring/supported-encodings.xml
index b744b37fd5..7d1db28bc2 100644
--- a/reference/mbstring/supported-encodings.xml
+++ b/reference/mbstring/supported-encodings.xml
@@ -38,15 +38,15 @@
   <listitem><simpara>ISO-2022-JP-MS</simpara></listitem>
   <listitem><simpara>CP932</simpara></listitem>
   <listitem><simpara>CP51932</simpara></listitem>
-  <listitem><simpara>SJIS-mac** (alias: MacJapanese)</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#DOCOMO** (alias: SJIS-DOCOMO)</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#KDDI** (alias: SJIS-KDDI)</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#SOFTBANK** (alias: SJIS-SOFTBANK)</simpara></listitem>
-  <listitem><simpara>UTF-8-Mobile#DOCOMO** (alias: UTF-8-DOCOMO)</simpara></listitem>
-  <listitem><simpara>UTF-8-Mobile#KDDI-A**</simpara></listitem>
-  <listitem><simpara>UTF-8-Mobile#KDDI-B** (alias: UTF-8-KDDI)</simpara></listitem>
-  <listitem><simpara>UTF-8-Mobile#SOFTBANK** (alias: UTF-8-SOFTBANK)</simpara></listitem>
-  <listitem><simpara>ISO-2022-JP-MOBILE#KDDI** (alias: ISO-2022-JP-KDDI)</simpara></listitem>
+  <listitem><simpara>SJIS-mac (alias: MacJapanese)</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#DOCOMO (alias: SJIS-DOCOMO)</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#KDDI (alias: SJIS-KDDI)</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#SOFTBANK (alias: SJIS-SOFTBANK)</simpara></listitem>
+  <listitem><simpara>UTF-8-Mobile#DOCOMO (alias: UTF-8-DOCOMO)</simpara></listitem>
+  <listitem><simpara>UTF-8-Mobile#KDDI-A</simpara></listitem>
+  <listitem><simpara>UTF-8-Mobile#KDDI-B (alias: UTF-8-KDDI)</simpara></listitem>
+  <listitem><simpara>UTF-8-Mobile#SOFTBANK (alias: UTF-8-SOFTBANK)</simpara></listitem>
+  <listitem><simpara>ISO-2022-JP-MOBILE#KDDI (alias: ISO-2022-JP-KDDI)</simpara></listitem>
   <listitem><simpara>JIS</simpara></listitem>
   <listitem><simpara>JIS-ms</simpara></listitem>
   <listitem><simpara>CP50220</simpara></listitem>
@@ -77,7 +77,7 @@
   <listitem><simpara>8bit</simpara></listitem>
   <listitem><simpara>EUC-CN*</simpara></listitem>
   <listitem><simpara>CP936</simpara></listitem>
-  <listitem><simpara>GB18030**</simpara></listitem>
+  <listitem><simpara>GB18030</simpara></listitem>
   <listitem><simpara>HZ</simpara></listitem>
   <listitem><simpara>EUC-TW*</simpara></listitem>
   <listitem><simpara>CP950</simpara></listitem>
@@ -95,9 +95,6 @@
  <para>
   * denotes encodings usable also in regular expressions.
  </para>
- <para>
-  ** denotes encodings available since PHP 5.4.0.
- </para>
  <para>
   Any &php.ini; entry which accepts an encoding name
   can also use the values &quot;<literal>auto</literal>&quot; and
diff --git a/reference/mcrypt/book.xml b/reference/mcrypt/book.xml
index 1ef604a05b..e8912dc4ab 100644
--- a/reference/mcrypt/book.xml
+++ b/reference/mcrypt/book.xml
@@ -2,7 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.mcrypt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>Mcrypt</title>
  
  <!-- {{{ preface -->
@@ -41,7 +41,6 @@
  &reference.mcrypt.setup;
  &reference.mcrypt.constants;
  &reference.mcrypt.ciphers;
- &reference.mcrypt.examples;
  &reference.mcrypt.reference;
 
 </book>
diff --git a/reference/mcrypt/examples.xml b/reference/mcrypt/examples.xml
deleted file mode 100644
index 279a6d100f..0000000000
--- a/reference/mcrypt/examples.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mcrypt.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  Mcrypt can be used to encrypt and decrypt using the above
-  mentioned ciphers. If you linked against <literal>libmcrypt-2.2.x</literal>, the
-  four important mcrypt commands (<function>mcrypt_cfb</function>,
-  <function>mcrypt_cbc</function>, <function>mcrypt_ecb</function>,
-  and <function>mcrypt_ofb</function>) can operate in both modes
-  which are named <constant>MCRYPT_ENCRYPT</constant> and
-  <constant>MCRYPT_DECRYPT</constant>, respectively.
- </para>
- <para>
-  If you linked against libmcrypt 2.4.x or 2.5.x, these functions are still
-  available, but it is recommended that you use the advanced functions.
-  <example>
-   <title>Encrypt an input value with <literal>AES</literal> with a 256-bit key under 2.4.x and higher in <literal>CBC</literal> mode</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $key = hash('sha256', 'this is a secret key', true);
-    $input = "Let us meet at 9 o'clock at the secret place.";
-    
-    $td = mcrypt_module_open('rijndael-128', '', 'cbc', '');
-    $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_DEV_URANDOM);
-    mcrypt_generic_init($td, $key, $iv);
-    $encrypted_data = mcrypt_generic($td, $input);
-    mcrypt_generic_deinit($td);
-    mcrypt_module_close($td);
-?>
-]]>
-   </programlisting>
-  </example>
-  This example will give you the encrypted data as a string in
-  <literal>$encrypted_data</literal>.  For a full example see
-  <function>mcrypt_module_open</function>.
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mcrypt/functions/mcrypt-cbc.xml b/reference/mcrypt/functions/mcrypt-cbc.xml
deleted file mode 100644
index 7d06d385fc..0000000000
--- a/reference/mcrypt/functions/mcrypt-cbc.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.mcrypt-cbc" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mcrypt_cbc</refname>
-  <refpurpose>Encrypts/decrypts data in CBC mode</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-5-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>mcrypt_decrypt</function></member>
-    <member><function>mcrypt_encrypt</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_cbc</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_cbc</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The first prototype is when linked against libmcrypt 2.2.x, the
-   second when linked against libmcrypt 2.4.x or higher. The
-   <parameter>mode</parameter> should be either
-   <constant>MCRYPT_ENCRYPT</constant> or
-   <constant>MCRYPT_DECRYPT</constant>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mcrypt/functions/mcrypt-cfb.xml b/reference/mcrypt/functions/mcrypt-cfb.xml
deleted file mode 100644
index 279972203d..0000000000
--- a/reference/mcrypt/functions/mcrypt-cfb.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.mcrypt-cfb" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mcrypt_cfb</refname>
-  <refpurpose>Encrypts/decrypts data in CFB mode</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-5-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>mcrypt_decrypt</function></member>
-    <member><function>mcrypt_encrypt</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_cfb</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_cfb</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The first prototype is when linked against libmcrypt 2.2.x, the
-   second when linked against libmcrypt 2.4.x or higher. The
-   <parameter>mode</parameter> should be either
-   <constant>MCRYPT_ENCRYPT</constant> or
-   <constant>MCRYPT_DECRYPT</constant>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mcrypt/functions/mcrypt-decrypt.xml b/reference/mcrypt/functions/mcrypt-decrypt.xml
index 61df32a453..d7f0a7c970 100644
--- a/reference/mcrypt/functions/mcrypt-decrypt.xml
+++ b/reference/mcrypt/functions/mcrypt-decrypt.xml
@@ -73,33 +73,6 @@
    Returns the decrypted data as a string &return.falseforfailure;.
   </para>
  </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Invalid <parameter>key</parameter> and <parameter>iv</parameter> sizes
-        are no longer accepted. <function>mcrypt_decrypt</function> will now throw
-        a warning and return &false; if the inputs are invalid. Previously keys and
-        IVs were padded with '<literal>\0</literal>' bytes to the next valid size.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/mcrypt/functions/mcrypt-ecb.xml b/reference/mcrypt/functions/mcrypt-ecb.xml
deleted file mode 100644
index 29666a748e..0000000000
--- a/reference/mcrypt/functions/mcrypt-ecb.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.mcrypt-ecb" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mcrypt_ecb</refname>
-  <refpurpose>Deprecated: Encrypts/decrypts data in ECB mode</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-5-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>mcrypt_decrypt</function></member>
-    <member><function>mcrypt_encrypt</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_ecb</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_ecb</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The first prototype is when linked against libmcrypt 2.2.x, the
-   second when linked against libmcrypt 2.4.x or higher. The
-   <parameter>mode</parameter> should be either
-   <constant>MCRYPT_ENCRYPT</constant> or
-   <constant>MCRYPT_DECRYPT</constant>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mcrypt/functions/mcrypt-encrypt.xml b/reference/mcrypt/functions/mcrypt-encrypt.xml
index a8b3a5520d..231d7aced4 100644
--- a/reference/mcrypt/functions/mcrypt-encrypt.xml
+++ b/reference/mcrypt/functions/mcrypt-encrypt.xml
@@ -80,33 +80,6 @@
    Returns the encrypted data as a string &return.falseforfailure;.
   </para>
  </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Invalid <parameter>key</parameter> and <parameter>iv</parameter> sizes
-        are no longer accepted. <function>mcrypt_encrypt</function> will now throw
-        a warning and return &false; if the inputs are invalid. Previously keys and
-        IVs were padded with '<literal>\0</literal>' bytes to the next valid size.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/mcrypt/functions/mcrypt-generic-end.xml b/reference/mcrypt/functions/mcrypt-generic-end.xml
deleted file mode 100644
index a9094cc988..0000000000
--- a/reference/mcrypt/functions/mcrypt-generic-end.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.mcrypt-generic-end" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mcrypt_generic_end</refname>
-  <refpurpose>This function terminates encryption</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>mcrypt_generic_deinit</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_generic_end</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <warning>
-    <para>
-     <function>mcrypt_generic_deinit</function> should be used instead of this
-     function, as it can cause crashes when used with
-     <function>mcrypt_module_close</function> due to multiple buffer frees.
-    </para>
-   </warning>
-  </para>
-  <para>
-   This function terminates encryption specified by the encryption
-   descriptor (<parameter>td</parameter>). Actually it clears all buffers,
-   and closes all the modules used. Returns &false; on error, or &true; on
-   success.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mcrypt/functions/mcrypt-ofb.xml b/reference/mcrypt/functions/mcrypt-ofb.xml
deleted file mode 100644
index 96c56b815a..0000000000
--- a/reference/mcrypt/functions/mcrypt-ofb.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.mcrypt-ofb" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mcrypt_ofb</refname>
-  <refpurpose>Encrypts/decrypts data in OFB mode</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-5-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>mcrypt_decrypt</function></member>
-    <member><function>mcrypt_encrypt</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_ofb</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_ofb</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The first prototype is when linked against libmcrypt 2.2.x, the
-   second when linked against libmcrypt 2.4.x or higher. The
-   <parameter>mode</parameter> should be either
-   <constant>MCRYPT_ENCRYPT</constant> or
-   <constant>MCRYPT_DECRYPT</constant>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mcrypt/functions/mdecrypt-generic.xml b/reference/mcrypt/functions/mdecrypt-generic.xml
index c86878921b..ef529b8d16 100644
--- a/reference/mcrypt/functions/mdecrypt-generic.xml
+++ b/reference/mcrypt/functions/mdecrypt-generic.xml
@@ -47,6 +47,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns decrypted string.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/mcrypt/versions.xml b/reference/mcrypt/versions.xml
index 7212934536..2fac64ee0b 100644
--- a/reference/mcrypt/versions.xml
+++ b/reference/mcrypt/versions.xml
@@ -4,11 +4,8 @@
   Do NOT translate this file
 -->
 <versions>
- <function name="mcrypt_cbc" from="PHP 4, PHP 5" deprecated="PHP 5.5.0"/>
- <function name="mcrypt_cfb" from="PHP 4, PHP 5" deprecated="PHP 5.5.0"/>
  <function name="mcrypt_create_iv" from="PHP 4, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_decrypt" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
- <function name="mcrypt_ecb" from="PHP 4, PHP 5" deprecated="PHP 5.5.0"/>
  <function name="mcrypt_enc_get_algorithms_name" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_enc_get_block_size" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_enc_get_iv_size" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
@@ -22,7 +19,6 @@
  <function name="mcrypt_encrypt" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_generic" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_generic_deinit" from="PHP 4 &gt;= 4.0.7, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
- <function name="mcrypt_generic_end" from="PHP 4 &gt;= 4.0.2, PHP 5" deprecated="PHP 5.2.0"/>
  <function name="mcrypt_generic_init" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_get_block_size" from="PHP 4, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_get_cipher_name" from="PHP 4, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
@@ -39,7 +35,6 @@
  <function name="mcrypt_module_is_block_mode" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_module_open" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
  <function name="mcrypt_module_self_test" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
- <function name="mcrypt_ofb" from="PHP 4, PHP 5" deprecated="PHP 5.5.0"/>
  <function name="mdecrypt_generic" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
 </versions>
 <!-- Keep this comment at the end of the file
diff --git a/reference/memcache/book.xml b/reference/memcache/book.xml
index 92557d4079..a06bfe64a0 100644
--- a/reference/memcache/book.xml
+++ b/reference/memcache/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.memcache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Memcache</title>
  
  <!-- {{{ preface -->
diff --git a/reference/memcache/memcache/addserver.xml b/reference/memcache/memcache/addserver.xml
index ffb721ee42..74731a8362 100644
--- a/reference/memcache/memcache/addserver.xml
+++ b/reference/memcache/memcache/addserver.xml
@@ -162,20 +162,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    When the <parameter>port</parameter> is unspecified, this method defaults to the
-    value set of the PHP ini directive
-    <link linkend="ini.memcache.default-port">memcache.default_port</link>
-    If this value was changed elsewhere in your application it might lead to
-    unexpected results: for this reason it is wise to always specify the port
-    explicitly in this method call.
-   </para>
-  </warning>
- </refsect1>
-
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -210,6 +196,20 @@ memcache_add_server($memcache_obj, 'memcache_host2', 11211);
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <warning>
+   <para>
+    When the <parameter>port</parameter> is unspecified, this method defaults to the
+    value set of the PHP ini directive
+    <link linkend="ini.memcache.default-port">memcache.default_port</link>
+    If this value was changed elsewhere in your application it might lead to
+    unexpected results: for this reason it is wise to always specify the port
+    explicitly in this method call.
+   </para>
+  </warning>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/memcache/memcache/close.xml b/reference/memcache/memcache/close.xml
index 8b2c5bdc66..dc956c224c 100644
--- a/reference/memcache/memcache/close.xml
+++ b/reference/memcache/memcache/close.xml
@@ -22,6 +22,11 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/memcache/memcache/connect.xml b/reference/memcache/memcache/connect.xml
index 23fe70f693..1efd78b4c9 100644
--- a/reference/memcache/memcache/connect.xml
+++ b/reference/memcache/memcache/connect.xml
@@ -71,20 +71,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    When the <parameter>port</parameter> is unspecified, this method defaults to the
-    value set of the PHP ini directive
-    <link linkend="ini.memcache.default-port">memcache.default_port</link>
-    If this value was changed elsewhere in your application it might lead to
-    unexpected results: for this reason it is wise to always specify the port
-    explicitly in this method call.
-   </para>
-  </warning>
- </refsect1>
-
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -117,6 +103,20 @@ $memcache->connect('memcache_host', 11211);
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <warning>
+   <para>
+    When the <parameter>port</parameter> is unspecified, this method defaults to the
+    value set of the PHP ini directive
+    <link linkend="ini.memcache.default-port">memcache.default_port</link>
+    If this value was changed elsewhere in your application it might lead to
+    unexpected results: for this reason it is wise to always specify the port
+    explicitly in this method call.
+   </para>
+  </warning>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/memcache/memcache/delete.xml b/reference/memcache/memcache/delete.xml
index 8c862892b2..14b31db31f 100644
--- a/reference/memcache/memcache/delete.xml
+++ b/reference/memcache/memcache/delete.xml
@@ -45,6 +45,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -71,13 +78,6 @@
   </informaltable>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/memcache/memcache/flush.xml b/reference/memcache/memcache/flush.xml
index a3831d8a73..ec9f684237 100644
--- a/reference/memcache/memcache/flush.xml
+++ b/reference/memcache/memcache/flush.xml
@@ -22,6 +22,11 @@
   </para>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/memcache/memcache/getversion.xml b/reference/memcache/memcache/getversion.xml
index b60b9a556b..5ee30fe312 100644
--- a/reference/memcache/memcache/getversion.xml
+++ b/reference/memcache/memcache/getversion.xml
@@ -21,6 +21,11 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/memcached/book.xml b/reference/memcached/book.xml
index 09f7457753..d9bbe22643 100644
--- a/reference/memcached/book.xml
+++ b/reference/memcached/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.memcached" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Memcached</title>
  <titleabbrev>Memcached</titleabbrev>
 
diff --git a/reference/memcached/constants.xml b/reference/memcached/constants.xml
index 778c181969..602383f79b 100644
--- a/reference/memcached/constants.xml
+++ b/reference/memcached/constants.xml
@@ -51,7 +51,7 @@
   <varlistentry xml:id="memcached.constants.serializer-json">
    <term><constant>Memcached::SERIALIZER_JSON</constant></term>
    <listitem>
-    <para>The JSON serializer. Requires PHP 5.2.10+.</para>
+    <para>The JSON serializer.</para>
    </listitem>
   </varlistentry>
 
diff --git a/reference/memcached/memcached/get.xml b/reference/memcached/memcached/get.xml
index 97e20e753f..62f153cca9 100644
--- a/reference/memcached/memcached/get.xml
+++ b/reference/memcached/memcached/get.xml
@@ -72,6 +72,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PECL memcached 3.0.0</entry>
+      <entry>
+       The <parameter role="reference">cas_token</parameter> parameter was removed.
+       Instead <parameter>flags</parameter> was added and when it is given the value of <constant>Memcached::GET_EXTENDED</constant> it will ensure the CAS token to be fetched.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -119,29 +142,6 @@ if (!($ip = $m->get('ip_block'))) {
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL memcached 3.0.0</entry>
-      <entry>
-       The <parameter role="reference">cas_token</parameter> parameter was removed.
-       Instead <parameter>flags</parameter> was added and when it is given the value of <constant>Memcached::GET_EXTENDED</constant> it will ensure the CAS token to be fetched.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/memcached/memcached/getmulti.xml b/reference/memcached/memcached/getmulti.xml
index e1d5615b39..803d4c285d 100644
--- a/reference/memcached/memcached/getmulti.xml
+++ b/reference/memcached/memcached/getmulti.xml
@@ -71,6 +71,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PECL memcached 3.0.0</entry>
+      <entry>
+       The <parameter role="reference">cas_tokens</parameter> parameter was removed.
+       The <constant>Memcached::GET_EXTENDED</constant> was added and when passed as a flag it ensures the CAS tokens to be fetched.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -243,29 +266,6 @@ zoo
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL memcached 3.0.0</entry>
-      <entry>
-       The <parameter role="reference">cas_tokens</parameter> parameter was removed.
-       The <constant>Memcached::GET_EXTENDED</constant> was added and when passed as a flag it ensures the CAS tokens to be fetched.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/memcached/memcached/setoption.xml b/reference/memcached/memcached/setoption.xml
index 514010ef76..40f4592fc7 100644
--- a/reference/memcached/memcached/setoption.xml
+++ b/reference/memcached/memcached/setoption.xml
@@ -17,19 +17,41 @@
   <para>
    This method sets the value of a Memcached <parameter>option</parameter>.
    Some options correspond to the ones defined by libmemcached, and some are
-   specific to the extension. See <link linkend="memcached.constants">Memcached Constants</link> for more
-   information.
+   specific to the extension.
   </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
   <para>
-   The options listed below require values specified via constants.
-   <itemizedlist>
-    <listitem><para>
-      <literal>Memcached::OPT_HASH</literal> requires <literal>Memcached::HASH_*</literal> values.
-    </para></listitem>
-    <listitem><para>
-      <literal>Memcached::OPT_DISTRIBUTION</literal> requires <literal>Memcached::DISTRIBUTION_*</literal> values.
-    </para></listitem>
-   </itemizedlist>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>option</parameter></term>
+     <listitem>
+      <para>
+       One of the <literal>Memcached::OPT_*</literal> constant.
+       See <link linkend="memcached.constants">Memcached Constants</link> for more information.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><parameter>value</parameter></term>
+     <listitem>
+      <para>
+       The value to be set.
+      </para>
+      <note>
+       <para>
+        The options listed below require values specified via constants.
+        <simplelist>
+         <member><literal>Memcached::OPT_HASH</literal> requires <literal>Memcached::HASH_*</literal> values.</member>
+         <member><literal>Memcached::OPT_DISTRIBUTION</literal> requires <literal>Memcached::DISTRIBUTION_*</literal> values.</member>
+        </simplelist>
+       </para>
+      </note>
+     </listitem>
+    </varlistentry>
+   </variablelist>
   </para>
  </refsect1>
 
diff --git a/reference/memtrack/book.xml b/reference/memtrack/book.xml
deleted file mode 100644
index fde85dbd67..0000000000
--- a/reference/memtrack/book.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: deprecated -->
-
-<book xml:id="book.memtrack" xmlns="http://docbook.org/ns/docbook">
- <title>Memtrack</title>
- <titleabbrev>Memtrack</titleabbrev>
-
- <preface xml:id="intro.memtrack">
-  &reftitle.intro;
-  <para>
-   The purpose of this extension is to detect the most memory hungry scripts
-   and functions.
-  </para>
-  <para>
-   memtrack tracks memory consumption in PHP scripts and produces reports 
-   (warnings) when the consumption reaches certain levels set by the user.
-   This is achieved by replacing default executor function by a special 
-   function which compares memory usage before and after running the 
-   original executor - this way we can tell how much the memory usage 
-   has changed during the execution of the current part of the code.
-  </para>
-  <para>
-   Zend Engine runs its executor for each opcode array (op_array), 
-   which usually means function, plain script and such, so memtrack doesn't
-   have any noticeable effect on performance.
-  </para>
-  <para>
-   memtrack doesn't provide any functions, there are only INI directives which
-   allow you to configure the way it should work.
-  </para>
-  &warn.experimental;
- </preface>
-
- &reference.memtrack.setup;
- &reference.memtrack.constants;
- &reference.memtrack.examples;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/memtrack/configure.xml b/reference/memtrack/configure.xml
deleted file mode 100644
index 381b63b4cf..0000000000
--- a/reference/memtrack/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="memtrack.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;memtrack">&url.pecl.package;memtrack</link>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/memtrack/constants.xml b/reference/memtrack/constants.xml
deleted file mode 100644
index 0e3fe845dd..0000000000
--- a/reference/memtrack/constants.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="memtrack.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &no.constants;
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/memtrack/examples.xml b/reference/memtrack/examples.xml
deleted file mode 100644
index 2fd7b40260..0000000000
--- a/reference/memtrack/examples.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="memtrack.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <section xml:id="memtrack.examples.basic">
-  <title>Basic usage</title>
-  <para>
-   Basic example on using memtrack extension:
-   <example>
-    <title>Creating large array in a function</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* /tmp/example1.php */
-
-function foo() {
-    $a = array();
-    for ($i = 0; $i < 10000; $i++) $a[] = "test";
-    return $a;
-}
-$arr = foo();
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Run the example with the following command:
-  </para>
-  <screen>
-<![CDATA[
-php -d memtrack.enabled=1 -d memtrack.soft_limit=1M -d memtrack.vm_limit=3M /tmp/example1.php
-]]>
-  </screen>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-Warning: [memtrack] [pid 26177] user function foo() executed in /tmp/example1.php on line 10 allocated 4194304 bytes in /tmp/example1.php on line 0
-Warning: [memtrack] [pid 26177] virtual memory usage on shutdown: 32911360 bytes in Unknown on line 0
-]]>
-  </screen>
- </section>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/memtrack/ini.xml b/reference/memtrack/ini.xml
deleted file mode 100644
index 26efe63a4f..0000000000
--- a/reference/memtrack/ini.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="memtrack.ini" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Memtrack Configuration Options</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><link linkend="ini.memtrack.enabled">memtrack.enabled</link></entry>
-      <entry>"0"</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-     </row>
-     <row>
-      <entry>memtrack.soft_limit</entry>
-      <entry>"0"</entry>
-      <entry>PHP_INI_ALL</entry>
-     </row>
-     <row>
-      <entry>memtrack.hard_limit</entry>
-      <entry>"0"</entry>
-      <entry>PHP_INI_ALL</entry>
-     </row>
-     <row>
-      <entry>memtrack.vm_limit</entry>
-      <entry>"0"</entry>
-      <entry>PHP_INI_ALL</entry>
-     </row>
-     <row>
-      <entry>memtrack.ignore_functions</entry>
-      <entry>""</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
-&ini.descriptions.title;
-
-<para>
- <variablelist>
-  
-  <varlistentry xml:id="ini.memtrack.enabled">
-   <term>
-    <parameter>memtrack.enabled</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <para>
-     Disables or enables the extension. Default value is 0, i.e. disabled.
-    </para>
-   </listitem>
-  </varlistentry>
-  
-  <varlistentry xml:id="ini.memtrack.soft-limit">
-   <term>
-    <parameter>memtrack.soft_limit</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     Soft memory limit. 
-    </para>
-    <para>
-     The extension checks memory consumption before and after executing an 
-     op_array and produces a warning is the difference between the two values
-     is equal to or greater than the soft limit, but only if the function is not
-     ignored. 
-    </para>
-    <para>
-     Setting this option to 0 also disables both soft and hard limit warnings.
-     Default value is 0, i.e. no warnings is produced.
-    </para>
-   </listitem>
-  </varlistentry>
-  
-  <varlistentry xml:id="ini.memtrack.hard-limit">
-   <term>
-    <parameter>memtrack.hard_limit</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     Hard memory limit.
-    </para>
-    <para>
-     The extension checks memory consumption before and after executing an 
-     op_array and produces a warning is the difference between the two values
-     is equal to or greater than the hard limit, <emphasis>even if the function is
-     ignored</emphasis>. 
-     Setting this option to 0 disables hard limit warnings completely.
-     Default value is 0, i.e. no hard limit warnings is produced.
-    </para>
-   </listitem>
-  </varlistentry>
-  
-  <varlistentry xml:id="ini.memtrack.vm-limit">
-   <term>
-    <parameter>memtrack.vm_limit</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     Virtual memory limit (set on a process).
-    </para>
-    <para>
-     This limit is checked only on shutdown and a warning is produced if the
-     value is greater than or equal to the limit.
-    </para>
-    <para>
-     This option is currently supported only on OSes where mallinfo() function
-     is available (i.e. Linux).
-    </para>
-   </listitem>
-  </varlistentry>
-  
-  <varlistentry xml:id="ini.memtrack.ignore-functions">
-   <term>
-    <parameter>memtrack.ignore_functions</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <para>
-     A comma or whitespace-separated list of functions which are to be ignored
-     by soft_limit. The values are case-insensitive, for class methods use
-     class::method syntax.
-    </para>
-   </listitem>
-  </varlistentry>
-  
- </variablelist>
-</para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/memtrack/setup.xml b/reference/memtrack/setup.xml
deleted file mode 100644
index 1af2b7a61d..0000000000
--- a/reference/memtrack/setup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="memtrack.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="memtrack.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
-
- &reference.memtrack.configure;
-
- &reference.memtrack.ini;
-
- <section xml:id="memtrack.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mhash/book.xml b/reference/mhash/book.xml
index b09019852b..4653416f7c 100644
--- a/reference/mhash/book.xml
+++ b/reference/mhash/book.xml
@@ -2,7 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.mhash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="bundled" ?>
  <title>Mhash</title>
 
  <!-- {{{ preface -->
diff --git a/reference/mhash/functions/mhash-count.xml b/reference/mhash/functions/mhash-count.xml
index 5e301fc109..cd9aa011df 100644
--- a/reference/mhash/functions/mhash-count.xml
+++ b/reference/mhash/functions/mhash-count.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/misc/constants.xml b/reference/misc/constants.xml
index 8d3867990a..ec8c4ff76d 100644
--- a/reference/misc/constants.xml
+++ b/reference/misc/constants.xml
@@ -44,7 +44,7 @@
    </term>
    <listitem>
     <simpara>
-     Added in PHP 5.1.
+
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/misc/functions/connection-aborted.xml b/reference/misc/functions/connection-aborted.xml
index 1f483e548c..360c5fc4ef 100644
--- a/reference/misc/functions/connection-aborted.xml
+++ b/reference/misc/functions/connection-aborted.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/misc/functions/connection-status.xml b/reference/misc/functions/connection-status.xml
index 1d6d61a0d0..c7033a14d3 100644
--- a/reference/misc/functions/connection-status.xml
+++ b/reference/misc/functions/connection-status.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/misc/functions/define.xml b/reference/misc/functions/define.xml
index f6fd30f6c4..b49417c715 100644
--- a/reference/misc/functions/define.xml
+++ b/reference/misc/functions/define.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>define</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>constant_name</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>case_insensitive</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>name</parameter></term>
+     <term><parameter>constant_name</parameter></term>
      <listitem>
       <para>
        The name of the constant.
@@ -191,7 +191,6 @@ int(5)
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/misc/functions/defined.xml b/reference/misc/functions/defined.xml
index 5909240418..acbb5b0ddf 100644
--- a/reference/misc/functions/defined.xml
+++ b/reference/misc/functions/defined.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>defined</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>constant_name</parameter></methodparam>
   </methodsynopsis>
   <para>
    Checks whether the given constant exists and is defined.
@@ -18,8 +18,7 @@
   <note>
    <para>
     If you want to see if a variable exists, use <function>isset</function>
-    as <function>defined</function> only applies to <link
-    linkend="language.constants">constants</link>. If you want to see if a
+    as <function>defined</function> only applies to <link linkend="language.constants">constants</link>. If you want to see if a
     function exists, use <function>function_exists</function>.
    </para>
   </note>
@@ -30,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>name</parameter></term>
+     <term><parameter>constant_name</parameter></term>
      <listitem>
       <para>
        The constant name.
@@ -44,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if the named constant given by <parameter>name</parameter>
+   Returns &true; if the named constant given by <parameter>constant_name</parameter>
    has been defined, &false; otherwise.
   </para>
  </refsect1>
@@ -83,7 +82,6 @@ if (defined('TEST')) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/misc/functions/halt-compiler.xml b/reference/misc/functions/halt-compiler.xml
index 0846c57dea..ad5543b324 100644
--- a/reference/misc/functions/halt-compiler.xml
+++ b/reference/misc/functions/halt-compiler.xml
@@ -25,6 +25,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/misc/functions/pack.xml b/reference/misc/functions/pack.xml
index 55c91d0c4c..32fc1149e9 100644
--- a/reference/misc/functions/pack.xml
+++ b/reference/misc/functions/pack.xml
@@ -166,7 +166,7 @@
           </row>
           <row>
            <entry>Z</entry>
-           <entry>NUL-padded string (new in PHP 5.5)</entry>
+           <entry>NUL-padded string</entry>
           </row>
           <row>
            <entry>@</entry>
@@ -226,19 +226,6 @@
         The "e", "E", "g" and "G" codes were added to enable byte order support for float and double.
        </entry>
       </row>
-      <row>
-       <entry>5.6.3</entry>
-       <entry>
-        The "q", "Q", "J" and "P" codes were added to enable working with 64-bit numbers.
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        The "Z" code was added with equivalent functionality to "a" for Perl
-        compatibility.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/misc/functions/php-strip-whitespace.xml b/reference/misc/functions/php-strip-whitespace.xml
index 7bb92ce569..7c567772d1 100644
--- a/reference/misc/functions/php-strip-whitespace.xml
+++ b/reference/misc/functions/php-strip-whitespace.xml
@@ -50,14 +50,6 @@
     ini directive.
    </para>
   </note>
-  <note>
-   <para>
-    This function works as described as of PHP 5.0.1. Before this it would
-    only return an empty string. For more information on this bug and its
-    prior behavior, see bug report
-    <link xlink:href="&url.php.bugs;29606">#29606</link>.
-   </para>
-  </note>
  </refsect1>
  
  <refsect1 role="examples">
diff --git a/reference/misc/functions/sys-getloadavg.xml b/reference/misc/functions/sys-getloadavg.xml
index 2ab577bb93..7d5b85d007 100644
--- a/reference/misc/functions/sys-getloadavg.xml
+++ b/reference/misc/functions/sys-getloadavg.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/misc/functions/unpack.xml b/reference/misc/functions/unpack.xml
index 20650f5cbf..d1619d0ade 100644
--- a/reference/misc/functions/unpack.xml
+++ b/reference/misc/functions/unpack.xml
@@ -25,6 +25,22 @@
    then each of the array keys will have a sequence number behind
    the given name.
   </para>
+  <para>
+   Changes were made to bring this function into line with Perl:
+   <simplelist>
+    <member>
+     The "a" code now retains trailing NULL bytes.
+    </member>
+    <member>
+     The "A" code now strips all trailing ASCII whitespace (spaces, tabs,
+     newlines, carriage returns, and NULL bytes).
+    </member>
+    <member>
+     The "Z" code was added for NULL-padded strings, and removes trailing
+     NULL bytes.
+    </member>
+   </simplelist>
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -91,25 +107,6 @@
         The optional <parameter>offset</parameter> has been added.
        </entry>
       </row>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        <para>
-         Changes were made to bring this function into line with Perl:
-        </para>
-        <para>
-         The "a" code now retains trailing NULL bytes.
-        </para>
-        <para>
-         The "A" code now strips all trailing ASCII whitespace (spaces, tabs,
-         newlines, carriage returns, and NULL bytes).
-        </para>
-        <para>
-         The "Z" code was added for NULL-padded strings, and removes trailing
-         NULL bytes.
-        </para>
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/misc/ini.xml b/reference/misc/ini.xml
index e830ab4638..71d42a14b9 100644
--- a/reference/misc/ini.xml
+++ b/reference/misc/ini.xml
@@ -40,12 +40,6 @@
       <entry>PHP_INI_ALL</entry>
       <entry></entry>
      </row>
-     <row>
-      <entry><link linkend="ini.syntax-highlighting">highlight.bg</link></entry>
-      <entry>"#FFFFFF"</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Removed in PHP 5.4.0.</entry>
-     </row>
      <row>
       <entry><link linkend="ini.syntax-highlighting">highlight.default</link></entry>
       <entry>"#0000BB"</entry>
diff --git a/reference/mongo/batch.xml b/reference/mongo/batch.xml
deleted file mode 100644
index 206eae48ec..0000000000
--- a/reference/mongo/batch.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.batch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <title>Batch Classes</title>
-
- &reference.mongo.mongowritebatch;
- &reference.mongo.mongoinsertbatch;
- &reference.mongo.mongoupdatebatch;
- &reference.mongo.mongodeletebatch;
-
-</part>
diff --git a/reference/mongo/book.xml b/reference/mongo/book.xml
deleted file mode 100644
index 9929063dfb..0000000000
--- a/reference/mongo/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mongo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>MongoDB driver (legacy)</title>
- <titleabbrev>Mongo</titleabbrev>
-
- &reference.mongo.setup;
- &reference.mongo.constants;
-
- &reference.mongo.manual;
- &reference.mongo.core;
- &reference.mongo.types;
- &reference.mongo.gridfs;
- &reference.mongo.batch;
- &reference.mongo.misc;
- &reference.mongo.reference;
- &reference.mongo.exceptions;
- &reference.mongo.changelog;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/changelog.xml b/reference/mongo/changelog.xml
deleted file mode 100644
index b44b1cb60b..0000000000
--- a/reference/mongo/changelog.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xmlns="http://docbook.org/ns/docbook" xml:id="changelog.mongo" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>&ChangelogListingTitle;</title>
- <para>&ChangelogListingDescription;</para>
-
- <simplesect xml:id="changelog.mongo.1.5">
-  <title>MongoDB PHP Driver 1.5.0</title>
-  <para>
-   It supports all new features for MongoDB 2.6, including: 
-  
-   <simplelist>
-    <member>Aggregate can now return a cursor</member>
-    <member>Aggregation pipelines can now be explained</member>
-    <member>Possible to set maxTimeMS for commands and queries</member>
-    <member>Transparent support for the new command-based MongoDB write API</member>
-    <member>New MongoWriteBatch classes (using the new MongoDB write API)</member>
-    <member>Support for MongoDB Enterprise features (e.g. Kerberos, LDAP, X509)</member>
-    <member>Option to tune acceptable server latency for secondary reads (secondaryAcceptableLatencyMS)</member>
-   </simplelist>
-  </para> 
-  <para>
-   With this release, some driver functionality which was previously 
-   documented as deprecated will now formally raise deprecation notices. This 
-   includes: 
-   <simplelist>
-    <member>Instantiating the Mongo class</member>
-    <member>Calling MongoCursor::slaveOkay()</member>
-    <member>"wtimeout" and "safe" options for MongoCollection write operations</member>
-    <member>Manipulating public properties on core classes (such as $collection->w)</member>
-   </simplelist>
-  </para>
-  <note>
-   <para>
-    No previously deprecated features have been removed. 
-   </para>
-  </note>
-  <para>
-   Changes in behaviour: 
-   <simplelist>
-    <member>Setting the mongo.native_long INI setting now raises an error on 32-bit 
-     platforms, and now defaults to true for 64-bit platforms.</member>
-   </simplelist>
-  </para>
- </simplesect>
-
- <simplesect xml:id="changelog.mongo.1.4">
-  <title>MongoDB PHP Driver 1.4.0</title>
-  <para>
-   The 1.4 series introduced fundemental changes in how connections are created to the MongoDB servers.
-   The driver now utilizes PHP native streams, so all normal PHP stream options apply.
-   Furthermore, an experimental Stream Context Support was added.
-  </para>
-  <para>
-   The 1.4.x series also added support for MongoDB 2.4.x.
-  </para>
-  <para>
-   The most important improvements however deal with the handling of replica sets, 
-   especially nodes that timeout and nodes that are unreachable for various 
-   reasons. Besides the improvements to replica set handling, this release 
-   addresses issues with read preferences through mongos nodes. It also 
-   adds support for SSL enabled connections as well as journal and fsync 
-   connection string options. 
-  </para>
- </simplesect>
-
- <simplesect xml:id="changelog.mongo.1.3">
-  <title>MongoDB PHP Driver 1.3.0</title>
-  <para>
-   The 1.3 series introduced several major changes to the extension such as
-   completely rewritten <link linkend="mongo.connecting">connection
-   handling</link> (and removal of the pooling mechanism), support for
-   <link linkend="mongo.readpreferences">ReadPreferences</link> and change the
-   default <link linkend="mongo.writes">WriteConcerns</link> to be
-   <emphasis>acknowledged</emphasis> by introducing a new class
-   <link linkend="class.mongoclient">MongoClient</link> which serves as a
-   replacement class for the now deprecated <classname>Mongo</classname> class.
-  </para>
-  <para>
-   The driver now also supports connecting to multiple mongos instances (the
-   Mongo Shard router) for loadbalancing.
-  </para>
-  <para>
-   Other enhancements include improved logging for easier connection handling
-   debugging with <classname>MongoLog</classname> and support for the
-   <link xlink:href="&url.mongodb.docs.aggregation;">Aggregation Framework</link>
-   via the <methodname>MongoCollection::aggregate</methodname> method.
-  </para>
- </simplesect>
-
-
- <simplesect>
-  <title>Changes to existing methods</title>
-  <para>
-  Following is a list of all improvements to existing methods since
-  their inception.
-  </para>
-  <?phpdoc generate-changelog-for="mongo.batch mongo.connecting mongo.context mongo.core mongo.exceptions mongo.gridfs mongo.manual mongo.manual.intro mongo.miscellaneous class.mongo class.mongobindata class.mongoclient class.mongocode class.mongocollection class.mongocommandcursor class.mongoconnectionexception class.mongocursor class.mongocursorinterface class.mongocursorexception class.mongocursortimeoutexception class.mongodate class.mongodb class.mongodbref class.mongodeletebatch class.mongoduplicatekeyexception class.mongoexception class.mongoexecutiontimeoutexception class.mongogridfs class.mongogridfscursor class.mongogridfsexception class.mongogridfsfile class.mongoid class.mongoinsertbatch class.mongoint32 class.mongoint64 class.mongolog class.mongomaxkey class.mongominkey class.mongopool class.mongoprotocolexception class.mongoregex class.mongoresultexception class.mongotimestamp class.mongoupdatebatch class.mongowritebatch class.mongowriteconcernexception mongo.queries mongo.readpreferences ref.mongo mongo.security mongo.setup mongo.sqltomongo mongo.testing mongo.trouble mongo.tutorial mongo.types mongo.updates mongo.writeconcerns mongo.writes" ?>
- </simplesect>
-
-
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/configure.xml b/reference/mongo/configure.xml
deleted file mode 100644
index 8dece8038c..0000000000
--- a/reference/mongo/configure.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mongo.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <warning>
-  &mongo.deprecated.note;
- </warning>
-
- <para>
-  The MongoDB PHP driver should work on nearly any system: Windows, macOS, 
-  Unix, and Linux; little- and big-endian machines; 32- and 64-bit machines; PHP
-  5.3 through 5.6 (versions prior to 1.6 also support PHP 5.2).
- </para>
- <para>
-  &pecl.moved;
- </para>
-
- <simplelist>
-  <member>
-   <xref linkend="mongo.installation.manual" />
-  </member>
-  <member>
-   <xref linkend="mongo.installation.nix" />
-  </member>
-  <member>
-   <xref linkend="mongo.installation.windows" />
-  </member>
-  <member>
-   <xref linkend="mongo.installation.osx" />
-  </member>
-  <member>
-   <xref linkend="mongo.installation.gentoo" />
-  </member>
-  <member>
-   <xref linkend="mongo.installation.fedora" />
-  </member>
-  <member>
-   <xref linkend="mongo.installation.thirdparty" />
-  </member>
- </simplelist>
-
- <section xml:id="mongo.installation.manual">
-  <title>Manual Installation</title>
-
-  <para>For driver developers and people interested in the latest bugfixes, you 
-   can compile the driver from the latest source code on 
-   <link xlink:href="&url.mongodb.github;">Github</link>.
-   Go to Github and click the "download" button.  Then run:
-
-   <programlisting role="shell">
-<![CDATA[
-$ tar zxvf mongo-php-driver-legacy-<commit_id>.tar.gz
-$ cd mongo-php-driver-legacy-<commit_id>
-$ phpize
-$ ./configure
-$ make all
-$ sudo make install
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   Make the following changes to &php.ini;:
-  </para>
-  <itemizedlist>
-   <listitem>
-    <para>
-     Make sure the <emphasis>extension_dir</emphasis> variable is pointing to 
-     the directory containing <emphasis>mongo.so</emphasis>. The build will display where 
-     it is installing the PHP driver with output that looks something like:
-     <programlisting role="txt">
-<![CDATA[
-Installing '/usr/lib/php/extensions/no-debug-non-zts-20060613/mongo.so'
-]]>
-     </programlisting>
-
-      Make sure that it is the same as the PHP extension directory by running:
-
-     <programlisting role="shell">
-<![CDATA[
-$ php -i | grep extension_dir
-  extension_dir => /usr/lib/php/extensions/no-debug-non-zts-20060613 =>
-                   /usr/lib/php/extensions/no-debug-non-zts-20060613
-]]>
-     </programlisting>
-
-     If it's not, change the <emphasis>extension_dir</emphasis> in &php.ini; or 
-     move <emphasis>mongo.so</emphasis>.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     To load the extension on PHP startup, add a line:
-
-     <programlisting role="ini">
-<![CDATA[
-extension=mongo.so
-]]>
-     </programlisting>
-
-    </para>
-   </listitem>
-  </itemizedlist>
- </section>
-
- <section xml:id="mongo.installation.nix">
-  <title>Installing on *NIX</title>
-
-  <para>
-   Run:
-   <programlisting role="shell">
-<![CDATA[
-$ sudo pecl install mongo
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   Add the following line to your &php.ini; file:
-   <programlisting role="ini">
-<![CDATA[
-extension=mongo.so
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   If pecl runs out of memory while installing, make sure memory_limit in 
-   &php.ini; is set to at least 128MB.
-  </para>
- </section>
-
- <section xml:id="mongo.installation.windows">
-  <title>Installing on Windows</title>
-
-  <para>
-   Precompiled binaries for each release are available from 
-   <link xlink:href="&url.pecl.package;mongo">PECL</link> for a variety
-   of combinations of versions, thread safety, and VC libraries. Unzip the 
-   archive and put php_mongo.dll in your PHP extension directory ("ext" by 
-   default).
-  </para>
-
-  <para>
-   Add the following line to your &php.ini; file:
-   <programlisting role="ini">
-<![CDATA[
-extension=php_mongo.dll
-]]>
-   </programlisting>
-  </para>
-
-  <note>
-   <title>Additional DLL dependencies for Windows Users</title>
-   <para>
-    &ext.windows.path.dll;
-    <filename>libsasl.dll</filename>
-   </para>
-  </note>
- </section>
-
- <section xml:id="mongo.installation.osx">
-  <title>macOS</title>
-
-  <para>
-   In most cases installing from PECL is the easiest way:
-   <programlisting role="shell">
-<![CDATA[
-$ sudo pecl install mongo
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   If your system has multiple version of PHP installed (e.g. macOS default,
-   Homebrew, <link xlink:href="&url.xampp;">XAMPP</link>), note that that each
-   version of PHP has its own <link linkend="install.pecl">pecl</link>
-   command and &php.ini; file.
-  </para>
-
-  <note>
-   <title>Xcode dependency for compiling on macOS</title>
-   <para>
-    Compiling the driver on macOS will require Xcode developer tools, which may
-    be installed with <code>xcode-select --install</code>. If that command is
-    not available, you may first need to install the
-    <link xlink:href="&url.apple.clt;">Command Line Tools</link> package.
-   </para>
-  </note>
- </section>
-
- <section xml:id="mongo.installation.gentoo">
-  <title>Gentoo</title>
-
-  <para>
-   Gentoo has a package for the PHP PECL driver called dev-php/pecl-mongo, which can be 
-   installed with:
-  </para>
-
-  <programlisting role="shell">
-<![CDATA[
-$ sudo emerge -va dev-php/pecl-mongo
-]]>
-  </programlisting>
-
-  <para>
-   If you use PECL, you may get an error that libtool is the wrong version. 
-   Compiling from source you'll need to run aclocal and autoconf.
-  </para>
-
-  <programlisting role="shell">
-<![CDATA[
-$ phpize
-$ aclocal 
-$ autoconf 
-$ ./configure
-$ make
-$ sudo make install
-]]>
-  </programlisting>
- </section>
-
- <section xml:id="mongo.installation.fedora">
-  <title>Red Hat</title>
-
-  <para>
-   This includes Fedora and CentOS.
-  </para>
-
-  <para>
-   The default Apache settings on these systems do not let requests make 
-   network connections, meaning that the driver will get "Permission denied"
-   errors when it tries to connect to the database.  If you run into this, try
-   running:
-   <programlisting role="shell">
-<![CDATA[
-$ /usr/sbin/setsebool -P httpd_can_network_connect 1 
-]]>
-   </programlisting>
-   Then restart Apache.  (This issue has also occurred with SELinux.)
-  </para>
- </section>
-
- <section xml:id="mongo.installation.thirdparty">
-  <title>Third-Party Installation Instructions</title>
-  
-  <para>
-   A number of people have created excellent tutorials on installing the PHP
-   driver.
-  </para>
-
-  <itemizedlist>
-   <listitem>
-    <para>
-     <link xlink:href="&url.mongodb.install.osx.homebrew;">
-      (Re)installing PHP on macOS
-     </link>
-    </para>
-    <para>
-     This article by Justin Hileman details the process of installing PHP and
-     additional extensions with Homebrew on macOS. This complements the earlier
-     instructions on this page for installing the driver with Homebrew.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <link xlink:href="&url.mongodb.install.ubuntu.9.10.video;">
-      PHP 5.3.1 with Xdebug, MongoDB and Lithium on Ubuntu 9.10 / Apache 2.2
-     </link>
-    </para>
-    <para>This screencast by Jon Adams demonstrates how to quickly get up and
-      running with PHP 5.3.1, Xdebug, and MongoDB on Ubuntu 9.10 with Apache.
-    </para>
-   </listitem>
-  </itemizedlist>
- </section>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/connecting.xml b/reference/mongo/connecting.xml
deleted file mode 100644
index 707240322c..0000000000
--- a/reference/mongo/connecting.xml
+++ /dev/null
@@ -1,775 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.connecting" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Connecting</title>
-
- <para>
-  Connecting to MongoDB can be as easy as <literal>new MongoClient</literal>,
-  but there are many additional options and configurations. The documentation
-  for <function>MongoClient::__construct</function> covers all of the API
-  options, but this page gives some more details and advice for practical use
-  cases.
- </para>
-
- <section xml:id="mongo.connecting.ssl">
-  <title>Connecting over SSL</title>
-  <para>
-   The driver supports connecting to <link xlink:href="&url.mongodb.docs.configure-ssl;">MongoDB over SSL</link>
-   and can optionally use <link linkend="context.ssl">SSL Stream Context</link> options to provide more details,
-   such as verifying certificates against specific certificate chain, or authenticate to
-   <link xlink:href="&url.mongodb.docs.configure-x509;">MongoDB using X509 certificates</link>.
-  </para>
-
-  <example xml:id="mongo.connecting.context.ssl">
-   <title>Connect to MongoDB Instance with SSL Encryption</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("mongodb://server1", array("ssl" => true));
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example xml:id="mongo.connecting.context.ssl.verify">
-   <title>Connect to MongoDB Instance with SSL Encryption, verifying it is who we think it is</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$SSL_DIR = "/vagrant/certs";
-$SSL_FILE = "CA_Root_Certificate.pem";
-
-$ctx = stream_context_create(array(
-    "ssl" => array(
-        /* Certificate Authority the remote server certificate must be signed by */
-        "cafile"            => $SSL_DIR . "/" . $SSL_FILE,
-
-        /* Disable self signed certificates */
-        "allow_self_signed" => false,
-
-        /* Verify the peer certificate against our provided Certificate Authority root certificate */
-        "verify_peer"       => true, /* Default to false pre PHP 5.6 */
-
-        /* Verify the peer name (e.g. hostname validation) */
-        /* Will use the hostname used to connec to the node */
-        "verify_peer_name"  => true,
-
-        /* Verify the server certificate has not expired */
-        "verify_expiry"     => true, /* Only available in the MongoDB PHP Driver */
-    ),
-);
-
-$mc = new MongoClient(
-    "mongodb://server1", 
-    array("ssl" => true), 
-    array("context" => $ctx)
-);
-?>
-]]>
-   </programlisting>
-   <note>
-    <para>
-     The <literal>"verify_peer_name"</literal> is new in PHP 5.6.0. The
-     MongoDB driver as of 1.6.5 however has backported this feature into the
-     driver itself, so it works with PHP 5.3 and 5.4 too
-    </para>
-   </note>
-  </example>
-
-
-  <example xml:id="mongo.connecting.context.ssl.certificate">
-   <title>Connect to MongoDB Instance that Requires Client Certificates</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$SSL_DIR  = "/vagrant/certs";
-$SSL_FILE = "CA_Root_Certificate.pem";
-
-$MYCERT   = "/vagrant/certs/ca-signed-client.pem";
-
-$ctx = stream_context_create(array(
-    "ssl" => array(
-        "local_cert"        => $MYCERT,
-        /* If the certificate we are providing was passphrase encoded, we need to set it here */
-        "passphrase"        => "My Passphrase for the local_cert",
-
-        /* Optionally verify the server is who he says he is */
-        "cafile"            => $SSL_DIR . "/" . $SSL_FILE,
-        "allow_self_signed" => false,
-        "verify_peer"       => true,
-        "verify_peer_name"  => true,
-        "verify_expiry"     => true,
-    ),
-));
-
-$mc = new MongoClient(
-    "mongodb://server1/?ssl=true", 
-    array(), 
-    array("context" => $ctx)
-);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example xml:id="mongo.connecting.authenticate.ssl.x509">
-   <title>Authenticating with X.509 certificates</title>
-   <para>
-    The username is the <literal>certificate subject</literal> from the X509, which can be extracted like this:
-   </para>
-   <programlisting role="shell">
-<![CDATA[
-openssl x509 -in /vagrant/certs/ca-signed-client.pem -inform PEM -subject -nameopt RFC2253
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ctx = stream_context_create( array(
-    "ssl" => array(
-        "local_cert" => "/vagrant/certs/ca-signed-client.pem",
-    )
-) );
-
-$mc = new MongoClient(
-    'mongodb://username@server1/?authSource=$external&authMechanism=MONGODB-X509&ssl=true', 
-    array(), 
-    array("context" => $ctx)
-);
-?>
-]]>
-   </programlisting>
-   <para>
-    Where <literal>username</literal> is the certificate subject.
-   </para>
-  </example>
-
-  <simplesect role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1.5.0</entry>
-       <entry>
-        Added support for X509 authentication.
-       </entry>
-      </row>
-      <row>
-       <entry>1.4.0</entry>
-       <entry>
-        Added support for connecting to SSL enabled MongoDB.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </simplesect>
-
- </section>
-
- <section xml:id="mongo.connecting.auth">
-  <title>Authentication</title>
-  <para>
-   If MongoDB is started with the <literal>--auth</literal> or
-   <literal>--keyFile</literal> options, you must authenticate before you can do
-   any operations with the driver. You may authenticate a connection by
-   specifying the username and password in either the connection URI or the
-   <literal>"username"</literal> and <literal>"password"</literal> options for
-   <function>MongoClient::__construct</function>.
-  </para>
-  <example xml:id="mongo.connecting.auth-example">
-   <title>Authenticating against the "admin" database</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Specifying the username and password in the connection URI (preferred)
-$m = new MongoClient("mongodb://${username}:${password}@localhost");
-
-// Specifying the username and password via the options array (alternative)
-$m = new MongoClient("mongodb://localhost", array("username" => $username, "password" => $password));
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   By default, the driver will authenticate against the <literal>admin</literal>
-   database. You may authenticate against a different database by specifying it
-   in either the connection URI or the <literal>"db"</literal> option for
-   <function>MongoClient::__construct</function>.
-  </para>
-  <example xml:id="mongo.connecting.auth-db-example">
-   <title>Authenticating against normal databases</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Specifying the authentication database in the connection URI (preferred)
-$m = new MongoClient("mongodb://${username}:${password}@localhost/myDatabase");
-
-// Specifying the authentication database via the options array (alternative)
-$m = new MongoClient("mongodb://${username}:${password}@localhost", array("db" => "myDatabase"));
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   If your connection is dropped, the driver will automatically attempt to
-   reconnect and reauthenticate you.
-  </para>
- </section>
-
- <section xml:id="mongo.connecting.rs">
-  <title>Replica Sets</title>
-  <para>
-   To connect to a replica set, specify one or more members of the set and use
-   the <literal>"replicaSet"</literal> option. Multiple servers may be delimited
-   by a comma.
-  </para>
-  <example xml:id="mongo.connecting.rs-example">
-   <title>ReplicaSet seed list</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Using multiple servers as the seed list (prefered)
-$m = new MongoClient("mongodb://rs1.example.com:27017,rs2.example.com:27017/?replicaSet=myReplSetName");
-
-// Using one server as the seed list
-$m = new MongoClient("mongodb://rs1.example.com:27017", array("replicaSet" => "myReplSetName"));
-
-// Using multiple servers as the seed list
-$m = new MongoClient("mongodb://rs1.example.com:27017,rs2.example.com:27017", array("replicaSet" => "myReplSetName"));
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   The PHP driver will query the database server(s) listed to determine the
-   primary. So long as it can connect to at least one host listed and find a
-   primary, the connection will succeed. If it cannot make a connection to any
-   servers listed or cannot find a primary, a
-   <classname>MongoConnectionException</classname> will be thrown.
-  </para>
-  <tip>
-   <para>
-    You should always provide a seed list with more than one member of the
-    ReplicaSet. For highest availability you should seed with at least one
-    server from each of your datacenters.
-   </para>
-  </tip>
-  <warning>
-   <para>
-    The host names that you specify in the seed list <emphasis>must</emphasis>
-    match the host names in the replica set configuration. This is because the
-    driver only uses the host names in the replica set configuration to create
-    the hash for its persistent connections.
-   </para>
-   <para>
-    For example, if an IP address is used in the seed list and the replica set
-    is configured with host names, the driver will discard any seed list
-    connection(s) that differ from the canonical host names reported by the
-    replica set. Effectively, these non-canonical seed list connections will be
-    recreated on each request, greatly reducing the benefit of using persistent
-    connections.
-   </para>
-  </warning>
-  <warning>
-   <para>
-    The driver does <emphasis>not</emphasis> support connecting to different
-    replica sets with the same name. This extends beyond one script so make
-    sure to have separate names for each of your replica sets. That also means
-    that you can <emphasis>not</emphasis> do this:
-   </para>
-   <example xml:id="mongo.connecting.rs-example-wrong-replset">
-    <title>Wrong replica set name duplication</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb://devserver1,devserver2,devserver3/?replicaSet=repset");
-$m = new MongoClient("mongodb://prodserver1,prodserver2,prodserver3/?replicaSet=repset");
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    Instead, you need to have two different names for your replica sets:
-   </para>
-   <example xml:id="mongo.connecting.rs-example-correct-replset">
-    <title>Correct use of two replica set names</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb://devserver1,devserver2,devserver3/?replicaSet=devset");
-$m = new MongoClient("mongodb://prodserver1,prodserver2,prodserver3/?replicaSet=prodset");
-?>
-]]>
-    </programlisting>
-   </example>
-  </warning>
-  <para>
-   If the primary becomes unavailable, an election will take place and a
-   secondary will be promoted to the role of primary (unless a majority vote
-   cannot be established). During this time
-   (<link xlink:href="&url.mongodb.replica.failover;">20-60 seconds</link>), the
-   connection will not be able to perform any write operations and attempts to
-   do so will result in an exception. Connections to secondaries will still be
-   able to perform reads.
-  </para>
-  <note>
-   <para>
-    The default <link linkend="mongo.readpreferences">Read Preference</link>
-    is to only read from the primary. During the election process there is no
-    primary, and all read will therefore fail.
-   </para>
-   <para>
-    It is recommended to use
-    <constant>MongoClient::RP_PRIMARY_PREFERRED</constant> Read Preference for
-    applications that require high availability for reads, as reads will only
-    be executed on the secondaries when there simply isn't a primary
-    available.
-   </para>
-  </note>
-  <para>
-   Once a primary is elected, attempting to perform a read or write will allow
-   the driver to detect the new primary. The driver will make this its primary
-   database connection and continue operating normally.
-  </para>
-  <para>
-   The health and state of a secondary is checked every 5 seconds
-   (configurable with
-   <link linkend="ini.mongo.ping-interval">mongo.ping_interval</link>)
-   or when the next operation occurs after 5 seconds.  It will also recheck
-   the configuration when the driver has a problem reaching a server.
-  </para>
-  <para>
-   Replica set failovers are checked every 60 seconds (configurable with
-   <link linkend="ini.mongo.is-master-interval">mongo.is_master_interval</link>),
-   and whenever a write operation fails when using acknowledged writes.
-  </para>
-
-  <caution>
-   <para>
-    Secondaries may be behind the primary in operations, so
-    your application must be able to handle out-of-date data when using
-    Read Preferences other then <constant>MongoClient::RP_PRIMARY</constant>.
-   </para>
-  </caution>
-
-  <para>
-   For more information on replica sets, see the
-   <link xlink:href="&url.mongodb.replica;">core documentation</link>.
-  </para>
-
-  <simplesect role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="mongo.readpreferences" /></member>
-    <member><xref linkend="mongo.writeconcerns" /></member>
-   </simplelist>
-  </simplesect>
-
-  <simplesect role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        Added support for connecting to ReplicaSet and automatic failover.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </simplesect>
-
- </section>
-
- <section xml:id="mongo.connecting.mongos">
-  <title>Sharding</title>
-  <para>
-   To connect to a shard cluster, specify the address of one or more
-   <literal>mongos</literal> instances in the connection string. Multiple
-   servers may be delimited by a comma.
-  </para>
-  <example xml:id="mongo.connecting.mongos-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Using one server as the seed list
-$m = new MongoClient("mongodb://mongos1.example.com:27017");
-
-// Using multiple servers as the seed list
-$m = new MongoClient("mongodb://mongos1.example.com:27017,mongos2.example.com:27017");
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   Regardless of whether each shard is a stand-alone <literal>mongod</literal>
-   server or a full replica set, the driver's connection process is the same.
-   All database communication will be routed through <literal>mongos</literal>.
-  </para>
-  <para>
-   For more information on sharding with MongoDB, see the
-   <link xlink:href="&url.mongodb.docs.sharding;">sharding documentation</link>.
-  </para>
- </section>
-
- <section xml:id="mongo.connecting.uds">
-  <title>Domain Socket Support</title>
-
-  <para>
-   MongoDB has built-in support for connecting via Unix Domain Sockets and will
-   open the socket on startup. By default, the socket is located in
-   <filename>/tmp/mongodb-&lt;port&gt;.sock</filename>.
-  </para>
-
-  <para>
-   To connect to the socket file, specify the path in your MongoDB connection
-   string:
-  </para>
-
-  <example xml:id="mongo.connecting.uds-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb:///tmp/mongo-27017.sock");
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   If you would like to authenticate against a database (as described above)
-   with a socket file, you must specify a port of <literal>0</literal> so that
-   the connection string parser can detect the end of the socket path.
-   Alternatively, you can use the constructor options.
-  </para>
-
-   <example xml:id="mongo.connecting.uds-auth-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb://username:password@/tmp/mongo-27017.sock:0/foo");
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <simplesect role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        Added support for Unix Domain Sockets.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </simplesect>
-
- </section>
-
- <section xml:id="mongo.connecting.persistent">
-  <title>Persistent Connections (version 1.3.0+)</title>
-
-  <para>
-   All versions of the driver since 1.3.0 utilize persistent connections to
-   minimize the number of connections made to each database server. These
-   connections are saved by the PHP worker process and may be reused between
-   multiple requests.
-  </para>
-
-  <para>
-   Before connecting to a database server, the driver will create a hash for the
-   connection based on its host, port, replica set name (if any), any
-   authentication credentials (e.g. username, password, database), and the
-   process ID. If a connection already exists for that hash, it will be used in
-   lieu of creating a new connection associated with that hash.
-   <function>MongoClient::getConnections</function> may be used to retrieve info
-   about each persistent connection. Consider the following program:
-  </para>
-
-  <example xml:id="mongo.connecting.persistent-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m1 = new MongoClient('mongodb://localhost');
-$m2 = new MongoClient('mongodb://localhost');
-$m3 = new MongoClient('mongodb://user:pw@localhost');
-$m4 = new MongoClient('mongodb://127.0.0.1');
-$m5 = new MongoClient('mongodb://rs1.local:30017,rs2.local:30018/?replicaSet=rs');
-$m6 = new MongoClient('mongodb://sharding.local:40017');
-
-foreach (MongoClient::getConnections() as $conn) {
-    echo $conn['hash'], "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-localhost:27017;-;X;15487
-localhost:27017;-;admin/user/c56c…8bbc;15487
-127.0.0.1:27017;-;X;15487
-rs1.local:30017;rs;X;15487
-rs2.local:30018;rs;X;15487
-sharding.local:40017;-;X;15487
-]]>
-   </screen>
-  </example>
-
-  <para>
-   In this example <literal>$m1</literal> and <literal>$m2</literal> have the
-   same hash and share a persistent connection. Connections for each other
-   MongoClient instance hash to unique values and use their own sockets. Note
-   that "localhost" and "127.0.0.1" do not share the same hash; DNS resolution
-   is not taken into account.
-  </para>
- </section>
-
- <section xml:id="mongo.connecting.pools">
-  <title>Connection Pooling (version 1.2.0-1.2.12 *only*)</title>
-  <note>
-   <para>
-    This section is no longer relevant as of the 1.3.0 release of the driver
-    and only serves as a historical information on how the pooling used to
-    work.
-   </para>
-   <para>
-    The latest versions of the driver have no concept of pooling anymore and
-    will maintain only one connection per process, for each connection type
-    (ReplicaSet/standalone/mongos), for each credentials combination.
-    </para>
-   </note>
-  <para>
-   Creating connections is one of the most heavyweight things that the driver
-   does. It can take hundreds of milliseconds to set up a connection correctly,
-   even on a fast network. Thus, the driver tries to minimize the number of new
-   connections created by reusing connections from a pool.
-  </para>
-  <para>
-   When a user creates a new instance of <classname>MongoClient</classname>, all
-   necessary connections will be taken from their pools (replica sets may
-   require multiple connections, one for each member of the set). When the
-   <classname>MongoClient</classname> instance goes out of scope, the
-   connections will be returned to the pool. When the PHP process exits, all
-   connections in the pools will be closed.
-  </para>
-  <section>
-   <title>"Why do I have so many open connections?"</title>
-   <para>
-    Connection pools can generate a large number of connections. This is
-    expected and, using a little arithmetic, you can figure out how many
-    connections will be created. There are three factors in determining the
-    total number of connections:
-   </para>
-   <itemizedlist>
-    <listitem>
-     <para>
-      <literal>
-       connections_per_pool
-      </literal>
-     </para>
-     <para>
-      Each connection pool will create, by default, an unlimited number of
-      connections. One might assume that this is a problem: if it can create an
-      unlimited number of connections, couldn't it create thousands and the
-      server would run out of file descriptors? In practice, this is unlikely,
-      as unused connections are returned to the pool to be used later, so future
-      connections will use the same connection instead of creating a new one.
-      Unless you create thousands of connections at once without letting any go
-      out of scope, the number of connections open should stay at a reasonable
-      number.
-     </para>
-     <para>
-      You can see how many connections you have in a pool using the
-      <function>MongoPool::info</function> function. Add up the "in use" and
-      "in pool" fields for a given server. That is the total number of
-      connections for that pool.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>
-       pools_per_process
-      </literal>
-     </para>
-     <para>
-      Each MongoDB server address you're connecting to gets its own connection
-      pool. For example, if your local hostname is "example.net", connecting
-      to "example.net:27017", "localhost:27017", and "/tmp/mongodb-27017.sock"
-      will create three connection pools. You can see how many connection pools
-      you have open using <function>MongoPool::info</function>.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>
-       processes
-      </literal>
-     </para>
-     <para>
-      Each PHP process has a separate set of pools. PHP-FPM and Apache
-      generally create between 6 and a couple of dozen PHP worker children.
-      Check your settings to see what the max number of PHP processes is that
-      can be spawned.
-     </para>
-     <para>
-      If you are using PHP-FPM, estimating the number of connections can be
-      tricky because it will spawn more PHP-FPM workers under heavy load. To be
-      on the safe side, look at the <literal>max_children</literal> parameter or
-      add up <literal>spare_servers</literal> + <literal>start_servers</literal>
-      (choose whichever number is higher). That will indicate how many PHP
-      processes (i.e. sets of pools) you should plan for.
-     </para>
-    </listitem>
-   </itemizedlist>
-   <para>
-    The three variables above can be multiplied together to give the max
-    number of connections expected:
-    <literal>connections_per_pool</literal> *
-    <literal>pools_per_process</literal> *
-    <literal>processes</literal>. Note that
-    <literal>connections_per_pool</literal> can be different for different
-    pools, so <literal>connections_per_pool</literal> should be the max.
-   </para>
-   <para>
-    For example, suppose we're getting 30 connections per pool, 10 pools per PHP
-    process, and 128 PHP processes. Then we can expect 38400 connections from
-    this machine. Thus, we should set this machine's file descriptor limit to
-    be high enough to handle all of these connections or it may run out of file
-    descriptors.
-   </para>
-   <para>
-    See <classname>MongoPool</classname> for more information on connection
-    pooling.
-   </para>
-  </section>
- </section>
-
- <section xml:id="mongo.connecting.persistent.manual">
-  <title>Manually Persistent Connections (version up to 1.1.4 *only*)</title>
-  <note>
-   <para>
-    This section is not relevant for 1.2.0+. In 1.2.0+, connections are always
-    persistent and managed automatically by the driver. If you are using a
-    1.2.x release (but not 1.3.x or later), see
-    <classname>MongoPool</classname> for more information on pooling.
-   </para>
-  </note>
-
-  <para>
-   Creating new connection to the database is very slow. To minimize the number
-   of connections that you need to make, you can use persistent connections. A
-   persistent connection is saved by PHP, so you can use the same connection for
-   multiple requests.
-  </para>
-
-  <para>
-   For example, this simple program connects to the database 1000 times:
-  </para>
-
-  <example xml:id="mongo.connecting.no-manual-persist-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-for ($i=0; $i<1000; $i++) {
-  $m = new MongoClient();
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   It takes approximately 18 seconds to execute. If we change it to use a
-   persistent connection:
-  </para>
-
-  <example xml:id="mongo.connecting.manual-persist-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-for ($i=0; $i<1000; $i++) {
-  $m = new MongoClient("localhost:27017", array("persist" => "x"));
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   ...it takes less than .02 seconds to execute, as it only makes one database
-   connection.
-  </para>
-
-  <para>
-   Persistent connections need an identifier string (which is "x" in the above
-   example) to uniquely identify them. For a persistent connection to be used,
-   the hostname, port, persist string, and authentication credentials (username,
-   password and database, if given) must match an existing persistent
-   connection. Otherwise, a new connection will be created with this identifying
-   information.
-  </para>
-  <para>
-   Persistent connections are <emphasis>highly recommended</emphasis> and should
-   always be used in production unless there is a compelling reason not to.
-   Most of the reasons that they are not recommended for relational databases
-   are irrelevant to MongoDB.
-  </para>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/constants.xml b/reference/mongo/constants.xml
deleted file mode 100644
index 2e881f878a..0000000000
--- a/reference/mongo/constants.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mongo.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mongo-streams">
-    <term>
-     <constant>MONGO_STREAMS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Alias of <constant>MONGO_SUPPORTS_STREAMS</constant>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-supports-streams">
-    <term>
-     <constant>MONGO_SUPPORTS_STREAMS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      1 when compiled against PHP Streams (default since 1.4.0).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-supports-ssl">
-    <term>
-     <constant>MONGO_SUPPORTS_SSL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      1 when <xref linkend="book.openssl" /> is enabled and available.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-supports-auth-mechanism-mongodb-cr">
-    <term>
-     <constant>MONGO_SUPPORTS_AUTH_MECHANISM_MONGODB_CR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      1 when MongoDB-Challenge/Reponse authentication is compiled in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-supports-auth-mechanism-mongodb-x509">
-    <term>
-     <constant>MONGO_SUPPORTS_AUTH_MECHANISM_MONGODB_X509</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      1 when x.509 authentication is compiled in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-supports-auth-mechanism-gssapi">
-    <term>
-     <constant>MONGO_SUPPORTS_AUTH_MECHANISM_GSSAPI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      1 when GSSAPI authentication is compiled in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-supports-auth-mechanism-plain">
-    <term>
-     <constant>MONGO_SUPPORTS_AUTH_MECHANISM_PLAIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      1 when PLAIN authentication is compiled in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-type-io-init">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_TYPE_IO_INIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-type-log">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_TYPE_LOG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-io-read">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_IO_READ</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-io-write">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_IO_WRITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-io-progress">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_IO_PROGRESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-io-completed">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_IO_COMPLETED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-insert">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_INSERT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-query">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_QUERY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-update">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_UPDATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-delete">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_DELETE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-getmore">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_GETMORE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-killcursor">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_KILLCURSOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-batchinsert">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_BATCHINSERT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-response-header">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_RESPONSE_HEADER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-write-reply">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_WRITE_REPLY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-cmd-insert">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_CMD_INSERT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-cmd-update">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_CMD_UPDATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-cmd-delete">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_CMD_DELETE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongo-stream-notify-log-write-batch">
-    <term>
-     <constant>MONGO_STREAM_NOTIFY_LOG_WRITE_BATCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context.xml b/reference/mongo/context.xml
deleted file mode 100644
index 94f7d6ee7d..0000000000
--- a/reference/mongo/context.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="mongo.context" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Stream Context Options</title>
-
- <partintro>
-  <para xml:id="mongo.context.options">
-   The PHP MongoDB extension provides <link linkend="context">Stream Context Support</link>
-   using the <link linkend="context.mongodb">mongodb</link> context.
-  </para>
-
-  <para>
-   A stream context must be created with <function>stream_context_create</function> and passed to the <methodname>MongoClient::__construct</methodname> before the actual connection to MongoDB is made.
-   It is not possible to apply a stream context to already created streams.
-  </para>
-
-  <para>
-   Additional context options and parameters, such as <link linkend="context.ssl">ssl</link>
-   and <link linkend="context.params">notification parameters</link>, are also supported.
-  </para>
-
-  <para>
-   The MongoDB context options provide a rich interface to log network traffic between the driver and the MongoDB servers.
-   This interface can be used to provide query logging, profiler, debuggers, or anything that would need to inspect the underlaying
-   commands and protocol options.
-  </para>
-
-  <simplesect role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="context.ssl" /></member>
-    <member><xref linkend="context.socket" /></member>
-    <member><xref linkend="context.params" /></member>
-   </simplelist>
-  </simplesect>
-
- </partintro>
-
- &reference.mongo.entities.context;
- 
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/context/log-cmd-delete.xml b/reference/mongo/context/log-cmd-delete.xml
deleted file mode 100644
index b41abbfdcb..0000000000
--- a/reference/mongo/context/log-cmd-delete.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-cmd-delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_cmd_delete</refname>
-  <refpurpose>Callback When Deleting Documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_cmd_delete</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>writeOptions</parameter></methodparam>
-   <methodparam><type>array</type><parameter>deleteOptions</parameter></methodparam>
-   <methodparam><type>array</type><parameter>protocolOptions</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-cmd-delete">log_cmd_delete context option</link>,
-   when deleteing a document
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   &mongo.context.writeoptions;
-   <varlistentry>
-    <term>
-     <parameter>deleteOptions</parameter>
-    </term>
-    <listitem>
-     <para>
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>limit</entry>
-          <entry>integer, 1 or 0. If 0, delete all matching documents.</entry>
-         </row>
-         <row>
-          <entry>q</entry>
-          <entry>Array, the search criteria</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-   &mongo.context.protocoloptions;
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.5.0</entry>
-      <entry>
-       Only available when connected to MongoDB 2.6.0+
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context/log-cmd-insert.xml b/reference/mongo/context/log-cmd-insert.xml
deleted file mode 100644
index 710289f3ff..0000000000
--- a/reference/mongo/context/log-cmd-insert.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-cmd-insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_cmd_insert</refname>
-  <refpurpose>Callback When Inserting Documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_cmd_insert</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>document</parameter></methodparam>
-   <methodparam><type>array</type><parameter>writeOptions</parameter></methodparam>
-   <methodparam><type>array</type><parameter>protocolOptions</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-cmd-insert">log_cmd_insert context option</link>,
-   when inserting a document
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   <varlistentry>
-    <term>
-     <parameter>document</parameter>
-    </term>
-    <listitem>
-     <para>
-      The document that has been prepared to be inserted
-     </para>
-    </listitem>
-   </varlistentry>
-   &mongo.context.writeoptions;
-   &mongo.context.protocoloptions;
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.5.0</entry>
-      <entry>
-       Only available when connected to MongoDB 2.6.0+
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context/log-cmd-update.xml b/reference/mongo/context/log-cmd-update.xml
deleted file mode 100644
index 8949429ed7..0000000000
--- a/reference/mongo/context/log-cmd-update.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-cmd-update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_cmd_update</refname>
-  <refpurpose>Callback When Updating Documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_cmd_update</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>writeOptions</parameter></methodparam>
-   <methodparam><type>array</type><parameter>updateOptions</parameter></methodparam>
-   <methodparam><type>array</type><parameter>protocolOptions</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-cmd-update">log_cmd_update context option</link>,
-   when updateing a document
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   &mongo.context.writeoptions;
-   <varlistentry>
-    <term>
-     <parameter>updateOptions</parameter>
-    </term>
-    <listitem>
-     <para>
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>multi</entry>
-          <entry>Boolean, true if this update is allowed to update all matched criteria</entry>
-         </row>
-         <row>
-          <entry>upsert</entry>
-          <entry>Boolean, true if the document should be created if criteria does not match</entry>
-         </row>
-         <row>
-          <entry>q</entry>
-          <entry>Array, the search criteria</entry>
-         </row>
-         <row>
-          <entry>u</entry>
-          <entry>Array, the new object/modifications</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-   &mongo.context.protocoloptions;
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.5.0</entry>
-      <entry>
-       Only available when connected to MongoDB 2.6.0+
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context/log-getmore.xml b/reference/mongo/context/log-getmore.xml
deleted file mode 100644
index 537e0327ad..0000000000
--- a/reference/mongo/context/log-getmore.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-getmore" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_getmore</refname>
-  <refpurpose>Callback When Retrieving Next Cursor Batch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_getmore</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-getmore">log_getmore context option</link>,
-   when executing a GET_MORE operation.
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   <varlistentry>
-    <term>
-     <parameter>info</parameter>
-    </term>
-    <listitem>
-     <para>
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>request_id</entry>
-          <entry>integer, the driver request identifier</entry>
-         </row>
-         <row>
-          <entry>cursor_id</entry>
-          <entry>integer, the cursor identifier being used to fetch more data</entry>
-         </row>
-         <row>
-          <entry>batch_size</entry>
-          <entry>integer, maximum number of documents being requested</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context/log-killcursor.xml b/reference/mongo/context/log-killcursor.xml
deleted file mode 100644
index 1d0e649b99..0000000000
--- a/reference/mongo/context/log-killcursor.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-killcursor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_killcursor</refname>
-  <refpurpose>Callback When Executing KILLCURSOR operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_killcursor</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-killcursor">log_killcursor context option</link>,
-   when reading a killcursor from MongoDB.
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   <varlistentry>
-    <term>
-     <parameter>info</parameter>
-    </term>
-    <listitem>
-     <para>
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>cursor_id</entry>
-          <entry>integer, the cursor identifier to kill</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context/log-reply.xml b/reference/mongo/context/log-reply.xml
deleted file mode 100644
index cd775e5e36..0000000000
--- a/reference/mongo/context/log-reply.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-reply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_reply</refname>
-  <refpurpose>Callback When Reading the MongoDB reply</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_reply</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>messageHeaders</parameter></methodparam>
-   <methodparam><type>array</type><parameter>operationHeaders</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-reply">log_reply context option</link>,
-   when reading a reply from MongoDB.
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   <varlistentry>
-    <term>
-     <parameter>messageHeaders</parameter>
-    </term>
-    <listitem>
-     <para>
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>length</entry>
-          <entry>integer, bytes, message reply length</entry>
-         </row>
-         <row>
-          <entry>request_id</entry>
-          <entry>integer, the server request identifier</entry>
-         </row>
-         <row>
-          <entry>response_id</entry>
-          <entry>integer, the driver request identifier this message is a response of</entry>
-         </row>
-         <row>
-          <entry>opcode</entry>
-          <entry>integer, the opcode id</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>operationHeaders</parameter>
-    </term>
-    <listitem>
-     <para>
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>flags</entry>
-          <entry>integer, bitmask of protocol flags</entry>
-         </row>
-         <row>
-          <entry>cursor_id</entry>
-          <entry>integer, ID of the cursor created on the server (0 if none created, or its been exhausted)</entry>
-         </row>
-         <row>
-          <entry>start</entry>
-          <entry>The starting offset of this cursor</entry>
-         </row>
-         <row>
-          <entry>returned</entry>
-          <entry>integer, how many documents are returned in this trip</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link xlink:href="&url.mongodb.dochub.wireprotocol;">OP_REPLY definition in the Wire Protocol</link></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/context/log-write-batch.xml b/reference/mongo/context/log-write-batch.xml
deleted file mode 100644
index d227e7ec21..0000000000
--- a/reference/mongo/context/log-write-batch.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.log-write-batch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>log_write_batch</refname>
-  <refpurpose>Callback When Writing Batches</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <methodname>log_write_batch</methodname>
-   <methodparam><type>array</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>writeOptions</parameter></methodparam>
-   <methodparam><type>array</type><parameter>batch</parameter></methodparam>
-   <methodparam><type>array</type><parameter>protocolOptions</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A <type>callable</type> function, used by the
-   <link linkend="context.mongodb.log-write-batch">log_write_batch context option</link>,
-   when executing a batch operation.
-  </para>
-  <note>
-   <para>
-    This is <emphasis>not</emphasis> a real function, only a prototype of how the function should
-    be.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   &mongo.context.server;
-   &mongo.context.writeoptions;
-   <varlistentry>
-    <term>
-     <parameter>batch</parameter>
-    </term>
-    <listitem>
-     <para>
-      Array, the actual batch operation.
-     </para>
-    </listitem>
-   </varlistentry>
-   &mongo.context.protocoloptions;
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.5.0</entry>
-      <entry>
-       Only available when connected to MongoDB 2.6.0+
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/core.xml b/reference/mongo/core.xml
deleted file mode 100644
index 75b2b584e7..0000000000
--- a/reference/mongo/core.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.core" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <title>Core Classes</title>
- <partintro>
-  <warning>
-   &mongo.deprecated.note;
-  </warning>
-  <para>
-   The core classes are the most important part of the driver.
-  </para>
- </partintro>
-
- &reference.mongo.mongoclient;
- &reference.mongo.mongodb;
- &reference.mongo.mongocollection;
- &reference.mongo.mongocursor;
- &reference.mongo.mongocursorinterface;
- &reference.mongo.mongocommandcursor;
-
-</part>
diff --git a/reference/mongo/exceptions.xml b/reference/mongo/exceptions.xml
deleted file mode 100644
index a33b604ed6..0000000000
--- a/reference/mongo/exceptions.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.exceptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <title>Exceptions</title>
-
- <partintro>
-  <section>
-   <title>VMWare Oddities</title>
-   <para>
-    If you are running VMWare on Windows and are using CIFS, pausing the VM will 
-    cause CIFS to go out of sync and cause weird errors on un-pausing it ("The 
-    Mongo object has not been correctly initialized by its constructor").  
-    Permanently mounting the Windows shares will fix this and you'll be able to
-    pause and unpause at will.
-   </para>
-   <para>
-    To permanently mount the Windows shares, run:
-   </para>
-   <programlisting role="shell">
-    <![CDATA[
-$ sudo update-rc.d -f umountnfs.sh remove
-$ sudo update-rc.d umountnfs.sh stop 15 0 6 .
-]]>
-   </programlisting>
-   <para>
-    See <link xlink:href="&url.mongodb.cifs;">the Ubuntu docs</link> for the most
-    up-to-date instructions.
-   </para>
-  </section>
- </partintro>
-
- &reference.mongo.mongoexception;
- &reference.mongo.mongoresultexception;
- &reference.mongo.mongocursorexception;
- &reference.mongo.mongocursortimeoutexception;
- &reference.mongo.mongoconnectionexception;
- &reference.mongo.mongogridfsexception;
- &reference.mongo.mongoduplicatekeyexception;
- &reference.mongo.mongoprotocolexception;
- &reference.mongo.mongoexecutiontimeoutexception;
- &reference.mongo.mongowriteconcernexception;
-
-</part>
diff --git a/reference/mongo/functions/bson-decode.xml b/reference/mongo/functions/bson-decode.xml
deleted file mode 100644
index 1d0d32af4c..0000000000
--- a/reference/mongo/functions/bson-decode.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.bson-decode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>bson_decode</refname>
-  <refpurpose>Deserializes a BSON object into a PHP array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>bson_decode</methodname>
-   <methodparam><type>string</type><parameter>bson</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is very beta and entirely useless for 99% of users.  It is only
-   useful if you're doing something weird, such as writing your own driver on 
-   top of the PHP driver.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>bson</parameter></term>
-     <listitem>
-      <para>
-       The BSON to be deserialized.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the deserialized BSON object.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/functions/bson-encode.xml b/reference/mongo/functions/bson-encode.xml
deleted file mode 100644
index 75bac9f80f..0000000000
--- a/reference/mongo/functions/bson-encode.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.bson-encode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>bson_encode</refname>
-  <refpurpose>Serializes a PHP variable into a BSON string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>bson_encode</methodname>
-   <methodparam><type>mixed</type><parameter>anything</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is very beta and entirely useless for 99% of users.  It is only
-   useful if you're doing something weird, such as writing your own driver on 
-   top of the PHP driver.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>anything</parameter></term>
-     <listitem>
-      <para>
-       The variable to be serialized.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the serialized string.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/gridfs.xml b/reference/mongo/gridfs.xml
deleted file mode 100644
index 9397d5114b..0000000000
--- a/reference/mongo/gridfs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.gridfs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <title>GridFS Classes</title>
-
- &reference.mongo.mongogridfs;
- &reference.mongo.mongogridfsfile;
- &reference.mongo.mongogridfscursor;
-
-</part>
diff --git a/reference/mongo/ini.xml b/reference/mongo/ini.xml
deleted file mode 100644
index dd88a8ac78..0000000000
--- a/reference/mongo/ini.xml
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="mongo.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Mongo &ConfigureOptions;</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mongo.configuration.list">
-     <row>
-      <entry><link linkend="ini.mongo.allow-empty-keys">mongo.allow_empty_keys</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.allow-persistent">mongo.allow_persistent</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Removed in 1.2.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.chunk-size">mongo.chunk_size</link></entry>
-      <entry>262144</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.cmd">mongo.cmd</link></entry>
-      <entry>"$"</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.default-host">mongo.default_host</link></entry>
-      <entry>"localhost"</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.default-port">mongo.default_port</link></entry>
-      <entry>27017</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.is-master-interval">mongo.is_master_interval</link></entry>
-      <entry>15</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Added in 1.2.10, before 1.3.0 the default value was 60.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.long-as-object">mongo.long_as_object</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.native-long">mongo.native_long</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Before 1.5.0, the default value was 0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.ping-interval">mongo.ping_interval</link></entry>
-      <entry>5</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Added in 1.2.10</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mongo.utf8">mongo.utf8</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.mongo.allow-empty-keys">
-    <term>
-     <parameter>mongo.allow_empty_keys</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Added in version 1.0.11.
-     </para>
-     <para>
-      If empty strings ("") should be allowed as key names.  By default, the 
-      driver will throw an exception if you attempt to pass the empty string as
-      a key to the database.  It is extremely easy to do this inavertently by 
-      using double quotes with $-operators, so it is recommended that you leave
-      this setting as default.  However, if you need to save keys that are empty
-      strings, you can set this option to true and the driver will allow you to
-      pass empty strings to the database.
-     </para>
-    </listitem>
-   </varlistentry>  
-
-   <varlistentry xml:id="ini.mongo.allow-persistent">
-    <term>
-     <parameter>mongo.allow_persistent</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      If persistent connections are allowed. (Removed in 1.2.0 - all
-      connections are now persistent).
-     </para>
-    </listitem>
-   </varlistentry>  
-
-   <varlistentry xml:id="ini.mongo.chunk-size">
-    <term>
-     <parameter>mongo.chunk_size</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      The number of bytes-per-chunk.  Used in divvying up GridFS files. This 
-      number must be at least 100 less than 4 megabytes (max: 4194204) and it is
-      recommended that it be less than that.
-     </para>
-    </listitem>
-   </varlistentry>  
-
-   <varlistentry xml:id="ini.mongo.cmd">
-    <term>
-     <parameter>mongo.cmd</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      A character to be used in place of $ in modifiers and comparisons.
-     </para>
-     <para>
-      As it is easy to forget to escape the "$", you can also choose your own
-      special character to use instead of '$'.  Choose a character that will not
-      occur in your key names, e.g. ":":
-     </para>
-     <programlisting role="ini">
-<![CDATA[
-mongo.cmd = ":"
-]]>
-     </programlisting>
-     <para>
-      Then, to do a comparison, for example:
-     </para>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$query = array( "i" => array( ":gt" => 20, ":lte" => 30 ) );
-
-?>
-]]>
-     </programlisting>
-     <para>
-      You can also change it in your code using 
-      <literal>ini_set("mongo.cmd", ":")</literal>.  Of course, you can also 
-      just use single quotes or backslash-escape the $.
-     </para>
-    </listitem>
-   </varlistentry>  
-
-   <varlistentry xml:id="ini.mongo.default-host">
-    <term>
-     <parameter>mongo.default_host</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Default hostname when nothing is passed to the constructor.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mongo.default-port">
-    <term>
-     <parameter>mongo.default_port</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      The default TCP port number to use when connecting to the database server 
-      if no other port is specified. The database's default is 
-      <literal>27017</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  
-   <varlistentry xml:id="ini.mongo.is-master-interval">
-    <term>
-     <parameter>mongo.is_master_interval</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Added in version 1.2.10.
-     </para>
-     <para>
-      For replicaset connections: The minimum interval with which the driver
-      will send "isMaster" requests to the MongoDB server. If the value is lower,
-      there will be more requests, but the driver finds faster whether the
-      topology of the replicaset has been changed.
-     </para>
-    </listitem>
-   </varlistentry>  
-
-   <varlistentry xml:id="ini.mongo.long-as-object">
-    <term>
-     <parameter>mongo.long_as_object</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Return a BSON_LONG as an instance of <classname>MongoInt64</classname>
-      (instead of a primitive type).
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mongo.native-long">
-    <term>
-     <parameter>mongo.native_long</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      <emphasis>
-       The default behavior for this has been changed to &true; in 1.5.0, so make
-       sure to set this variable to the value you want (probably &true;) so that 
-       the driver's behavior doesn't suddenly change when you upgrade.
-      </emphasis>
-     </para>
-     <para>
-      On 64-bit platforms, the <literal>mongo.native_long</literal> setting 
-      allows for 64-bit integers to be stored in MongoDB. If it is not set, only
-      32-bits of the integer will be saved.  The MongoDB data type that is used 
-      in this case is the BSON LONG, instead of the BSON INT that is used if 
-      this setting is turned off. 
-     </para>
-     <para>
-      The setting also changes the way how BSON LONGs behave when they are read 
-      back from MongoDB. Without <literal>mongo.native_long</literal> enabled, 
-      the driver would convert every BSON LONG to a PHP double which can result 
-      in a loss of precision. 
-     </para>
-     <para>
-      On 32-bit platforms, the <literal>mongo.native_long</literal> setting 
-      changes nothing for storing integers in MongoDB: the integer is stored 
-      as a BSON INT as before. However, when the setting is enabled and a 
-      BSON LONG is read from MongoDB a 
-      <classname>MongoCursorException</classname> is thrown alerting you that 
-      the data could not be read back without losing precision.
-     </para>
-     <para>
-      On 32-bit systems especially, it is recommended that you combine this with
-      enabling <literal>mongo.long_as_object</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mongo.ping-interval">
-    <term>
-     <parameter>mongo.ping_interval</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Added in version 1.2.10.
-     </para>
-     <para>
-      For replicaset connections: The minimum interval with which the driver
-      will send "ping" requests to the MongoDB server. If the value is lower,
-      there will be more pings, but the driver finds faster whether a node is
-      no longer reachable from the replicaset.
-     </para>
-    </listitem>
-   </varlistentry>  
-
-   <varlistentry xml:id="ini.mongo.utf8">
-    <term>
-     <parameter>mongo.utf8</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      If an exception should be thrown for non-UTF8 strings.  Until version 
-      1.0.4, the PHP driver would ignore non-UTF8 strings, even though you're
-      not supposed to insert them.  As of 1.0.4, the driver throws a 
-      <classname>MongoException</classname>.  To ease the transition for 
-      applications that insert non-UTF8 strings, you can turn this option off to
-      emulate the old, non-exception-throwning behavior.  This option will be
-      eliminated and exceptions always thrown for non-UTF8 strings starting with
-      version 1.1.0.
-     </para>
-    </listitem>
-   </varlistentry>  
-
-  </variablelist>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/manual.xml b/reference/mongo/manual.xml
deleted file mode 100644
index ef95459f01..0000000000
--- a/reference/mongo/manual.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.manual" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Manual</title>
- <partintro xml:id="mongo.manual.intro">
-  <warning>
-   &mongo.deprecated.note;
-  </warning>
-  <para>
-   This manual goes into some detail about how to use MongoDB, but it mostly
-   covers using the PHP driver.  For information about how to design a
-   schema, what terms means, and setting up the database server, check out the
-   <link xlink:href="&url.mongodb;">MongoDB documentation</link>.
-  </para>
- </partintro>
-
- &reference.mongo.tutorial;
- &reference.mongo.readpreferences;
- &reference.mongo.writeconcerns;
- &reference.mongo.sqltomongo;
- &reference.mongo.connecting;
- &reference.mongo.context;
- &reference.mongo.writes;
- &reference.mongo.queries;
- &reference.mongo.updates;
- &reference.mongo.security;
- &reference.mongo.trouble;
- &reference.mongo.testing;
-
-</part>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/misc.xml b/reference/mongo/misc.xml
deleted file mode 100644
index af2976e99d..0000000000
--- a/reference/mongo/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.miscellaneous" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <title>Miscellaneous</title>
-
- &reference.mongo.mongolog;
- &reference.mongo.mongopool;
- &reference.mongo.mongo;
-
-</part>
diff --git a/reference/mongo/mongo.xml b/reference/mongo/mongo.xml
deleted file mode 100644
index 897309a3a5..0000000000
--- a/reference/mongo/mongo.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongo" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Mongo class [deprecated]</title>
- <titleabbrev>Mongo</titleabbrev>
-
- <partintro>
-  <!-- {{{ Mongo intro -->
-  <section xml:id="mongo.intro">
-   &reftitle.intro;
-   <para>
-    A connection between PHP and MongoDB.
-   </para>
-   <para>
-    This class extends <classname>MongoClient</classname> and provides access to
-    several deprecated methods.
-   </para>
-   <para>
-    For backwards compatibility, it also defaults the <literal>"w"</literal>
-    option of its constructor argument to <literal>0</literal>, which does not
-    require write operations to be acknowledged by the server. See
-    <function>MongoClient::__construct</function> for more information.
-   </para>
-
-    <warning xmlns="http://docbook.org/ns/docbook">
-     <simpara>
-      This class has been <emphasis>DEPRECATED</emphasis> as of version
-      1.3.0. Relying on this feature is highly discouraged. Please use
-      <classname>MongoClient</classname> instead.
-     </simpara>
-    </warning>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongo.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Mongo</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Mongo</classname>
-     </ooclass>
-
-    <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoClient</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
-<!-- }}} -->
- </partintro>
-
- &reference.mongo.entities.mongo;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongo/connectutil.xml b/reference/mongo/mongo/connectutil.xml
deleted file mode 100644
index 58e0dbb2dc..0000000000
--- a/reference/mongo/mongo/connectutil.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.connectutil" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::connectUtil</refname>
-  <refpurpose>Connects with a database server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <type>bool</type><methodname>Mongo::connectUtil</methodname>
-   <void/>
-  </methodsynopsis>
-  <warning>
-   <para>
-    This is an internal function that you should <emphasis>never</emphasis>
-    call yourself.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If the connection was successful.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it fails to connect
-   to the databases.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongo/construct.xml b/reference/mongo/mongo/construct.xml
deleted file mode 100644
index fa0941044c..0000000000
--- a/reference/mongo/mongo/construct.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongo.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::__construct</refname>
-  <refpurpose>The __construct purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Mongo::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>server</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-  This method overwrites the <classname>MongoClient</classname> constructor
-  and turns off acknowledged writes.
-  </para>
-  <para>
-   Please see <methodname>MongoClient::__construct</methodname> for
-   description of the parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.returnvalues;
-  <warning>
-   <para>
-    Instanciating this class will emit <constant>E_DEPRECATED</constant>
-    warning, and turn off acknowledged writes.
-   </para>
-  </warning>
-  <para>
-   Please use the <classname>MongoClient</classname> instead.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongo/getpoolsize.xml b/reference/mongo/mongo/getpoolsize.xml
deleted file mode 100644
index 929086c4e3..0000000000
--- a/reference/mongo/mongo/getpoolsize.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.getpoolsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::getPoolSize</refname>
-  <refpurpose>Get pool size for connection pools</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Mongo::getPoolSize</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <warning xmlns="http://docbook.org/ns/docbook">
-   <simpara>This feature has been <emphasis>DEPRECATED</emphasis> as of version
-    1.2.3. Relying on this feature is highly discouraged.  Please use
-    <function>MongoPool::getSize</function> instead.
-   </simpara>
-  </warning>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current pool size.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Changing pool size</title>
-   <para>
-    This returns the default pool size, sets a new pool size, then prints the
-    new pool size and the pool debugging information.  Note that changing the
-    pool size only affects new connection pools, it does not change old ones.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$connection = new Mongo("host1");
-
-// pool size is -1
-echo "pool size is: ".Mongo::getPoolSize()."\n";
-
-echo "setting pool size to 200\n";
-
-Mongo::setPoolSize(200);
-
-// pool size is 200
-echo "pool size is: ".Mongo::getPoolSize()."\n";
-
-$conn2 = new Mongo("host2");
-
-// remaining for host1 is -2
-// remaining for host2 is 199
-var_dump(Mongo::poolDebug());
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Mongo::setPoolSize</function></member>
-    <member><function>Mongo::poolDebug</function></member>
-    <member>The <link linkend="mongo.connecting">connection</link> documentation.</member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongo/getslave.xml b/reference/mongo/mongo/getslave.xml
deleted file mode 100644
index b16d0d3259..0000000000
--- a/reference/mongo/mongo/getslave.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.getslave" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::getSlave</refname>
-  <refpurpose>Returns the address being used by this for slaveOkay reads</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Mongo::getSlave</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   This finds the address of the secondary currently being used for reads. It is
-   a read-only method: it does not change anything about the internal state of
-   the object.
-  </para>
-
-  <para>
-   When you create a connection to the database, the driver will not immediately
-   decide on a secondary to use. Thus, after you connect, this function will
-   return &null; even if there are secondaries available. When you first do a
-   query with slaveOkay set, at that point the driver will choose a secondary
-   for this connection. At that point, this function will return the chosen
-   secondary.
-  </para>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The address of the secondary this connection is using for reads.
-  </para>
-  <para>
-   This returns &null; if this is not connected to a replica set or not yet
-   initialized.
-  </para>
- </refsect1>
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  &mongo.errors.deprecated;
-  <para>
-   The returned results aren't really useful as the secondary selection
-   process is done on each query and database command execution.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCursor::info</function></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongo/getslaveokay.xml b/reference/mongo/mongo/getslaveokay.xml
deleted file mode 100644
index 33c7f3d18f..0000000000
--- a/reference/mongo/mongo/getslaveokay.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.getslaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::getSlaveOkay</refname>
-  <refpurpose>Get slaveOkay setting for this connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Mongo::getSlaveOkay</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of slaveOkay for this instance.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.errors.deprecated;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoClient::getReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongo/pooldebug.xml b/reference/mongo/mongo/pooldebug.xml
deleted file mode 100644
index 360907cb84..0000000000
--- a/reference/mongo/mongo/pooldebug.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.pooldebug" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::poolDebug</refname>
-  <refpurpose>Returns information about all connection pools</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Mongo::poolDebug</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <warning xmlns="http://docbook.org/ns/docbook">
-   <simpara>This feature has been <emphasis>DEPRECATED</emphasis> as of version
-    1.2.3. Relying on this feature is highly discouraged.  Please use
-    <function>MongoPool::info</function> instead.
-   </simpara>
-  </warning>
-
-  <para>
-   Returns an array of information about all connection pools.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Each connection pool has an identifier, which starts with the host. For each
-   pool, this function shows the following fields:
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>in use</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of connections currently being used by
-       <classname>MongoClient</classname> instances.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>in pool</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of connections currently in the pool (not being used).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>remaining</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of connections that could be created by this pool. For
-       example, suppose a pool had 5 connections remaining and 3 connections in
-       the pool.  We could create 8 new instances of
-       <classname>MongoClient</classname> before we exhausted this pool
-       (assuming no instances of <classname>MongoClient</classname> went out of
-       scope, returning their connections to the pool).
-      </para>
-      <para>
-       A negative number means that this pool will spawn unlimited connections.
-      </para>
-      <para>
-       Before a pool is created, you can change the max number of connections by
-       calling <function>Mongo::setPoolSize</function>. Once a pool is showing
-       up in the output of this function, its size cannot be changed.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>timeout</parameter>
-     </term>
-     <listitem>
-      <para>
-       The socket timeout for connections in this pool. This is how long
-       connections in this pool will attempt to connect to a server before
-       giving up.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongo/setpoolsize.xml b/reference/mongo/mongo/setpoolsize.xml
deleted file mode 100644
index 5cafb52e60..0000000000
--- a/reference/mongo/mongo/setpoolsize.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.setpoolsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::setPoolSize</refname>
-  <refpurpose>Set the size for future connection pools</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Mongo::setPoolSize</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-
-  <warning xmlns="http://docbook.org/ns/docbook">
-   <simpara>This method has been <emphasis>DEPRECATED</emphasis> as of version
-    1.2.3. Relying on this feature is highly discouraged.  Please use
-    <function>MongoPool::setSize</function> instead.
-   </simpara>
-  </warning>
-
-  <para>
-   Sets the max number of connections new pools will be able to create.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>size</parameter>
-     </term>
-     <listitem>
-      <para>
-       The max number of connections future pools will be able to create.
-       Negative numbers mean that the pool will spawn an infinite number of
-       connections.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the former value of pool size.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <para>
-   <example xml:id="mongo.setpoolsize.example.basic"><!-- {{{ -->
-    <title><function>Mongo::setPoolSize</function> example</title>
-    <para>
-     If you set the pool size to <literal>n</literal> and then create
-     <literal>n</literal> connections, attempting to create an
-     <literal>n+1</literal>st connection will throw a
-     <classname>MongoConnectionException</classname>.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// only allow one connection to a server
-Mongo::setPoolSize(1);
-
-// creates one connection to localhost:27017
-$m1 = new Mongo();
-
-// attempt to create a second connection to localhost:27017
-// only one connection is allowed, so this will throw an exception
-$m2 = new Mongo();
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Fatal error: Uncaught exception 'MongoConnectionException' with message 'no more connections in pool' in /path/to/php/script.php:10
-Stack trace:
-#0 /path/to/php/script.php(10): Mongo->__construct()
-#1 {main}
-  thrown in /path/to/php/script.php on line 10
-]]>
-    </screen>
-   </example><!-- }}} -->
-  </para>
- </refsect1><!-- }}} -->
-
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Mongo::getPoolSize</function></member>
-    <member><function>Mongo::poolDebug</function></member>
-    <member>The <link linkend="mongo.connecting">connection</link> documentation.</member>
-   </simplelist>
-  </para>
- </refsect1><!-- }}} -->
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongo/setslaveokay.xml b/reference/mongo/mongo/setslaveokay.xml
deleted file mode 100644
index 3e87d7797f..0000000000
--- a/reference/mongo/mongo/setslaveokay.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.setslaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::setSlaveOkay</refname>
-  <refpurpose>Change slaveOkay setting for this connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Mongo::setSlaveOkay</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>ok</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ok</parameter>
-     </term>
-     <listitem>
-      <para>
-       If reads should be sent to secondary members of a replica set for all
-       possible queries using this <classname>MongoClient</classname> instance.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the former value of slaveOkay for this instance.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoClient::setReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongo/switchslave.xml b/reference/mongo/mongo/switchslave.xml
deleted file mode 100644
index ff800d00d8..0000000000
--- a/reference/mongo/mongo/switchslave.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongo.switchslave" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Mongo::switchSlave</refname>
-  <refpurpose>Choose a new secondary for slaveOkay reads</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Mongo::switchSlave</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   This choses a random secondary for a connection to read from.  It is called
-   automatically by the driver and should not need to be used.  It calls
-   <function>MongoClient::getHosts</function> (to refresh the status of hosts)
-   and <function>Mongo::getSlave</function> (to get the return value).
-  </para>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The address of the secondary this connection is using for reads. This may be
-   the same as the previous address as addresses are randomly chosen. It may
-   return only one address if only one secondary (or only the primary) is
-   available.
-  </para>
-  <para>
-   For example, if we had a three member replica set with a primary, secondary,
-   and arbiter this method would always return the address of the secondary.
-   If the secondary became unavailable, this method would always return the
-   address of the primary.  If the primary also became unavailable, this method
-   would throw an exception, as an arbiter cannot handle reads.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws a <classname>MongoException</classname> (error code 15) if it is 
-   called on a non-replica-set connection.  It will also throw 
-   <classname>MongoException</classname>s if it cannot find anyone (primary or
-   secondary) to read from (error code 16).
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongobindata.xml b/reference/mongo/mongobindata.xml
deleted file mode 100644
index 450f1991a8..0000000000
--- a/reference/mongo/mongobindata.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongobindata" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoBinData class</title>
- <titleabbrev>MongoBinData</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\Binary</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoBinData intro -->
-  <section xml:id="mongobindata.intro">
-   &reftitle.intro;
-   <para>
-    An object that can be used to store or retrieve binary data from the database.
-   </para>
-   <para>
-    The maximum size of a single object that can be inserted into the database
-    is 16MB. For data that is larger than this (movies, music, Henry Kissinger's
-    autobiography), use <classname>MongoGridFS</classname>. For data that is
-    smaller than 16MB, you may find it easier to embed it within the document
-    using <classname>MongoBinData</classname>.
-   </para>
-   <para>
-    For example, to embed an image in a document, one could write:
-   </para>
-   <example xml:id="mongobindata.intro-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$profile = array(
-    "username" => "foobity",
-    "pic" => new MongoBinData(file_get_contents("gravatar.jpg"), MongoBinData::GENERIC),
-);
-
-$users->save($profile);
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    This class contains a <varname>type</varname> field, which currently gives
-    no additional functionality in the PHP driver or the database. There are
-    seven predefined types, which are defined as class constants below. For
-    backwards compatibility, the PHP driver uses
-    <constant>MongoBinData::BYTE_ARRAY</constant> as the default; however, this
-    may change to <constant>MongoBinData::GENERIC</constant> in the future.
-    Users are encouraged to specify a type in
-    <function>MongoBinData::__construct</function>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongobindata.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoBinData</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoBinData</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.generic">MongoBinData::GENERIC</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.func">MongoBinData::FUNC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.byte_array">MongoBinData::BYTE_ARRAY</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.uuid">MongoBinData::UUID</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.uuid_rfc4122">MongoBinData::UUID_RFC4122</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.md5">MongoBinData::MD5</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongobindata.constants.custom">MongoBinData::CUSTOM</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname>bin</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>type</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongobindata')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoBinData constants -->
-  <section>
-   &reftitle.constants;
-   <section xml:id="mongobindata.constants.types">
-    <title>Binary Data Types</title>
-    <variablelist>
-     <varlistentry xml:id="mongobindata.constants.generic">
-      <term><constant>MongoBinData::GENERIC</constant></term>
-      <listitem>
-       <simpara>
-        Generic binary data.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongobindata.constants.func">
-      <term><constant>MongoBinData::FUNC</constant></term>
-      <listitem>
-       <simpara>
-        Function.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongobindata.constants.byte_array">
-      <term><constant>MongoBinData::BYTE_ARRAY</constant></term>
-      <listitem>
-       <simpara>
-        Generic binary data (deprecated in favor of
-        <constant>MongoBinData::GENERIC</constant>).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongobindata.constants.uuid">
-      <term><constant>MongoBinData::UUID</constant></term>
-      <listitem>
-       <simpara>
-        Universally unique identifier (deprecated in favor of
-        <constant>MongoBinData::UUID_RFC4122</constant>).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongobindata.constants.uuid_rfc4122">
-      <term><constant>MongoBinData::UUID_RFC4122</constant></term>
-      <listitem>
-       <simpara>
-        Universally unique identifier (according to
-        <link xlink:href="&url.rfc;4122">RFC 4122</link>).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongobindata.constants.md5">
-      <term><constant>MongoBinData::MD5</constant></term>
-      <listitem>
-       <simpara>
-        MD5.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongobindata.constants.custom">
-      <term><constant>MongoBinData::CUSTOM</constant></term>
-      <listitem>
-       <simpara>
-        User-defined type.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-  <simplesect role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1.5.0</entry>
-       <entry>
-        Added <constant>MongoBinData::GENERIC</constant> and
-        <constant>MongoBinData::UUID_RFC4122</constant> constants.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </simplesect>
-
- </partintro>
-
- &reference.mongo.entities.mongobindata;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongobindata/construct.xml b/reference/mongo/mongobindata/construct.xml
deleted file mode 100644
index 8425e6f4f0..0000000000
--- a/reference/mongo/mongobindata/construct.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongobindata.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoBinData::__construct</refname>
-  <refpurpose>Creates a new binary data object</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\Binary::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoBinData::__construct</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new binary data object.
-  </para>
-  <para>
-   There are seven types of binary data currently recognized by the BSON spec,
-   which are defined as
-   <link linkend="mongobindata.constants.types">class constants</link>. For
-   backwards compatibility, the PHP driver uses
-   <constant>MongoBinData::BYTE_ARRAY</constant> as the default; however, this
-   may change to <constant>MongoBinData::GENERIC</constant> in the future.
-   Users are encouraged to specify a type instead of relying on the default.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>data</parameter>
-     </term>
-     <listitem>
-      <para>
-       Binary data.
-      </para>
-     </listitem>
-    </varlistentry>     
-    <varlistentry>
-     <term>
-      <parameter>type</parameter>
-     </term>
-     <listitem>
-      <para>
-       Data type.
-      </para>
-     </listitem>
-    </varlistentry>     
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new binary data object.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        The default changed from <literal>2</literal>
-        (<constant>MongoBinData::BYTE_ARRAY</constant>) to
-        <literal>0</literal> (<constant>MongoBinData::GENERIC</constant>).
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when the second argument is not
-        used. The default value for <parameter>type</parameter> may change in
-        the near future.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongobindata/tostring.xml b/reference/mongo/mongobindata/tostring.xml
deleted file mode 100644
index 112baac118..0000000000
--- a/reference/mongo/mongobindata/tostring.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongobindata.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoBinData::__toString</refname>
-  <refpurpose>The string representation of this binary data object</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\Binary::getData</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoBinData::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the string "&lt;Mongo Binary Data&gt;".  To access the contents of a 
-   <classname>MongoBinData</classname>, use the <literal>bin</literal> field.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient.xml b/reference/mongo/mongoclient.xml
deleted file mode 100644
index 9e7565f646..0000000000
--- a/reference/mongo/mongoclient.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoclient" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoClient class</title>
- <titleabbrev>MongoClient</titleabbrev>
-
- <partintro>
-  <!-- {{{ MongoClient intro -->
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\Driver\Manager</classname></member>
-   </simplelist>
-  </warning>
-
-  <section xml:id="mongoclient.intro">
-   &reftitle.intro;
-   <para>
-    A connection manager for PHP and MongoDB.
-   </para>
-   <para>
-    This class is used to create and manage connections. A typical use is:
-    <example xml:id="mongoclient.intro-example">
-     <title><classname>MongoClient</classname> basic usage</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient(); // connect
-$db = $m->foo; // get the database named "foo"
-
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <para>
-    See <function>MongoClient::__construct</function> and the section on
-    <link linkend="mongo.connecting">connecting</link> for more information
-    about creating connections.
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongoclient.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoClient</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoClient</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.version">MongoClient::VERSION</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.defaulthost">MongoClient::DEFAULT_HOST</varname>
-     <initializer>"localhost"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongoclient.constants.defaultport">MongoClient::DEFAULT_PORT</varname>
-     <initializer>27017</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.rpprimary">MongoClient::RP_PRIMARY</varname>
-     <initializer>"primary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.rpprimarypreferred">MongoClient::RP_PRIMARY_PREFERRED</varname>
-     <initializer>"primaryPreferred"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.rpsecondary">MongoClient::RP_SECONDARY</varname>
-     <initializer>"secondary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.rpsecondary">MongoClient::RP_SECONDARY_PREFERRED</varname>
-     <initializer>"secondaryPreferred"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.constants.rpsecondary">MongoClient::RP_NEAREST</varname>
-     <initializer>"nearest"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="mongoclient.props.connected">connected</varname>
-     <initializer>&false;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="mongoclient.props.status">status</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname>server</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>bool</type>
-     <varname>persistent</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoclient')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
-<!-- Mongo constants -->
-  <section xml:id="mongoclient.constants">
-   &reftitle.constants;
-   <section xml:id="mongoclient.constants.types">
-    <title>MongoClient Constants</title>
-    <variablelist>
-     <varlistentry xml:id="mongoclient.constants.version">
-      <term><constant>MongoClient::VERSION</constant></term>
-      <listitem>
-       <simpara>
-        PHP driver version. May be suffixed with "dev", "+" or "-" if it is
-        in-between versions.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.defaulthost">
-      <term><constant>MongoClient::DEFAULT_HOST</constant></term>
-      <listitem>
-       <simpara>
-        Host to connect to if no host is given.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.defaultport">
-      <term><constant>MongoClient::DEFAULT_PORT</constant></term>
-      <listitem>
-       <simpara>
-        Port to connect to if no port is given.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.rpprimary">
-      <term><constant>MongoClient::RP_PRIMARY</constant></term>
-      <listitem>
-       <simpara>
-        <link linkend="mongo.readpreferences">Read preference</link> for the
-        primary replica set member.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.rpprimarypreferred">
-      <term><constant>MongoClient::RP_PRIMARY_PREFERRED</constant></term>
-      <listitem>
-       <simpara>
-        <link linkend="mongo.readpreferences">Read preference</link> for
-        preferring the primary replica set member.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.rpsecondary">
-      <term><constant>MongoClient::RP_SECONDARY</constant></term>
-      <listitem>
-       <simpara>
-        <link linkend="mongo.readpreferences">Read preference</link> for a
-        secondary replica set member.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.rpsecondarypreferred">
-      <term><constant>MongoClient::RP_SECONDARY_PREFERRED</constant></term>
-      <listitem>
-       <simpara>
-        <link linkend="mongo.readpreferences">Read preference</link> for
-        preferring a secondary replica set member.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongoclient.constants.rpnearest">
-      <term><constant>MongoClient::RP_NEAREST</constant></term>
-      <listitem>
-       <simpara>
-        <link linkend="mongo.readpreferences">Read preference</link> for the
-        nearest replica set member.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-  </section>
-
-  <section xml:id="mongoclient.fields">
-   <title>Fields</title>
-   <variablelist>
-    <varlistentry xml:id="mongoclient.props.connected">
-     <term><varname>connected</varname></term>
-     <listitem>
-      <para>
-       This property will be set to &true; if we have a open connection to
-       the database, &false; otherwise. If the connection is to a replica set,
-       this property will only be &true; if the driver has a connection to a
-       node matching the current read preference. This property does not take
-       authentication into account.
-      </para>
-      <para>
-       This property is <emphasis>deprecated</emphasis> since version 1.5.0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongoclient.props.status">
-     <term><varname>status</varname></term>
-     <listitem>
-      <para>
-       This property is no longer used and will be set to &null; In driver
-       versions 1.1.x and earlier, this may be set to a string value (e.g.
-       <literal>"recycled"</literal>, <literal>"new"</literal>) when persistent
-       connections are used.
-      </para>
-      <para>
-       This property is <emphasis>deprecated</emphasis> since version 1.5.0.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
-  <section role="seealso" xml:id="mongoclient.seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="mongo.readpreferences" /></member>
-    <member><xref linkend="mongo.writeconcerns" /></member>
-    <member><xref linkend="mongo.connecting" /></member>
-    <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.connections;">connecting</link></member>
-   </simplelist>
-  </section>
-
-<!-- }}} -->
- </partintro>
-
- &reference.mongo.entities.mongoclient;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/close.xml b/reference/mongo/mongoclient/close.xml
deleted file mode 100644
index f9bdf4a95b..0000000000
--- a/reference/mongo/mongoclient/close.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::close</refname>
-  <refpurpose>Closes this connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoClient::close</methodname>
-   <methodparam choice="opt"><type class="union"><type>bool</type><type>string</type></type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The <function>MongoClient::close</function> method forcefully closes a
-   connection to the database, even if persistent connections are being used.
-   You should <emphasis>never</emphasis> have to do this under normal
-   circumstances.
-  </para>
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>connection</parameter>
-     </term>
-     <listitem>
-      <para>
-       If connection is not given, or &false; then connection that would be
-       selected for writes would be closed. In a single-node configuration,
-       that is then the whole connection, but if you are connected to a
-       replica set, close() will <emphasis>only</emphasis> close the
-       connection to the primary server.
-      </para>
-      <para>
-       If connection is &true; then all connections as known by the connection
-       manager will be closed. This can include connections that are not
-       referenced in the connection string used to create the object that
-       you are calling close on.
-      </para>
-      <para>
-       If connection is a string argument, then it will only close the
-       connection identified by this hash. Hashes are identifiers for a
-       connection and can be obtained by calling
-       <function>MongoClient::getConnections</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns if the connection was successfully closed.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoClient::close</function> example</title>
-   <para>This example demonstrates how to selectively close all connections
-   for secondaries only.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Connect to a replicaset
-$a = new MongoClient("mongodb://whisky:13000/?replicaset=seta");
-
-$connections = $a->getConnections();
-
-foreach ( $connections as $con )
-{
-    // Loop over all the connections, and when the type is "SECONDARY"
-    // we close the connection
-    if ( $con['connection']['connection_type_desc'] == "SECONDARY" )
-    {
-        echo "Closing '{$con['hash']}': ";
-        $closed = $a->close( $con['hash'] );
-        echo $closed ? "ok" : "failed", "\n";
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Closing 'whisky:13001;X;4948': ok
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        <para>
-         The <parameter>connection</parameter> parameter to this function was
-         added in 1.3.0. Before that, only the write connection would be
-         closed by this method.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>
-        <para>
-         Before version 1.2.0 the driver would not use persistent connections
-         by default, and all connections would be closed as soon as a MongoDB
-         connection went out if scope. Since version 1.2.0 this is no longer
-         the case and it is a bad idea to call close as you might end up
-         overloading the server with connections under high load.
-        </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoClient::getConnections</function></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/construct.xml b/reference/mongo/mongoclient/construct.xml
deleted file mode 100644
index ef2e75ac84..0000000000
--- a/reference/mongo/mongoclient/construct.xml
+++ /dev/null
@@ -1,855 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::__construct</refname>
-  <refpurpose>Creates a new database connection object</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\Driver\Manager::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>MongoClient::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>server</parameter><initializer>"mongodb://localhost:27017"</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array("connect" => &true;)</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   If no parameters are passed, this connects to "localhost:27017" (or whatever
-   was specified in php.ini for
-   <link linkend="ini.mongo.default-host">mongo.default_host</link> and
-   <link linkend="ini.mongo.default-port">mongo.default_port</link>).
-  </para>
-  <para>
-   <parameter>server</parameter> should have the form:
-   <programlisting role="txt">
-<![CDATA[
-mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
-]]>
-   </programlisting>
-  </para>
-  <para>
-   The connection string always starts with <literal>mongodb://</literal>, to
-   indicate it is a connection string in this form.
-  </para>
-  <para>If <literal>username</literal> and <literal>password</literal>
-   are specified, the constructor will attempt to authenticate the connection
-   with the database before returning.  Username and password are optional
-   and must be followed by an <literal>@</literal>, if specified.
-  </para>
-  <para>
-   At least one host must be given (port optional, always defaulting to 27017)
-   and as many hosts as desired may be connected to. Host names are
-   comma-separated and the constructor will return successfully if it connected
-   to at least one host. If it could not connect to any of the hosts, it will
-   throw a <classname>MongoConnectionException</classname>. Please see the
-   <link linkend="mongo.connecting.rs">Replica Sets</link> section for
-   information on how to connect to Replica Sets.
-  </para>
-  <para>
-   If you specified a username and password, you may specify a database to
-   authenticate with.  If <literal>db</literal> is not specified, "admin" will
-   be used.
-  </para>
-  <para>
-   An optional query string may be used to specify extra options. The same
-   options are supported through the <parameter>options</parameter> array as
-   well, and are therefore redescribed there. See the <link
-   linkend="mongo.mongoclient.construct.examples">examples below</link> on
-   how to set those options.
-  </para>
-  <para>
-   One part of the options governs how the driver reads from secondary nodes
-   in a replica set environment. Extra information on how these read
-   preferences work is available as well through the <link
-   linkend="mongo.readpreferences">read preferences</link> documentation page.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters" xml:id="mongo.mongoclient.construct.parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>server</parameter>
-     </term>
-     <listitem>
-      <para>
-       The server name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the connection. Currently available options
-       include:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>"authMechanism"</literal>
-         </para>
-         <para>
-          Available mechanisms are:
-          <informaltable>
-           <tgroup cols="3">
-            <thead>
-             <row>
-              <entry>authMechanism</entry>
-              <entry>Description</entry>
-              <entry>Availability</entry>
-             </row>
-            </thead>
-            <tbody>
-             <row>
-              <entry>MONGODB-CR</entry>
-              <entry>Authenticate using Challenge Response mechanism. This is the default value.</entry>
-              <entry>All MongoDB versions</entry>
-             </row>
-             <row>
-              <entry>MONGODB-X509</entry>
-              <entry>Authenticates using X509 certificates</entry>
-              <entry>MongoDB 2.6. Only available when <xref linkend="book.openssl" /> is enabled</entry>
-             </row>
-             <row>
-              <entry>PLAIN</entry>
-              <entry>Authenticates using unencrypted plain username+password. Must be used over SSL connections. Generally used by MongoDB to login via 3rd party LDAP server</entry>
-              <entry>MongoDB Enterprise 2.4. The Driver must be compiled against CyrusSASL2</entry>
-             </row>
-             <row>
-              <entry>GSSAPI</entry>
-              <entry>Authenticates via kerberos systems</entry>
-              <entry>MongoDB Enterprise 2.4. The Driver must be compiled against CyrusSASL2</entry>
-             </row>
-             <row>
-              <entry>SCRAM-SHA-1</entry>
-              <entry>Authenticates using SCRAM-SHA-1</entry>
-              <entry>MongoDB 3.0.</entry>
-             </row>
-            </tbody>
-           </tgroup>
-          </informaltable>
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"authSource"</literal>
-         </para>
-         <para>
-          Should be set to the database name where the user is defined it.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"connect"</literal>
-         </para>
-         <para>
-          If the constructor should connect before returning.  Default is
-          &true;. When set to &false; the driver will
-          <emphasis>automatically</emphasis> connect to the server whenever
-          it is necessary to do a query. Alternatively, you can run
-          <function>MongoClient::connect</function> manually.
-         </para>
-         <warning>
-          <para>
-           This option is not supported through the connection string.
-          </para>
-         </warning>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"connectTimeoutMS"</literal>
-         </para>
-         <para>
-          How long a connection can take to be opened before timing out in
-          milliseconds. Defaults to <literal>60000</literal> (60 seconds).
-         </para>
-         <para>
-          If <literal>-1</literal> is specified, no connection timeout will be
-          applied and PHP will use
-          <link linkend="ini.default-socket-timeout">default_socket_timeout</link>.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"db"</literal>
-         </para>
-         <para>
-          The database to authenticate against can be specified here, instead of
-          including it in the host list.  This overrides a database given in the
-          host list.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"fsync"</literal>
-         </para>
-         <para>
-          When <literal>"fsync"</literal> is set, all write operations will
-          block until the database has flushed the changes to disk. This makes
-          the write operations slower, but it guarantees that writes have
-          succeeded and that the operations can be recovered in case of total
-          system failure.
-         </para>
-         <para>
-          If the MongoDB server has journaling enabled, this option is identical
-          to <emphasis>"journal"</emphasis>. If journaling is not enabled, this
-          option ensures that write operations will be synced to database files
-          on disk.
-         </para>
-         <note>
-          <simpara>
-           If journaling is enabled, users are strongly encouraged to use the
-           <literal>"journal"</literal> option instead of
-           <literal>"fsync"</literal>. Do not use <literal>"fsync"</literal> and
-           <literal>"journal"</literal> simultaneously, as that will result in
-           an error.
-          </simpara>
-         </note>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"journal"</literal>
-         </para>
-         <para>
-          When <literal>"journal"</literal> is set, all write operations will
-          block until the database has flushed the changes to the journal on
-          disk. This makes the write operations slower, but it guarantees that
-          writes have succeeded and that the operations can be recovered in case
-          of total system failure.
-         </para>
-         <note>
-          <simpara>
-           If this option is used and journaling is disabled, MongoDB 2.6+ will
-           raise an error and the write will fail; older server versions will
-           simply ignore the option.
-          </simpara>
-         </note>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"gssapiServiceName"</literal>
-         </para>
-         <para>
-          Sets the <link xlink:href="&url.mongodb.docs.kerberos.service-principal;">Kerberos service principal</link>. Only applicable when authMechanism=GSSAPI. Defaults to "mongodb".
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"password"</literal>
-         </para>
-         <para>
-          The password can be specified here, instead of including it in the
-          host list.  This is especially useful if a password has a "@" in it.
-          This overrides a password set in the host list.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"readPreference"</literal>
-         </para>
-         <para>
-          Specifies the read preference type. Read preferences provide you
-          with control from which secondaries data can be read from.
-         </para>
-         <para>
-          Allowed values are: <constant>MongoClient::RP_PRIMARY</constant>,
-          <constant>MongoClient::RP_PRIMARY_PREFERRED</constant>,
-          <constant>MongoClient::RP_SECONDARY</constant>,
-          <constant>MongoClient::RP_SECONDARY_PREFERRED</constant> and
-          <constant>MongoClient::RP_NEAREST</constant>.
-         </para>
-         <para>
-          See the documentation on <link linkend="mongo.readpreferences">read
-          preferences</link> for more information.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"readPreferenceTags"</literal>
-         </para>
-         <para>
-          Specifies the read preference tags as an array of strings. Tags can be
-          used in combination with the <literal>readPreference</literal> option
-          to further control which secondaries data might be read from.
-         </para>
-         <para>
-          See the documentation on <link linkend="mongo.readpreferences">read
-          preferences</link> for more information.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"replicaSet"</literal>
-         </para>
-         <para>
-          The name of the replica set to connect to.  If this is given, the
-          primary will be automatically be determined. This means that the
-          driver may end up connecting to a server that was not even listed.
-          See the replica set example below for details.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"secondaryAcceptableLatencyMS"</literal>
-         </para>
-         <para>
-          When reading from a secondary (using ReadPreferences), do not read from secondaries known to be more then
-          <literal>secondaryAcceptableLatencyMS</literal> away from us. Defaults to <literal>15</literal>
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"socketTimeoutMS"</literal>
-         </para>
-         <para>
-          How long a socket operation (read or write) can take before timing out
-          in milliseconds. Defaults to <literal>30000</literal> (30 seconds).
-         </para>
-         <para>
-          If <literal>-1</literal> is specified, socket operations may block
-          indefinitely. This option may also be set on a per-operation basis
-          using <methodname>MongoCursor::timeout</methodname> for queries or the
-          <literal>"socketTimeoutMS"</literal> option for write methods.
-         </para>
-         <note>
-          <simpara>
-           This is a client-side timeout. If a write operation times out, there
-           is no way to know if the server actually handled the write or not, as
-           a <classname>MongoCursorTimeoutException</classname> will be thrown
-           in lieu of returning a write result.
-          </simpara>
-         </note>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"ssl"</literal>
-         </para>
-         <para>
-          A boolean to specify whether you want to enable SSL for the
-          connections to MongoDB. Extra options such as certificates
-          can be set with <xref linkend="context.ssl" />.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"username"</literal>
-         </para>
-         <para>
-          The username can be specified here, instead of including it in the
-          host list.  This is especially useful if a username has a ":" in it.
-          This overrides a username set in the host list.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"w"</literal>
-         </para>
-         <para>
-          The <literal>w</literal> option specifies the
-          <link linkend="mongo.writeconcerns">Write Concern</link> for the driver,
-          which determines how long the driver blocks when writing. The
-          default value is <literal>1</literal>.
-         </para>
-         <para>
-          This option is applicable when connecting to both single servers and
-          replica sets. A positive value controls how <emphasis>many</emphasis>
-          nodes must acknowledge the write instruction before the driver
-          continues. A value of <literal>1</literal> would require the single
-          server or primary (in a replica set) to acknowledge the write
-          operation. A value of <literal>3</literal> would cause the driver to
-          block until the write has been applied to the primary as well as two
-          secondary servers (in a replica set).
-         </para>
-         <para>
-          A string value is used to control which tag sets are taken into
-          account for write concerns. <literal>"majority"</literal> is special
-          and ensures that the write operation has been applied to the majority
-          (more than 50%) of the participating nodes.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"wTimeoutMS"</literal>
-         </para>
-         <para>
-          This option specifies the time limit, in milliseconds, for
-          <link linkend="mongo.writeconcerns">write concern</link>
-          acknowledgement. It is only applicable for write operations where
-          <literal>"w"</literal> is greater than <literal>1</literal>, as the
-          timeout pertains to replication. If the write concern is not satisfied
-          within the time limit, a <classname>MongoCursorException</classname>
-          will be thrown. A value of <literal>0</literal> may be specified to
-          block indefinitely. The default value is <literal>10000</literal>
-          (ten seconds).
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>"slaveOkay"</literal>
-         </para>
-         <para>
-          Deprecated. Please use the <link linkend="mongo.readpreferences">read
-          preference</link> options.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"timeout"</literal>
-         </para>
-         <para>
-          Deprecated alias for <literal>"connectTimeoutMS"</literal>.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>"wTimeout"</literal>
-         </para>
-         <para>
-          Deprecated alias for <literal>"wTimeoutMS"</literal>.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
-     <term>
-      <parameter>driver_options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the MongoDB driver. Options include setting
-       connection <link linkend="mongo.connecting.context.ssl">context options for SSL</link>
-       or <link linkend="context.mongodb">logging callbacks</link>.
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>"context"</literal>
-         </para>
-         <para>
-          The Stream Context to attach to all new connections. This allows you 
-          for example to configure SSL certificates and are described at
-          <link linkend="context.ssl">SSL context options</link>. See the 
-          <link linkend="mongo.connecting.context.ssl">Connecting over SSL</link> tutorial.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new database connection object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it tries and fails
-   to connect to the database for all hostnames given.  It will also throw a
-   <classname>MongoConnnectionException</classname> if an invalid username or
-   password is given.  See <classname>MongoConnectionException</classname>
-   documentation for common exceptions and their causes.
-  </para>
- </refsect1>
-
- <refsect1 role="examples" xml:id="mongo.mongoclient.construct.examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoClient::__construct</function> replica set example</title>
-   <para>
-    This example shows how to connect the driver to a replica set. It assumes
-    that there is a set of three servers: sf1.example.com, sf2.example.com, and
-    ny1.example.com. The primary could be any one of these servers.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// pass a comma-separated list of server names to the constructor
-// Note that we don't need to pass in all the members of the replicaset, the driver 
-// will derive the full list.
-$m1 = new MongoClient("mongodb://sf2.example.com,ny1.example.com", array("replicaSet" => "myReplSet"));
-
-?>
-]]>
-   </programlisting>
-   <para>
-    If the current primary fails, the driver will figure out which secondary
-    server became the new primary and automatically start using that connection.
-    Automatic failover will not work correctly if <literal>replicaSet</literal>
-    is not specified.
-   </para>
-   <para>
-    At least one seed in the seed list must be up for the driver to connect to
-    the replica set.
-   </para>
-   <para>
-    If you include seeds from two separate replica sets, behavior is undefined.
-   </para>
-   <para>See the
-    <link xlink:href="&url.mongodb.dochub.rs;">core documentation</link> on
-    replica sets for more information.
-   </para>
-  </example>
-  <example>
-   <title>Connecting to a domain socket</title>
-   <para>
-    In version 1.0.9+, you can use a UNIX domain socket to connect to an
-    instance of MongoDB running locally.  This should be slightly faster than
-    using a network connection.
-   </para>
-   <para>
-    In version 1.5.0, the MongoDB server automatically opens a socket at
-    /tmp/mongodb-&lt;port&gt;.sock.  You can connect to this by specifying the
-    path in your connection string:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// MongoDB server running locally on port 20000
-$m = new MongoClient("mongodb:///tmp/mongodb-20000.sock");
-
-?>
-]]>
-   </programlisting>
-   <para>
-    You can combine this with any other connections you'd like:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// try to connect to the domain socket, fall back to localhost connection
-$m = new MongoClient("mongodb:///tmp/mongodb-27017.sock,localhost:27017");
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>MongoClient::__construct</function> authentication example</title>
-   <para>
-    A user must exist in the admin database before attempting to use
-    authentication.  You can create one with the Mongo shell by running:
-   </para>
-   <programlisting role="shell">
-<![CDATA[
-> use admin
-switched to db admin
-> db.addUser("testUser", "testPass");
-{
-        "_id" : ObjectId("4b21272fd9ab21611d19095c"),
-        "user" : "testUser",
-        "pwd" : "03b9b27e0abf1865e2f6fcbd9845dd59"
-}
->
-]]>
-   </programlisting>
-   <para>
-    After creating a user with, in this case, username "testUser" and password
-    "testPass", you can create an authenticated connection:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient("mongodb://testUser:testPass@localhost");
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>MongoClient::__construct</function> read preference example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Prefer the nearest server in the "east" data center
-$uri  = 'mongodb://rs1.example.com,rs2.example.com/';
-$uri .= '?readPreference=nearest';
-$uri .= '&readPreferenceTags=dc:east';
-$m = new MongoClient($uri, array('replicaSet' => 'rs'));
-?>
-]]>
-   </programlisting>
-   <para>
-    See the <link linkend="mongo.readpreferences">read preferences</link>
-    section of this manual for further information.
-   </para>
-  </example>
-
-  <example>
-   <title><function>MongoClient::__construct</function> options example</title>
-   <para>
-    Options can be passed both through the query string in the connection
-    string, or as an array passed as second argument to the constructor.
-   </para>
-   <para>
-    Here we set the journal option to true and readPreference to secondary
-    preferred as default for all write operations:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb://localhost/?journal=true&readPreference=secondary");
-?>
-]]>
-   </programlisting>
-   <para>
-    And now we do the same, but as an options array:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$options = array(
-    'journal' => true,
-    'readPreference' => 'secondary',
-);
-$m = new MongoClient("mongodb://localhost/", $options);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>MongoClient::__construct</function> read preference example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Prefer the nearest server in the "east" data center
-$uri  = 'mongodb://rs1.example.com,rs2.example.com/';
-$uri .= '?readPreference=nearest';
-$uri .= '&readPreferenceTags=dc:east';
-$m = new MongoClient($uri, array('replicaSet' => 'rs'));
-?>
-]]>
-   </programlisting>
-   <para>
-    See the <link linkend="mongo.readpreferences">read preferences</link>
-    section of this manual for further information.
-   </para>
-  </example>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.6.0</entry>
-       <entry>
-        <para>
-         Added support for <literal>"SCRAM-SHA-1"</literal> in
-         <literal>"authMechanism"</literal> option.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added <literal>"authMechanism"</literal>, <literal>"gssapiServiceName"</literal>, and <literal>"secondaryAcceptableLatencyMS"</literal>.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.4.0</entry>
-       <entry>
-        <para>
-         Added <literal>"ssl"</literal> option and support for
-         <link linkend="mongo.connecting.ssl">connecting over SSL</link>.
-        </para>
-        <para>
-         Added <literal>"wTimeoutMS"</literal> option, which replaces
-         <literal>"wTimeout"</literal>.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when
-         <literal>"slaveOkay"</literal> or <literal>"timeout"</literal> is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added <literal>"authSource"</literal>.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.4</entry>
-       <entry>
-        <para>
-         Added <literal>"connectTimeoutMS"</literal> and
-         <literal>"socketTimeoutMS"</literal> options.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        <para>
-         Added <literal>"readPreference"</literal>,
-         <literal>"readPreferenceTags"</literal>, <literal>"w"</literal>, and
-         <literal>"wTimeout"</literal> options.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>
-        <para>
-         Added <literal>"username"</literal> and <literal>"password"</literal>
-         options.
-        </para>
-        <para>
-         Removed <literal>"persist"</literal> option, as all connections are
-         now persistent. It can still be used, but it doesn't affect anything.
-        </para>
-        <variablelist>
-         <varlistentry>
-          <term>
-           <parameter>"persist"</parameter>
-          </term>
-          <listitem>
-           <para>
-            If the connection should be persistent. If set, the connection will
-            be persistent. The string representation of the value is used as an
-            ID for the connection, so two instances of
-            <classname>MongoClient</classname> that are initialized with
-            <literal>array("persist" => "foobar")</literal> will share the same
-            database connection, whereas an instance initialized with
-            <literal>array("persist" => "barbaz")</literal> will use a different
-            database connection.
-           </para>
-          </listitem>
-         </varlistentry>
-        </variablelist>
-        <para>
-         The <literal>"replicaSet"</literal> option now takes a string, not a
-         boolean.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.9</entry>
-       <entry>Added <literal>"replicaSet"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.2</entry>
-       <entry>
-        <para>
-         Changed constructor to take an array of options. Pre-1.0.2, the
-         constructor took the following parameters:
-        </para>
-        <variablelist>
-         <varlistentry>
-          <term>
-           <parameter>server</parameter>
-          </term>
-          <listitem>
-           <para>
-            The server name.
-           </para>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>
-           <parameter>connect</parameter>
-          </term>
-          <listitem>
-           <para>
-            Optional boolean parameter specifying if the constructor should
-            connect to the database before returning.  Defaults to &true;.
-           </para>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>
-           <parameter>persistent</parameter>
-          </term>
-          <listitem>
-           <para>
-            If the connection should be persistent.
-           </para>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>
-           <parameter>paired</parameter>
-          </term>
-          <listitem>
-           <para>
-            If the connection should be paired.
-           </para>
-          </listitem>
-         </varlistentry>
-        </variablelist>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/dropdb.xml b/reference/mongo/mongoclient/dropdb.xml
deleted file mode 100644
index a97672b828..0000000000
--- a/reference/mongo/mongoclient/dropdb.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.dropdb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::dropDB</refname>
-  <refpurpose>Drops a database [deprecated]</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.alternative.phplib.note;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.library.apidocs;/method/MongoDBClient-dropDatabase/">MongoDB\Client::dropDatabase()</link></member>
-  </simplelist>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoClient::dropDB</methodname>
-   <methodparam><type>mixed</type><parameter>db</parameter></methodparam>
-  </methodsynopsis>
-
-  <warning>
-   <title>Deprecated</title>
-   <para>
-    Use <function>MongoDB::drop</function> instead.
-   </para>
-  </warning>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>db</parameter>
-     </term>
-     <listitem>
-      <para>
-       The database to drop. Can be a MongoDB object or the name of the database.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/get.xml b/reference/mongo/mongoclient/get.xml
deleted file mode 100644
index 36b700fda9..0000000000
--- a/reference/mongo/mongoclient/get.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::__get</refname>
-  <refpurpose>Gets a database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.alternative.phplib.note;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.library.apidocs;/method/MongoDBClient__get/">MongoDB\Client::__get()</link></member>
-  </simplelist>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoDB</type><methodname>MongoClient::__get</methodname>
-   <methodparam><type>string</type><parameter>dbname</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This is the cleanest way of getting a database. If the database name has any
-   special characters, <function>MongoClient::selectDB</function> will need to
-   be used; however, this should be sufficient for most cases.
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mongo = new MongoClient();
-
-// the following two lines are equivalent
-$db = $mongo->selectDB("foo");
-$db = $mongo->foo;
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>dbname</parameter>
-     </term>
-     <listitem>
-      <para>
-       The database name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new db object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws a generic exception if the database name is invalid.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/getconnections.xml b/reference/mongo/mongoclient/getconnections.xml
deleted file mode 100644
index 098481770f..0000000000
--- a/reference/mongo/mongoclient/getconnections.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoclient.getconnections" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::getConnections</refname>
-  <refpurpose>Return info about all open connections</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>MongoClient::getConnections</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Returns an array of all open connections, and information about each of the
-  servers 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  An <type>array</type> of open connections.
-  </para>
- </refsect1>
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <example xml:id="mongoclient-getconnections.example.basic"><!-- {{{ -->
-   <title><methodname>MongoClient::getConnections</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-var_dump($m->getConnections());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(3) {
-    ["hash"]=>
-    string(26) "localhost:27017;-;X;56052"
-    ["server"]=>
-    array(3) {
-      ["host"]=>
-      string(10) "localhost"
-      ["port"]=>
-      int(27017)
-      ["pid"]=>
-      int(56052)
-    }
-    ["connection"]=>
-    array(8) {
-      ["last_ping"]=>
-      int(1354076401)
-      ["last_ismaster"]=>
-      int(0)
-      ["ping_ms"]=>
-      int(0)
-      ["connection_type"]=>
-      int(1)
-      ["connection_type_desc"]=>
-      string(10) "STANDALONE"
-      ["max_bson_size"]=>
-      int(16777216)
-      ["tag_count"]=>
-      int(0)
-      ["tags"]=>
-      array(0) {
-      }
-    }
-  }
-}
-]]>
-   </screen>
-  </example><!-- }}} -->
- </refsect1><!-- }}} -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/gethosts.xml b/reference/mongo/mongoclient/gethosts.xml
deleted file mode 100644
index 0513324722..0000000000
--- a/reference/mongo/mongoclient/gethosts.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.gethosts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::getHosts</refname>
-  <refpurpose>Updates status for all associated hosts</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.alternative.method.note;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::getServers</methodname></member>
-  </simplelist>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoClient::getHosts</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   This method is only useful with a connection to a replica set. It returns
-   the status of all of the hosts in the set. Without a replica set, it will
-   just return an array with one element containing the host that you are
-   connected to.
-  </para>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of information about the hosts in the set. Includes each
-   host's hostname, its health (1 is healthy), its state (1 is primary, 2 is
-   secondary, 0 is anything else), the amount of time it took to ping the
-   server, and when the last ping occurred. For example, on a three-member
-   replica set, it might look something like:
-  </para>
-  <screen>
-<![CDATA[
-array(3) {
-  ["A:27017"]=>
-  array(4) {
-    ["host"]=>
-    "A"
-    ["port"]=>
-    27017
-    ["health"]=>
-    int(1)
-    ["state"]=>
-    int(2)
-    ["ping"]=>
-    int(369)
-    ["lastPing"]=>
-    int(1309470644)
-  }
-  ["B:27017"]=>
-  array(4) {
-    ["host"]=>
-    "B"
-    ["port"]=>
-    27017
-    ["health"]=>
-    int(1)
-    ["state"]=>
-    int(1)
-    ["ping"]=>
-    int(139)
-    ["lastPing"]=>
-    int(1309470644)
-  }
-  ["C:27017"]=>
-  array(4) {
-    ["host"]=>
-    "C"
-    ["port"]=>
-    27017
-    ["health"]=>
-    int(1)
-    ["state"]=>
-    int(2)
-    ["ping"]=>
-    int(1012)
-    ["lastPing"]=>
-    int(1309470644)
-  }
-}
-]]>
-  </screen>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.10</entry>
-       <entry>
-        <para>
-         Support for non-replicasets was added.
-        </para>
-        <para>
-         The returned array elements now also include the
-         <literal>hostname</literal> and <literal>port</literal>.
-        </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoClient::getConnections</function></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/getreadpreference.xml b/reference/mongo/mongoclient/getreadpreference.xml
deleted file mode 100644
index 96473e75bc..0000000000
--- a/reference/mongo/mongoclient/getreadpreference.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoclient.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::getReadPreference</refname>
-  <refpurpose>Get the read preference for this connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoClient::getReadPreference</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.3.3</entry>
-       <entry>
-        The return value has changed to be consistent with
-        <methodname>MongoClient::setReadPreference</methodname>. The
-        <literal>type</literal> value was changed from a number to a string,
-        <literal>type_string</literal> was removed, and
-        <literal>tagsets</literal> now expresses tags as key/value pairs instead
-        of colon-delimited strings.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoClient::getReadPreference</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$m->setReadPreference(MongoClient::RP_SECONDARY, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-    array(),
-));
-var_dump($m->getReadPreference());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["type"]=>
-  string(9) "secondary"
-  ["tagsets"]=>
-  array(3) {
-    [0]=>
-    array(2) {
-      ["dc"]=>
-      string(4) "east"
-      ["use"]=>
-      string(9) "reporting"
-    }
-    [1]=>
-    array(1) {
-      ["dc"]=>
-      string(7) "west"
-    }
-    [2]=>
-    array(0) {
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoClient::setReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/getwriteconcern.xml b/reference/mongo/mongoclient/getwriteconcern.xml
deleted file mode 100644
index 42e6064aff..0000000000
--- a/reference/mongo/mongoclient/getwriteconcern.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoclient.getwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::getWriteConcern</refname>
-  <refpurpose>Get the write concern for this connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoClient::getWriteConcern</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getwriteconcern.returnvalues;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoClient::getWriteConcern</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mc = new MongoClient('mongodb://localhost:27017', array('wTimeoutMS' => 500));
-var_dump($mc->getWriteConcern());
-
-$mc->setWriteConcern(1, 1000);
-var_dump($mc->getWriteConcern());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["w"]=>
-  int(1)
-  ["wtimeout"]=>
-  int(500)
-}
-array(2) {
-  ["w"]=>
-  int(1)
-  ["wtimeout"]=>
-  int(1000)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.writeconcerns">write concern</link> documentation.</member>
-   <member><function>MongoClient::setWriteConcern</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/killcursor.xml b/reference/mongo/mongoclient/killcursor.xml
deleted file mode 100644
index 35cda05208..0000000000
--- a/reference/mongo/mongoclient/killcursor.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.killcursor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::killCursor</refname>
-  <refpurpose>Kills a specific cursor on the server</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoClient::killCursor</methodname>
-   <methodparam><type>string</type><parameter>server_hash</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>MongoInt64</type></type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   In certain situations it might be needed to kill a cursor on the server.
-   Usually cursors time out after 10 minutes of inactivity, but it is possible
-   to create an immortal cursor with
-   <methodname>MongoCursor::immortal</methodname> that never times out. In
-   order to be able to kill such an immortal cursor, you can call this
-   method with the information supplied by
-   <methodname>MongoCursor::info</methodname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>server_hash</parameter>
-     </term>
-     <listitem>
-      <para>
-       The server hash that has the cursor. This can be obtained through
-       <methodname>MongoCursor::info</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>id</parameter>
-     </term>
-     <listitem>
-      <para>
-       The ID of the cursor to kill. You can either supply an <type>int</type>
-       containing the 64 bit cursor ID, or an object of the
-       <classname>MongoInt64</classname> class. The latter is necessary on 32
-       bit platforms (and Windows).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the method attempted to kill a cursor, and &false; if
-   there was something wrong with the arguments (such as a wrong
-   <parameter>server_hash</parameter>). The return status does <emphasis>not
-   reflect</emphasis> where the cursor was actually killed as the server does
-   not provide that information.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method displays a warning if the supplied
-   <parameter>server_hash</parameter> does not match up with an existing
-   connection. No attempt to kill a cursor is attempted in that case either.
-  </para>
- </refsect1>
-
- <refsect1 role="examples" xml:id="mongo.mongoclient.killcursor.examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoClient::killCursor</function> example</title>
-   <para>
-    This example shows how to connect, do a query, obtain the cursor
-    information and then kill the cursor.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$c = $m->testdb->collection;
-$cursor = $c->find();
-$result = $cursor->next();
-
-// Now the cursor is valid, so we can get the hash and ID out:
-$info = $cursor->info();
-
-// Kill the cursor
-MongoClient::killCursor( $info['server'], $info['id'] );
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/listdbs.xml b/reference/mongo/mongoclient/listdbs.xml
deleted file mode 100644
index 929611fc7a..0000000000
--- a/reference/mongo/mongoclient/listdbs.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.listdbs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::listDBs</refname>
-  <refpurpose>Lists all of the databases available</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.alternative.phplib.note;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.library.apidocs;/method/MongoDBClient-listDatabases/">MongoDB\Client::listDatabases()</link></member>
-  </simplelist>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoClient::listDBs</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array containing three fields.  The first field is
-   <literal>databases</literal>, which in turn contains an array.  Each element
-   of the array is an associative array corresponding to a database, giving th
-   database's name, size, and if it's empty.  The other two fields are
-   <literal>totalSize</literal> (in bytes) and <literal>ok</literal>, which is 1
-   if this method ran successfully.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoClient::listDBs</methodname> example</title>
-   <para>
-    Example demonstrating how to use listDBs and the returned data structure.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mongo = new MongoClient();
-$dbs = $mongo->listDBs();
-print_r($dbs);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [databases] => Array
-        (
-            [0] => Array
-                (
-                    [name] => doctrine
-                    [sizeOnDisk] => 218103808
-                    [empty] =>
-                )
-        )
-
-    [totalSize] => 218103808
-    [ok] => 1
-)
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/selectcollection.xml b/reference/mongo/mongoclient/selectcollection.xml
deleted file mode 100644
index 98f7e76f25..0000000000
--- a/reference/mongo/mongoclient/selectcollection.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.selectcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::selectCollection</refname>
-  <refpurpose>Gets a database collection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.alternative.phplib.note;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.library.apidocs;/method/MongoDBClient-selectCollection/">MongoDB\Client::selectCollection()</link></member>
-  </simplelist>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCollection</type><methodname>MongoClient::selectCollection</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>string</type><parameter>collection</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>db</parameter>
-     </term>
-     <listitem>
-      <para>
-       The database name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>collection</parameter>
-     </term>
-     <listitem>
-      <para>
-       The collection name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>Exception</classname> if the database or collection name is invalid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoClient::selectCollection</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-
-$c1 = $m->selectCollection("foo", "bar.baz");
-// which is equivalent to
-$c2 = $m->selectDB("foo")->selectCollection("bar.baz");
-
-// $c1 and $c2 now represent the same collection
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/selectdb.xml b/reference/mongo/mongoclient/selectdb.xml
deleted file mode 100644
index 35bb151a55..0000000000
--- a/reference/mongo/mongoclient/selectdb.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.selectdb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::selectDB</refname>
-  <refpurpose>Gets a database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.alternative.phplib.note;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.library.apidocs;/method/MongoDBClient-selectDatabase/">MongoDB\Client::selectDatabase()</link></member>
-  </simplelist>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoDB</type><methodname>MongoClient::selectDB</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       The database name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new database object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>Exception</classname> if the database name is invalid.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoclient/setreadpreference.xml b/reference/mongo/mongoclient/setreadpreference.xml
deleted file mode 100644
index 4ded1e24a2..0000000000
--- a/reference/mongo/mongoclient/setreadpreference.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoclient.setreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::setReadPreference</refname>
-  <refpurpose>Set the read preference for this connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoClient::setReadPreference</methodname>
-   <methodparam><type>string</type><parameter>read_preference</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tags</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setreadpreference.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.setreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setreadpreference.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoClient::setReadPreference</methodname> tag set array syntax example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$m->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoClient::getReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/setwriteconcern.xml b/reference/mongo/mongoclient/setwriteconcern.xml
deleted file mode 100644
index b8b2e9b3bf..0000000000
--- a/reference/mongo/mongoclient/setwriteconcern.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoclient.setwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::setWriteConcern</refname>
-  <refpurpose>Set the write concern for this connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoClient::setWriteConcern</methodname>
-   <methodparam><type>mixed</type><parameter>w</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>wtimeout</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setwriteconcern.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.setwriteconcern.returnvalues;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setwriteconcern.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoClient::setWriteConcern</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mc = new MongoClient('mongodb://rs1.example.com,rs2.example.com');
-
-// Require that the majority of servers in the replica set acknowledge writes
-// within three seconds.
-$mc->setWriteConcern('majority', 3000);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.writeconcerns">write concern</link> documentation.</member>
-   <member><function>MongoClient::getWriteConcern</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoclient/tostring.xml b/reference/mongo/mongoclient/tostring.xml
deleted file mode 100644
index 20c3d84afa..0000000000
--- a/reference/mongo/mongoclient/tostring.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongoclient.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoClient::__toString</refname>
-  <refpurpose>String representation of this connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  &mongo.noalternative.method.note;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoClient::__toString</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns hostname and port for this connection.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocode.xml b/reference/mongo/mongocode.xml
deleted file mode 100644
index 33e4b5f0c7..0000000000
--- a/reference/mongo/mongocode.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongocode" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCode class</title>
- <titleabbrev>MongoCode</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\JavaScript</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoId intro -->
-  <section xml:id="mongocode.intro">
-   &reftitle.intro;
-   <para>
-    Represents JavaScript code for the database.
-   </para>
-   <para>
-    MongoCode objects are composed of two parts: a string of code and an optional scope.  The string of code must be valid JavaScript.  The scope is a associative array of variable name/value pairs.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongocode.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCode</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCode</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongocode')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongocode;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocode/construct.xml b/reference/mongo/mongocode/construct.xml
deleted file mode 100644
index d218290d7a..0000000000
--- a/reference/mongo/mongocode/construct.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocode.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCode::__construct</refname>
-  <refpurpose>Creates a new code object</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\JavaScript::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoCode::__construct</methodname>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>scope</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>code</parameter>
-     </term>
-     <listitem>
-      <para>
-       A string of code.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>scope</parameter>
-     </term>
-     <listitem>
-      <para>
-       The scope to use for the code.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new code object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCode::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$code = new MongoCode('function() { '.
-    'for(i=0;i<10;i++) {'.
-        'db.foo.update({z : i}, {z : x});'.
-    '}'.
-    'return x-1;'.
- '}', array("x" => 4));
-var_dump($code);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoCode)#1 (2) {
-  ["scope"]=>
-  array(1) {
-    ["x"]=>
-    int(4)
-  }
-  ["code"]=>
-  string(80) "function() { for(i=0;i<10;i++) { db.foo.update({z : i}, {z : x}); } return x-1; }"
-}
-]]>
-   </screen>
-  </example>
-
-
-  <example>
-   <title>Using <classname>MongoCode</classname> with $where</title>
-   <para>
-    This example queries a collection for elements where the 'x' fields is less than $y.  Notice that
-    PHP objects can be passed into the JavaScript scope and that the JavaScript function returns a boolean.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find(array('$where' => new MongoCode('function() { return this.x < y; }', array('y'=>$y))));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocode/tostring.xml b/reference/mongo/mongocode/tostring.xml
deleted file mode 100644
index b99e781bdf..0000000000
--- a/reference/mongo/mongocode/tostring.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocode.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCode::__toString</refname>
-  <refpurpose>Returns this code as a string</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoCode::__toString</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This code, the scope is not returned.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCode::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$code = new MongoCode('return x;', array("x"=>"hi"));
-echo "$code\n";
-
-$code = new MongoCode('function() { for(i=0;i<10;i++) { db.foo.update({x:i}, {x:i+1}); } }');
-echo "$code\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-return x;
-function() { for(i=0;i<10;i++) { db.foo.update({x:i}, {x:i+1}); } }
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection.xml b/reference/mongo/mongocollection.xml
deleted file mode 100644
index 5326fedc9c..0000000000
--- a/reference/mongo/mongocollection.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongocollection" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCollection class</title>
- <titleabbrev>MongoCollection</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Mongocollection intro -->
-  <section xml:id="mongocollection.intro">
-   &reftitle.intro;
-   <para>
-    Represents a MongoDB collection.
-   </para>
-   <para>
-    Collection names can use any character in the ASCII set.  Some valid 
-    collection names are &quot;&quot;, &quot;...&quot;, 
-    &quot;my collection&quot;, and &quot;&#42;&amp;&#35;&#64;&quot;.
-   </para>
-   <para>
-    User-defined collection names cannot contain the $ symbol.  There are 
-    certain system collections which use a $ in their names (e.g., 
-    local.oplog.$main), but it is a reserved character.  If you attempt to 
-    create and use a collection with a $ in the name, MongoDB will assert.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongocollection.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCollection</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCollection</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongocollection.constants.ascending">MongoCollection::ASCENDING</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongocollection.constants.descending">MongoCollection::DESCENDING</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>MongoDB</type>
-     <varname linkend="mongocollection.props.db">db</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="mongocollection.props.w">w</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="mongocollection.props.wtimeout">wtimeout</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongocollection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="mongocollection.constants.ascending">
-     <term><constant>MongoCollection::ASCENDING</constant></term>
-     <listitem>
-      <simpara>
-       Ascending direction for sorts and index creation.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongocollection.constants.descending">
-     <term><constant>MongoCollection::DESCENDING</constant></term>
-     <listitem>
-      <simpara>
-       Descending direction for sorts and index creation.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
-  <section>
-   <title>Fields</title>
-   <variablelist>
-    <varlistentry xml:id="mongocollection.props.db">
-     <term><varname>db</varname></term>
-     <listitem>
-      <para>
-       The "parent" database for this collection.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongocollection.props.w">
-     <term><varname>w</varname></term>
-     <listitem>
-      <para>
-       The number of servers to replicate a change to before returning success.
-       Value is inherited from the parent database. The 
-       <classname>MongoDB</classname> class has a more detailed description of
-       how <literal>w</literal> works.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongocollection.props.wtimeout">
-     <term><varname>wtimeout</varname></term>
-     <listitem>
-      <para>
-       The number of milliseconds to wait for <literal>$this->w</literal> 
-       replications to take place.  Value is inherited from the parent database.
-       The <classname>MongoDB</classname> class has a more detailed description 
-       of how <literal>wtimeout</literal> works.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
-  <section>
-   &reftitle.seealso;
-   <para>
-    MongoDB core docs on <link xlink:href="&url.mongodb.glossary;#term-collection">collections</link>.
-   </para>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongocollection;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/aggregate.xml b/reference/mongo/mongocollection/aggregate.xml
deleted file mode 100644
index fec8d36104..0000000000
--- a/reference/mongo/mongocollection/aggregate.xml
+++ /dev/null
@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocollection.aggregate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::aggregate</refname>
-  <refpurpose>Perform an aggregation using the aggregation framework</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::aggregate</methodname>
-   <methodparam><type>array</type><parameter>pipeline</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::aggregate</methodname>
-   <methodparam><type>array</type><parameter>op</parameter></methodparam>
-   <methodparam rep="repeat"><type>array</type><parameter>ops</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The MongoDB
-   <link xlink:href="&url.mongodb.docs.aggregation;">aggregation framework</link>
-   provides a means to calculate aggregated values without having to use
-   MapReduce. While MapReduce is powerful, it is often more difficult than
-   necessary for many simple aggregation tasks, such as totaling or averaging
-   field values.
-  </para>
-  <para>
-   This method accepts either a variable amount of pipeline operators, or a
-   single array of operators constituting the pipeline.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pipeline</parameter></term>
-    <listitem>
-     <para>
-      An array of pipeline operators.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>Options for the aggregation command. Valid options include:</para>
-     <itemizedlist>
-      <listitem>
-       <para><literal>"allowDiskUse"</literal></para>
-       <para>Allow aggregation stages to write to temporary files</para>
-      </listitem>
-      <listitem>
-       <para><literal>"cursor"</literal></para>
-       <para>
-        Options controlling the creation of the cursor object. This option
-        causes the command to return a result document suitable for constructing
-        a <classname>MongoCommandCursor</classname>. If you need to use this
-        option, you should consider using
-        <methodname>MongoCollection::aggregateCursor</methodname>.
-       </para>
-      </listitem>
-      <listitem>
-       <para><literal>"explain"</literal></para>
-       <para>Return information on the processing of the pipeline.</para>
-      </listitem>
-      &mongo.command.parameters.maxtimems;
-     </itemizedlist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <para>Or</para>
-  <variablelist>
-   <varlistentry>
-    <term><parameter>op</parameter></term>
-    <listitem>
-     <para>
-      First pipeline operator.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ops</parameter></term>
-    <listitem>
-     <para>
-      Additional pipeline operators.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The result of the aggregation as an array. The <varname>ok</varname> will
-   be set to <literal>1</literal> on success, <literal>0</literal> on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When an error occurs an array with the following keys will be returned:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      <varname>errmsg</varname> - containing the reason for the failure
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <varname>code</varname> - the errorcode of the failure
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <varname>ok</varname> - will be set to 0.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.5.0</entry>
-      <entry>
-       Added optional <parameter>options</parameter> argument
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongocollection.aggregate.example.basic">
-   <title><methodname>MongoCollection::aggregate</methodname> example</title>
-   <para>
-    The following example aggregation operation pivots data to create a set of
-    author names grouped by tags applied to an article. Call the aggregation
-    framework by issuing the following command:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("localhost");
-$c = $m->selectDB("examples")->selectCollection("article");
-$data = array (
-    'title' => 'this is my title',
-    'author' => 'bob',
-    'posted' => new MongoDate,
-    'pageViews' => 5,
-    'tags' => array ( 'fun', 'good', 'fun' ),
-    'comments' => array (
-      array (
-        'author' => 'joe',
-        'text' => 'this is cool',
-      ),
-      array (
-        'author' => 'sam',
-        'text' => 'this is bad',
-      ),
-    ),
-    'other' =>array (
-      'foo' => 5,
-    ),
-);
-$d = $c->insert($data, array("w" => 1));
-
-$ops = array(
-    array(
-        '$project' => array(
-            "author" => 1,
-            "tags"   => 1,
-        )
-    ),
-    array('$unwind' => '$tags'),
-    array(
-        '$group' => array(
-            "_id" => array("tags" => '$tags'),
-            "authors" => array('$addToSet' => '$author'),
-        ),
-    ),
-);
-$results = $c->aggregate($ops);
-var_dump($results);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["result"]=>
-  array(2) {
-    [0]=>
-    array(2) {
-      ["_id"]=>
-      array(1) {
-        ["tags"]=>
-        string(4) "good"
-      }
-      ["authors"]=>
-      array(1) {
-        [0]=>
-        string(3) "bob"
-      }
-    }
-    [1]=>
-    array(2) {
-      ["_id"]=>
-      array(1) {
-        ["tags"]=>
-        string(3) "fun"
-      }
-      ["authors"]=>
-      array(1) {
-        [0]=>
-        string(3) "bob"
-      }
-    }
-  }
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-
-  <para>
-   The following examples use the <link xlink:href="&url.mongodb.examples.zipcode;">zipcode data set</link>.
-   Use mongoimport to load this data set into your mongod instance.
-  </para>
-
-  <example xml:id="mongocollection.aggregate.example.zipcode.population">
-   <title><methodname>MongoCollection::aggregate</methodname> example</title>
-   <para>
-    To return all states with a population greater than 10 million, use the following aggregation operation:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("localhost");
-$c = $m->selectDB("test")->selectCollection("zips");
-
-$pipeline = array(
-    array(
-        '$group' => array(
-            '_id' => array('state' => '$state'),
-            'totalPop' => array('$sum' => '$pop')
-        )
-    ),
-    array(
-        '$match' => array(
-            'totalPop' => array('$gte' => 10 * 1000 * 1000)
-        )
-    ),
-);
-$out = $c->aggregate($pipeline);
-var_dump($out);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["result"]=>
-  array(7) {
-    [0]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "TX"
-      ["totalPop"]=>
-      int(16986510)
-    }
-    [1]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "PA"
-      ["totalPop"]=>
-      int(11881643)
-    }
-    [2]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "NY"
-      ["totalPop"]=>
-      int(17990455)
-    }
-    [3]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "IL"
-      ["totalPop"]=>
-      int(11430602)
-    }
-    [4]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "CA"
-      ["totalPop"]=>
-      int(29760021)
-    }
-    [5]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "OH"
-      ["totalPop"]=>
-      int(10847115)
-    }
-    [6]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "FL"
-      ["totalPop"]=>
-      int(12937926)
-    }
-  }
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-
-  <example xml:id="mongocollection.aggregate.example.zipcode.population.average">
-   <title><methodname>MongoCollection::aggregate</methodname> example</title>
-   <para>
-    To return the average populations for cities in each state, use the following aggregation operation:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$c = $m->selectDB("test")->selectCollection("zips");
-
-$out = $c->aggregate(
-    array(
-        '$group' => array(
-            '_id' => array('state' => '$state', 'city' => '$city' ),
-            'pop' => array('$sum' => '$pop' )
-        )
-    ),
-    array(
-        '$group' => array(
-            '_id' => '$_id.state',
-            'avgCityPop' => array('$avg' => '$pop')
-        )
-    )
-);
-
-var_dump($out);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["result"]=>
-  array(51) {
-    [0]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "DC"
-      ["avgCityPop"]=>
-      float(303450)
-    }
-    [1]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "DE"
-      ["avgCityPop"]=>
-      float(14481.913043478)
-    }
-...
-    [49]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "WI"
-      ["avgCityPop"]=>
-      float(7323.0074850299)
-    }
-    [50]=>
-    array(2) {
-      ["_id"]=>
-      string(2) "WV"
-      ["avgCityPop"]=>
-      float(2759.1953846154)
-    }
-  }
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-
-  <example xml:id="mongocollection.aggregate.example.zipcode.explain">
-   <title><methodname>MongoCollection::aggregate</methodname> with command options</title>
-   <para>
-    To return information on how the pipeline will be processed we use the
-    <literal>explain</literal> command option:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$c = $m->selectDB("test")->selectCollection("zips");
-
-$pipeline = array(
-    array(
-        '$group' => array(
-            '_id' => '$state',
-           'totalPop' => array('$sum' => '$pop'),
-        ),
-    ),
-    array(
-        '$match' => array(
-            'totalPop' => array('$gte' => 10 * 1000 * 1000)
-        )
-    ),
-    array(
-        '$sort' => array("totalPop" => -1),
-    ),
-);
-
-$options = array("explain" => true);
-$out = $c->aggregate($pipeline, $options);
-var_dump($out);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["stages"]=>
-  array(4) {
-    [0]=>
-    array(1) {
-      ["$cursor"]=>
-      array(3) {
-        ["query"]=>
-        array(0) {
-        }
-        ["fields"]=>
-        array(3) {
-          ["pop"]=>
-          int(1)
-          ["state"]=>
-          int(1)
-          ["_id"]=>
-          int(0)
-        }
-        ["plan"]=>
-        array(4) {
-          ["cursor"]=>
-          string(11) "BasicCursor"
-          ["isMultiKey"]=>
-          bool(false)
-          ["scanAndOrder"]=>
-          bool(false)
-          ["allPlans"]=>
-          array(1) {
-            [0]=>
-            array(3) {
-              ["cursor"]=>
-              string(11) "BasicCursor"
-              ["isMultiKey"]=>
-              bool(false)
-              ["scanAndOrder"]=>
-              bool(false)
-            }
-          }
-        }
-      }
-    }
-    [1]=>
-    array(1) {
-      ["$group"]=>
-      array(2) {
-        ["_id"]=>
-        string(6) "$state"
-        ["totalPop"]=>
-        array(1) {
-          ["$sum"]=>
-          string(4) "$pop"
-        }
-      }
-    }
-    [2]=>
-    array(1) {
-      ["$match"]=>
-      array(1) {
-        ["totalPop"]=>
-        array(1) {
-          ["$gte"]=>
-          int(10000000)
-        }
-      }
-    }
-    [3]=>
-    array(1) {
-      ["$sort"]=>
-      array(1) {
-        ["sortKey"]=>
-        array(1) {
-          ["totalPop"]=>
-          int(-1)
-        }
-      }
-    }
-  }
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCollection::aggregateCursor</methodname></member>
-   <member>The MongoDB <link xlink:href="&url.mongodb.docs.aggregation;">aggregation framework</link></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/aggregatecursor.xml b/reference/mongo/mongocollection/aggregatecursor.xml
deleted file mode 100644
index 2ee38d5364..0000000000
--- a/reference/mongo/mongocollection/aggregatecursor.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.aggregatecursor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::aggregateCursor</refname>
-  <refpurpose>Execute an aggregation pipeline command and retrieve results through a cursor</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCommandCursor</type><methodname>MongoCollection::aggregateCursor</methodname>
-   <methodparam><type>array</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   With this method you can execute Aggregation Framework pipelines and
-   retrieve the results through a cursor, instead of getting just one document
-   back as you would with <methodname>MongoCollection::aggregate</methodname>.
-   This method returns a <classname>MongoCommandCursor</classname> object.
-   This cursor object implements the <classname>Iterator</classname> interface
-   just like the <classname>MongoCursor</classname> objects that are returned
-   by the <methodname>MongoCollection::find</methodname> method.
-  </para>
-  <note>
-   <simpara>
-    The resulting <classname>MongoCommandCursor</classname> will inherit this
-    collection's read preference.
-    <methodname>MongoCommandCursor::setReadPreference</methodname> may be used
-    to change the read preference before iterating on the cursor.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>pipeline</parameter>
-     </term>
-     <listitem>
-      <para>
-       The Aggregation Framework pipeline to execute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>Options for the aggregation command. Valid options include:</para>
-      <itemizedlist>
-       <listitem>
-        <para><literal>"allowDiskUse"</literal></para>
-        <para>Allow aggregation stages to write to temporary files</para>
-       </listitem>
-       <listitem>
-        <para><literal>"cursor"</literal></para>
-        <para>
-         It is possible to configure how many initial documents the server
-         should return with the first result set. The default initial batch size
-         is <literal>101</literal>. You can change it by adding the
-         <literal>batchSize</literal> option:
-        </para>
-        <programlisting role="php">
-<![CDATA[
-<?php
-$collection->aggregateCursor( 
-    $pipeline,
-    [ "cursor" => [ "batchSize" => 4 ] ]
-);
-]]>
-        </programlisting>
-        <para>
-         This option only configures the size of the first batch. To configure
-         the size of future batches, please use the
-         <methodname>MongoCommandCursor::batchSize</methodname> method on the
-         returned <classname>MongoCommandCursor</classname> object.
-        </para>
-       </listitem>
-       <listitem>
-        <para><literal>"explain"</literal></para>
-        <para>
-         Return information on the processing of the pipeline. This option may
-         cause the command to return a result document that is unsuitable for
-         constructing a <classname>MongoCommandCursor</classname>. If you need
-         to use this option, you should consider using
-         <methodname>MongoCollection::aggregate</methodname>.
-        </para>
-       </listitem>
-       &mongo.command.parameters.maxtimems;
-      </itemizedlist>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns a <classname>MongoCommandCursor</classname> object. Because this
-   implements the <classname>Iterator</classname> interface you can 
-   iterate over each of the results as returned by the command query. The
-   <classname>MongoCommandCursor</classname> also implements the
-   <classname>MongoCursorInterface</classname> interface which adds the
-   <methodname>MongoCommandCursor::batchSize</methodname>,
-   <methodname>MongoCommandCursor::dead</methodname>,
-   <methodname>MongoCommandCursor::info</methodname> methods.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::aggregateCursor</function> example</title>
-   <para>
-    Finding all of the distinct values for a key.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$db = $m->test;
-$people = $db->people;
-$people->drop();
-
-$people->insert(array("name" => "Joe", "points" => 4));
-$people->insert(array("name" => "Molly", "points" => 43));
-$people->insert(array("name" => "Sally", "points" => 22));
-$people->insert(array("name" => "Joe", "points" => 22));
-$people->insert(array("name" => "Molly", "points" => 87));
-
-$ages = $people->aggregateCursor( [
-        [ '$group' => [ '_id' => '$name', 'points' => [ '$sum' => '$points' ] ] ],
-        [ '$sort' => [ 'points' => -1 ] ],
-] );
-
-foreach ($ages as $person) {
-    echo "{$person['_id']}: {$person['points']}\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-Molly: 130
-Joe: 26
-Sally: 22
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoCollection::aggregateCursor</function>
-   example with different initial batch size</title>
-   <para>
-    Finding all of the distinct values for a key.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$db = $m->test;
-$people = $db->people;
-$people->drop();
-
-/* Insert some sample data */
-$people->insert(array("name" => "Joe", "points" => 4));
-$people->insert(array("name" => "Molly", "points" => 43));
-$people->insert(array("name" => "Sally", "points" => 22));
-$people->insert(array("name" => "Joe", "points" => 22));
-$people->insert(array("name" => "Molly", "points" => 87));
-
-/* Run the command cursor */
-$ages = $people->aggregateCursor(
-    [
-        [ '$group' => [ '_id' => '$name', 'points' => [ '$sum' => '$points' ] ] ],
-        [ '$sort' => [ 'points' => -1 ] ],
-    ],
-    [ "cursor" => [ "batchSize" => 4 ] ]
-);
-
-foreach ($ages as $person) {
-    echo "{$person['_id']}: {$person['points']}\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-Molly: 130
-Joe: 26
-Sally: 22
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoDB::command</methodname></member>
-    <member><classname>MongoCommandCursor</classname></member>
-    <member><methodname>MongoCommandCursor::batchSize</methodname></member>
-    <member><methodname>MongoCollection::aggregate</methodname></member>
-    <member>The MongoDB <link xlink:href="&url.mongodb.docs.aggregation;">aggregation framework</link></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/batchinsert.xml b/reference/mongo/mongocollection/batchinsert.xml
deleted file mode 100644
index 7ed8e984c0..0000000000
--- a/reference/mongo/mongocollection/batchinsert.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.batchinsert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::batchInsert</refname>
-  <refpurpose>Inserts multiple documents into this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoCollection::batchInsert</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>a</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of arrays or objects. If any objects are used, they may not have
-       protected or private properties.
-      </para>
-      <note>
-       <para>
-        If the documents to insert do not have an <literal>_id</literal> key or
-        property, a new <classname>MongoId</classname> instance will be created
-        and assigned to it. See <function>MongoCollection::insert</function> for
-        additional information on this behavior.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the batch of insert operations. Currently
-       available options include:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>"continueOnError"</literal>
-         </para>
-         <para>
-          Boolean, defaults to &false;. If set, the database will not stop
-          processing a bulk insert if one fails (eg due to duplicate IDs).
-          This makes bulk insert behave similarly to a series of single
-          inserts, except that calling <function>MongoDB::lastError</function>
-          will have an error set if any insert fails, not just the last one.
-          If multiple errors occur, only the most recent will be reported by
-          <function>MongoDB::lastError</function>.
-         </para>
-         <note>
-          <para>
-           Please note that <literal>continueOnError</literal> affects errors
-           on the database side only. If you try to insert a document that has
-           errors (for example it contains a key with an empty name), then the
-           document is not even transferred to the database as the driver
-           detects this error and bails out.
-           <literal>continueOnError</literal> has no effect on errors detected
-           in the documents by the driver.
-          </para>
-         </note>
-        </listitem>
-        &mongo.writes.parameters.fsync;
-        &mongo.writes.parameters.journal;
-        &mongo.writes.parameters.sockettimeoutms;
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-        &mongo.writes.parameters.writeconcerntimeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   If the <literal>w</literal> parameter is set to acknowledge the write,
-   returns an associative array with the status of the inserts ("ok") and any
-   error that may have occurred ("err").  Otherwise, returns &true; if the
-   batch insert was successfully sent, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoException</classname> if any inserted documents are
-   empty or if they contains zero-length keys. Attempting to insert an object
-   with protected and private properties will cause a zero-length key error.
-  </para>
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added the <literal>"wTimeoutMS"</literal> option, which replaces
-         <literal>"wtimeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"wtimeout"</literal> is used.
-        </para>
-        <para>
-         Added the <literal>"socketTimeoutMS"</literal> option, which replaces
-         <literal>"timeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"timeout"</literal> is used.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when <literal>"safe"</literal>
-         is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.4</entry>
-       <entry>Added <literal>"wtimeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>Added <literal>"w"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.7</entry>
-       <entry>Added <literal>"continueOnError"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.9</entry>
-       <entry>
-        <para>
-         Added ability to pass integers to the <literal>"safe"</literal> option,
-         which previously only accepted booleans.
-        </para>
-        <para>
-         Added <literal>"fsync"</literal> option.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.5</entry>
-       <entry>Added <parameter>options</parameter> parameter.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::batchInsert</function> example</title>
-   <para>
-    Batch insertion is a quick way to add many elements to the database at once
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$users = array();
-for ($i = 0; $i<100; $i++) {
-  $users[] = array('username' => 'user'.$i, 'i' => $i);
-}
-
-$mongo = new MongoClient();
-$collection = $mongo->my_db->users;
-$collection->drop();
-
-$collection->batchInsert($users);
-
-foreach ($users as $user) {
-  echo $user['_id']."\n"; // populated with instanceof MongoId
-}
-
-$users = $collection->find()->sort(array('i' => 1));
-foreach ($users as $user) {
-    var_dump($user['username']);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-4bf43ac68ead0e1971000000
-4bf43ac68ead0e1971010000
-4bf43ac68ead0e1971020000
-...
-string(5) "user1"
-string(5) "user2"
-string(5) "user3"
-...
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoCollection::batchInsert</function> example with
-   ignoring errors</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$con = new Mongo;
-$db = $con->demo;
-
-$doc1 = array(
-        '_id' => new MongoId('4cb4ab6d7addf98506010001'),
-        'id' => 1,
-        'desc' => "ONE",
-);
-$doc2 = array(
-        '_id' => new MongoId('4cb4ab6d7addf98506010002'),
-        'id' => 2,
-        'desc' => "TWO",
-);
-$doc3 = array(
-        '_id' => new MongoId('4cb4ab6d7addf98506010002'), // same _id as above
-        'id' => 3,
-        'desc' => "THREE",
-);
-$doc4 = array(
-        '_id' => new MongoId('4cb4ab6d7addf98506010004'),
-        'id' => 4,
-        'desc' => "FOUR",
-);
-
-$c = $db->selectCollection('c');
-$c->batchInsert(
-    array($doc1, $doc2, $doc3, $doc4),
-    array('continueOnError' => true)
-);
-
-$docs = $c->find();
-foreach ($docs as $doc) {
-    var_dump($doc['desc']);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "ONE"
-string(3) "TWO"
-string(4) "FOUR"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCollection::insert</function></member>
-   <member><function>MongoCollection::update</function></member>
-   <member><function>MongoCollection::find</function></member>
-   <member><function>MongoCollection::remove</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.insert;">insert</link>.</member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/construct.xml b/reference/mongo/mongocollection/construct.xml
deleted file mode 100644
index fcc9df9d25..0000000000
--- a/reference/mongo/mongocollection/construct.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::__construct</refname>
-  <refpurpose>Creates a new collection</refpurpose>
- </refnamediv>
-
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoCollection::__construct</methodname>
-   <methodparam><type>MongoDB</type><parameter>db</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <type>MongoDB</type>
-      <parameter>db</parameter>
-     </term>
-     <listitem>
-      <para>
-       Parent database.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       Name for this collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws default exception if the collection name is invalid.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/count.xml b/reference/mongo/mongocollection/count.xml
deleted file mode 100644
index 6932118b61..0000000000
--- a/reference/mongo/mongocollection/count.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::count</refname>
-  <refpurpose>Counts the number of documents in this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoCollection::count</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       Associative array or object with fields to match.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the index creation. Currently available options
-       include:
-       <informaltable>
-        <tgroup cols="3">
-         <thead>
-          <row>
-           <entry>&Name;</entry>
-           <entry>&Type;</entry>
-           <entry>&Description;</entry>
-          </row>
-         </thead>
-         <tbody>
-          <row>
-           <entry><varname>hint</varname></entry>
-           <entry><type>mixed</type></entry>
-           <entry>
-            <para>
-             Index to use for the query. If a string is passed, it should
-             correspond to an index name. If an array or object is passed, it
-             should correspond to the specification used to create the index
-             (i.e. the first argument to
-             <function>MongoCollection::createIndex</function>).
-            </para>
-            <simpara>This option is only supported in MongoDB 2.6+.</simpara>
-           </entry>
-          </row>
-          <row>
-           <entry><varname>limit</varname></entry>
-           <entry><type>int</type></entry>
-           <entry>The maximum number of matching documents to return.</entry>
-          </row>
-          <row>
-           <entry><varname>maxTimeMS</varname></entry>
-           <entry><type>int</type></entry>
-           <entry>
-            <para>
-             Specifies a cumulative time limit in milliseconds for processing
-             the operation (does not include idle time). If the operation is not
-             completed within the timeout period, a
-             <classname>MongoExecutionTimeoutException</classname> will be
-             thrown.
-            </para>
-            <simpara>This option is only supported in MongoDB 2.6+.</simpara>
-           </entry>
-          </row>
-          <row>
-           <entry><varname>skip</varname></entry>
-           <entry><type>int</type></entry>
-           <entry>The number of matching documents to skip before returning results.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </informaltable>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of documents matching the query.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoResultException</classname> if the server could not
-   execute the command due to an error.
-  </para>
-  <para>
-   Throws <classname>MongoExecutionTimeoutException</classname> if command
-   execution was terminated due to <varname>maxTimeMS</varname>.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.6.0</entry>
-       <entry>
-        The second parameter is now an <parameter>options</parameter> array.
-        Passing <parameter>limit</parameter> and <parameter>skip</parameter> as
-        the second and third parameters, respectively, is deprecated.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.7</entry>
-       <entry>
-        Added <parameter>limit</parameter> and <parameter>skip</parameter> as
-        second and third parameters, respectively.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array('x'=>1));
-$collection->insert(array('x'=>2));
-$collection->insert(array('x'=>3));
-
-var_dump($collection->count());
-var_dump($collection->count(array('x'=>1)));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/createdbref.xml b/reference/mongo/mongocollection/createdbref.xml
deleted file mode 100644
index 9bbdfe16e2..0000000000
--- a/reference/mongo/mongocollection/createdbref.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.createdbref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::createDBRef</refname>
-  <refpurpose>Creates a database reference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::createDBRef</methodname>
-   <methodparam><type>mixed</type><parameter>document_or_id</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>document_or_id</parameter>
-     </term>
-     <listitem>
-      <para>
-       If an array or object is given, its <literal>_id</literal> field will be
-       used as the reference ID. If a <classname>MongoId</classname> or scalar
-       is given, it will be used as the reference ID.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a database reference array.
-  </para>
-  <para>
-   If an array without an <literal>_id</literal> field was provided as the
-   <literal>document_or_id</literal> parameter, &null; will be returned.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCollection::createDBRef</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$songs = $db->songs;
-$playlists = $db->playlists;
-
-// create a reference to a song
-$manamana = $songs->findOne(array('title' => 'Ma na ma na'));
-$refToSong = $songs->createDBRef($manamana);
-
-// add the reference to my playlist
-$playlists->update(array('username' => 'me'), array('$push' => array('songlist' => $refToSong)));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoCollection::getDBRef</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/createindex.xml b/reference/mongo/mongocollection/createindex.xml
deleted file mode 100644
index 9af054beca..0000000000
--- a/reference/mongo/mongocollection/createindex.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.createindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::createIndex</refname>
-  <refpurpose>
-   Creates an index on the specified field(s) if it does not already exist
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCollection::createIndex</methodname>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates an index on the specified field(s) if it does not already exist.
-   Fields may be indexed with a direction (e.g. ascending or descending) or a
-   special type (e.g. text, geospatial, hashed).
-  </para>
-  <note>
-   <para>
-    This method will use the
-    <link xlink:href="&url.mongodb.docs.command;createIndexes">createIndexes</link>
-    database command when communicating with MongoDB 2.6+. For previous database
-    versions, the method will perform an insert operation on the
-    special <literal>system.indexes</literal> collection.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>keys</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array specifying the index's fields as its keys. For each field, the
-       value is either the index direction or
-       <link xlink:href="&url.mongodb.dochub.indexes.types;">index type</link>.
-       If specifying direction, specify <literal>1</literal> for ascending or
-       <literal>-1</literal> for descending.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the index creation. We pass all given options
-       straight to the server, but a non-exhaustive list of currently
-       available options include:
-       <itemizedlist>
-        &mongo.index.parameters.unique;
-        &mongo.index.parameters.sparse;
-        &mongo.index.parameters.expireafterseconds;
-        &mongo.index.parameters.name;
-        &mongo.index.parameters.background;
-        &mongo.writes.parameters.sockettimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following option may be used with MongoDB 2.6+:
-       <itemizedlist>
-        &mongo.command.parameters.maxtimems;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options may be used with MongoDB versions before 2.8:
-       <itemizedlist>
-        &mongo.index.parameters.dropdups;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options may be used with MongoDB versions before 2.6:
-       <itemizedlist>
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-        &mongo.writes.parameters.writeconcerntimeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the index creation. The array
-   contains whether the operation succeeded (<literal>"ok"</literal>), the
-   number of indexes before and after the operation
-   (<literal>"numIndexesBefore"</literal> and
-   <literal>"numIndexesAfter"</literal>), and whether the collection that the
-   index belongs to has been created
-   (<literal>"createdCollectionAutomatically"</literal>). If the index already
-   existed and did not need to be created, a <literal>"note"</literal> field may
-   be present in lieu of <literal>"numIndexesAfter"</literal>.
-  </para>
-  <para>
-   With MongoDB 2.4 and earlier, a status document is only returned if the
-   <link linkend="mongo.writeconcerns">write concern</link> is at least
-   <literal>1</literal>. Otherwise, &true; is returned. The fields in the status
-   document are different, except for the <literal>"ok"</literal> field, which
-   signals whether the index creation was successful. Additional fields are
-   described in the documentation for
-   <function>MongoCollection::insert</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoException</classname> if the index name is longer
-   than 128 bytes, or if the index specification is not an array.
-  </para>
-  <para>
-   Throws <classname>MongoDuplicateKeyException</classname> if the server could not
-   create the unique index due to conflicting documents.
-  </para>
-  <para>
-   Throws <classname>MongoResultException</classname> if the server could not
-   create the index due to an error.
-  </para>
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::createIndex</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c = new MongoCollection($db, 'foo');
-
-// create an index on 'x' ascending
-$c->createIndex(array('x' => 1));
-
-// create a unique index on 'y'
-$c->createIndex(array('y' => 1), array('unique' => true));
-
-// create a compound index on 'za' ascending and 'zb' descending
-$c->createIndex(array('za' => 1, 'zb' => -1));
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Geospatial Indexing</title>
-   <para>
-    Mongo supports geospatial indexes, which allow you to search for documents
-    near a given location or within a shape. The following example creates a
-    geospatial index on the <literal>"loc"</literal> field:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->createIndex(array('loc' => '2dsphere'));
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Drop duplicates example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array('username' => 'joeschmoe'));
-$collection->insert(array('username' => 'joeschmoe'));
-
-/* Index creation fails, since you cannot create a unique index on a field when
- * duplicates exist.
- */
-$collection->createIndex(array('username' => 1), array('unique' => 1));
-
-/* MongoDB will one of the conflicting documents and allow the unique index to
- * be created.
- */
-$collection->createIndex(array('username' => 1), array('unique' => 1, 'dropDups' => 1));
-
-/* We now have a unique index and subsequent inserts with the same username will
- * fail.
- */
-$collection->insert(array('username' => 'joeschmoe'));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCollection::deleteIndex</methodname></member>
-   <member><methodname>MongoCollection::deleteIndexes</methodname></member>
-   <member>
-    The MongoDB
-    <link xlink:href="&url.mongodb.dochub.indexes;">index</link> and
-    <link xlink:href="&url.mongodb.dochub.indexes.types;">index type</link>
-    documentation.
-   </member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/deleteindex.xml b/reference/mongo/mongocollection/deleteindex.xml
deleted file mode 100644
index 3495edd188..0000000000
--- a/reference/mongo/mongocollection/deleteindex.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.deleteindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::deleteIndex</refname>
-  <refpurpose>Deletes an index from this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::deleteIndex</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>keys</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is identical to:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-public function deleteIndexes($keys) {
-  $indexName = $this->toIndexString($keys);
-
-  return $this->db->command(array(
-    "deleteIndexes" => $this->getName(),
-    "index" => $indexName,
-  ));
-}
-
-?>
-]]>
-  </programlisting>
-  <para>
-   Each index is given a unique name when it is created. This is often generated
-   by the driver based on the index key(s) and order/type, but custom names may
-   also be specified with <function>MongoCollection::createIndex</function>'s
-   <literal>"name"</literal> option).
-  </para>
-  <para>
-   Unfortunately, <function>MongoCollection::deleteIndex</function> cannot
-   delete custom-named indexes due to a backwards compatibility issue. When a
-   string argument is provided, it is assumed to be the single field name in an
-   ascending index (e.g. the name <literal>"x_1"</literal> would be used for the
-   argument <literal>"x"</literal>). If an array or object is provided, an index
-   name is generated just as if that argument was passed to
-   <function>MongoCollection::createIndex</function>.
-  </para>
-  <para>
-   In order to delete a custom-named index with the PHP driver, the
-   <literal>deleteIndexes</literal> database command must be used. For instance,
-   an index named "myIndex" could be deleted with the PHP driver by running:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$db->command(array(
-  "deleteIndexes" => $collection->getName(),
-  "index" => "myIndex",
-));
-
-?>
-]]>
-  </programlisting>
-  <para>
-   To determine the name of an index with the PHP driver, you can query the
-   <literal>system.indexes</literal> collection of a database and look for the
-   <literal>"name"</literal> field of each result. The <literal>"ns"</literal>
-   field will indicate the collection to which each index belongs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>keys</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array specifying the index's fields as its keys. For each field, the
-       value is either the index direction or
-       <link xlink:href="&url.mongodb.dochub.indexes.types;">index type</link>.
-       If specifying direction, specify <literal>1</literal> for ascending or
-       <literal>-1</literal> for descending.
-      </para>
-      <para>
-       If a string is provided, it is assumed to be the single field name in an
-       ascending index.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::deleteIndex</function> example</title>
-   <para>
-    This example passes the function string and array parameters.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$c = $m->example->indices;
-
-// create and remove a simple index
-$c->createIndex(array("i"=>1));
-$c->deleteIndex("i");
-
-// create and remove a multi-key index
-$c->ensureIndex(array("j" => 1, "k" => 1));
-$c->deleteIndex(array("j" => 1, "k" => 1));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCollection::createIndex</methodname></member>
-   <member><methodname>MongoCollection::deleteIndexes</methodname></member>
-   <member><methodname>MongoCollection::toIndexString</methodname></member>
-   <member>
-    The MongoDB
-    <link xlink:href="&url.mongodb.dochub.indexes;">index</link> and
-    <link xlink:href="&url.mongodb.dochub.indexes.types;">index type</link>
-    documentation.
-   </member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/deleteindexes.xml b/reference/mongo/mongocollection/deleteindexes.xml
deleted file mode 100644
index 37c4c7b14e..0000000000
--- a/reference/mongo/mongocollection/deleteindexes.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.deleteindexes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <refnamediv>
-  <refname>MongoCollection::deleteIndexes</refname>
-  <refpurpose>Delete all indices for this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::deleteIndexes</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::deleteIndexes</function> example</title>
-   <para>This example demonstrates how to delete all indexes from a collection and the response to expect.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection = $mongo->my_db->articles;
-$response = $collection->deleteIndexes();
-print_r($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [nIndexesWas] => 1
-    [msg] => all indexes deleted for collection
-    [ok] => 1
-)
-]]>
-   </screen>   
-  </example>  
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCollection::createIndex</methodname></member>
-   <member><methodname>MongoCollection::deleteIndex</methodname></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/distinct.xml b/reference/mongo/mongocollection/distinct.xml
deleted file mode 100644
index 4a1b70c140..0000000000
--- a/reference/mongo/mongocollection/distinct.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongocollection.distinct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::distinct</refname>
-  <refpurpose>Retrieve a list of distinct values for the given key across a collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>MongoCollection::distinct</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The distinct command returns a list of distinct values for the given key
-   across a collection. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      The key to use.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      An optional query parameters 
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of distinct values, &return.falseforfailure;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongocollection.distinct.basic">
-   <title><methodname>MongoCollection::distinct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Mongo;
-$db = $m->selectDB("test");
-$db->dropCollection("distinct");
-$c = $db->distinct;
-
-$c->insert(array("stuff" => "bar", "zip-code" => 10010));
-$c->insert(array("stuff" => "foo", "zip-code" => 10010));
-$c->insert(array("stuff" => "bar", "zip-code" => 99701), array("w" => 1));
-
-$retval = $c->distinct("zip-code");
-var_dump($retval);
-
-$retval = $c->distinct("zip-code", array("stuff" => "foo"));
-var_dump($retval);
-
-$retval = $c->distinct("zip-code", array("stuff" => "bar"));
-var_dump($retval);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  int(10010)
-  [1]=>
-  int(99701)
-}
-array(1) {
-  [0]=>
-  int(10010)
-}
-array(2) {
-  [0]=>
-  int(10010)
-  [1]=>
-  int(99701)
-}
-]]>
-   </screen>
-  </example>
-  <example xml:id="mongocollection.distinct.basic-embedded">
-   <title><methodname>MongoCollection::distinct</methodname> example on a embedded document</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$c->insert(array("user" => array("points" => 25)));
-$c->insert(array("user" => array("points" => 31)));
-$c->insert(array("user" => array("points" => 25)));
-
-$retval = $c->distinct("user.points");
-var_dump($retval);
-
-$retval = $c->distinct("user.nonexisting");
-var_dump($retval);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  int(25)
-  [1]=>
-  int(31)
-}
-array(0) {
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/drop.xml b/reference/mongo/mongocollection/drop.xml
deleted file mode 100644
index c7a20890f0..0000000000
--- a/reference/mongo/mongocollection/drop.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.drop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::drop</refname>
-  <refpurpose>Drops this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::drop</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Drops this collection and deletes its indices.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::drop</function> example</title>
-   <para>This example demonstrates how to drop a collection and the response to expect.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection = $mongo->my_db->articles;
-$response = $collection->drop();
-print_r($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [nIndexesWas] => 1
-    [msg] => all indexes deleted for collection
-    [ns] => my_db.articles
-    [ok] => 1
-)
-]]>
-   </screen>   
-  </example>  
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/ensureindex.xml b/reference/mongo/mongocollection/ensureindex.xml
deleted file mode 100644
index 700df2d907..0000000000
--- a/reference/mongo/mongocollection/ensureindex.xml
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.ensureindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::ensureIndex</refname>
-  <refpurpose>
-   Creates an index on the specified field(s) if it does not already exist
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCollection::ensureIndex</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key|keys</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <warning>
-   <para>
-    This method is deprecated since version 1.5.0. Please use
-    <methodname>MongoCollection::createIndex</methodname> instead.
-   </para>
-  </warning>
-  <para>
-   Creates an index on the specified field(s) if it does not already exist.
-   Fields may be indexed with a direction (e.g. ascending or descending) or a
-   special type (e.g. text, geospatial, hashed).
-  </para>
-  <note>
-   <para>
-    This method will use the
-    <link xlink:href="&url.mongodb.docs.command;createIndexes">createIndexes</link>
-    database command when communicating with MongoDB 2.6+. For previous database
-    versions, the method will perform an insert operation on the
-    special <literal>system.indexes</literal> collection.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>keys</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array specifying the index's fields as its keys. For each field, the
-       value is either the index direction or
-       <link xlink:href="&url.mongodb.dochub.indexes.types;">index type</link>.
-       If specifying direction, specify <literal>1</literal> for ascending or
-       <literal>-1</literal> for descending.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the index creation. Currently available options
-       include:
-       <itemizedlist>
-        &mongo.index.parameters.unique;
-        &mongo.index.parameters.sparse;
-        &mongo.index.parameters.expireafterseconds;
-        &mongo.index.parameters.name;
-        &mongo.index.parameters.background;
-        &mongo.writes.parameters.sockettimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following option may be used with MongoDB 2.6+:
-       <itemizedlist>
-        &mongo.command.parameters.maxtimems;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options may be used with MongoDB versions before 2.8:
-       <itemizedlist>
-        &mongo.index.parameters.dropdups;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options may be used with MongoDB versions before 2.6:
-       <itemizedlist>
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-        &mongo.writes.parameters.writeconcerntimeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the index creation. The array
-   contains whether the operation succeeded (<literal>"ok"</literal>), the
-   number of indexes before and after the operation
-   (<literal>"numIndexesBefore"</literal> and
-   <literal>"numIndexesAfter"</literal>), and whether the collection that the
-   index belongs to has been created
-   (<literal>"createdCollectionAutomatically"</literal>). If the index already
-   existed and did not need to be created, a <literal>"note"</literal> field may
-   be present in lieu of <literal>"numIndexesAfter"</literal>.
-  </para>
-  <para>
-   With MongoDB 2.4 and earlier, a status document is only returned if the
-   <link linkend="mongo.writeconcerns">write concern</link> is at least
-   <literal>1</literal>. Otherwise, &true; is returned. The fields in the status
-   document are different, except for the <literal>"ok"</literal> field, which
-   signals whether the index creation was successful. Additional fields are
-   described in the documentation for
-   <function>MongoCollection::insert</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Renamed the <literal>"wtimeout"</literal> option to
-         <literal>"wTimeoutMS"</literal>. Emits
-         <constant>E_DEPRECATED</constant> when <literal>"wtimeout"</literal> is
-         used.
-        </para>
-        <para>
-         Renamed the <literal>"timeout"</literal> option to
-         <literal>"socketTimeoutMS"</literal>. Emits
-         <constant>E_DEPRECATED</constant> when <literal>"timeout"</literal> is
-         used.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when <literal>"safe"</literal>
-         is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.4</entry>
-       <entry>Added <literal>"wtimeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        <para>Added <literal>"w"</literal> option.</para>
-        <para>
-         The <parameter>options</parameter> parameter no longer accepts a
-         boolean to signify a unique index. Instead, this now has to be done
-         with <literal>array('unique' => true)</literal>.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when
-        <parameter>options</parameter> is <type>scalar</type>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>Added <literal>"timeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.11</entry>
-       <entry>
-        <para>
-         The <literal>"safe"</literal> option will trigger a primary failover,
-         if necessary.
-        </para>
-        <para>
-         <classname>MongoException</classname> will be thrown if the index name
-         (either generated or set) is longer than 128 bytes.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.5</entry>
-       <entry>
-        Added the <literal>"name"</literal> option to override index name
-        creation.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.2</entry>
-       <entry>
-        Changed <parameter>options</parameter> parameter from boolean to array.
-        Pre-1.0.2, the second parameter was an optional boolean value specifying
-        a unique index.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoException</classname> if the index name is longer
-   than 128 bytes, or if the index specification is not an array.
-  </para>
-  <para>
-   Throws <classname>MongoDuplicateKeyException</classname> if the server could not
-   create the unique index due to conflicting documents.
-  </para>
-  <para>
-   Throws <classname>MongoResultException</classname> if the server could not
-   create the index due to an error.
-  </para>
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::ensureIndex</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c = new MongoCollection($db, 'foo');
-
-// create an index on 'x' ascending
-$c->ensureIndex(array('x' => 1));
-
-// create a unique index on 'y'
-$c->ensureIndex(array('y' => 1), array('unique' => true));
-
-// create a compound index on 'za' ascending and 'zb' descending
-$c->ensureIndex(array('za' => 1, 'zb' => -1));
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Geospatial Indexing</title>
-   <para>
-    Mongo supports geospatial indexes, which allow you to search for documents
-    near a given location or within a shape. The following example creates a
-    geospatial index on the <literal>"loc"</literal> field:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->ensureIndex(array('loc' => '2dsphere'));
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Drop duplicates example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array('username' => 'joeschmoe'));
-$collection->insert(array('username' => 'joeschmoe'));
-
-/* Index creation fails, since you cannot create a unique index on a field when
- * duplicates exist.
- */
-$collection->ensureIndex(array('username' => 1), array('unique' => 1));
-
-/* MongoDB will one of the conflicting documents and allow the unique index to
- * be created.
- */
-$collection->ensureIndex(array('username' => 1), array('unique' => 1, 'dropDups' => 1));
-
-/* We now have a unique index and subsequent inserts with the same username will
- * fail.
- */
-$collection->insert(array('username' => 'joeschmoe'));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCollection::createIndex</methodname></member>
-   <member><methodname>MongoCollection::deleteIndex</methodname></member>
-   <member><methodname>MongoCollection::deleteIndexes</methodname></member>
-   <member>
-    The MongoDB
-    <link xlink:href="&url.mongodb.dochub.indexes;">index</link> and
-    <link xlink:href="&url.mongodb.dochub.indexes.types;">index type</link>
-    documentation.
-   </member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/find.xml b/reference/mongo/mongocollection/find.xml
deleted file mode 100644
index 0c8f142707..0000000000
--- a/reference/mongo/mongocollection/find.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.find" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::find</refname>
-  <refpurpose>Queries this collection, returning a <classname>MongoCursor</classname>
-  for the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCollection::find</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>fields</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       The fields for which to search. MongoDB's query language is quite
-       extensive. The PHP driver will in almost all cases pass the query
-       straight through to the server, so reading the MongoDB core docs on
-       <link xlink:href="&url.mongodb.dochub.find;">find</link> is a good idea.
-      </para>
-      <warning>
-       <para>
-        Please make sure that for all special query operators (starting with
-        <literal>$</literal>) you use single quotes so that PHP doesn't try to
-        replace <literal>"$exists"</literal> with the value of the variable
-        <literal>$exists</literal>.
-       </para>
-      </warning>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>fields</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields of the results to return. The array is in the format
-       <literal>array('fieldname' => true, 'fieldname2' => true)</literal>.
-       The <literal>_id</literal> field is always returned.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a cursor for the search results.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-   <example>
-   <title><function>MongoCollection::find</function> example</title>
-   <para>This example demonstrates basic search options.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->selectDB('test');
-$collection = new MongoCollection($db, 'produce');
-
-// search for fruits
-$fruitQuery = array('Type' => 'Fruit');
-
-$cursor = $collection->find($fruitQuery);
-foreach ($cursor as $doc) {
-    var_dump($doc);
-}
-
-// search for produce that is sweet. Taste is a child of Details. 
-$sweetQuery = array('Details.Taste' => 'Sweet');
-echo "Sweet\n";
-$cursor = $collection->find($sweetQuery);
-foreach ($cursor as $doc) {
-    var_dump($doc);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(4) {
-  ["_id"]=>
-  object(MongoId)#7 (1) {
-    ["$id"]=>
-    string(24) "50a87dd084f045a19b220dd6"
-  }
-  ["Name"]=>
-  string(5) "Apple"
-  ["Type"]=>
-  string(5) "Fruit"
-  ["Details"]=>
-  array(2) {
-    ["Taste"]=>
-    string(5) "Sweet"
-    ["Colour"]=>
-    string(3) "Red"
-  }
-}
-array(4) {
-  ["_id"]=>
-  object(MongoId)#8 (1) {
-    ["$id"]=>
-    string(24) "50a87de084f045a19b220dd7"
-  }
-  ["Name"]=>
-  string(5) "Lemon"
-  ["Type"]=>
-  string(5) "Fruit"
-  ["Details"]=>
-  array(2) {
-    ["Taste"]=>
-    string(4) "Sour"
-    ["Colour"]=>
-    string(5) "Green"
-  }
-}
-
-Sweet:
-array(4) {
-  ["_id"]=>
-  object(MongoId)#7 (1) {
-    ["$id"]=>
-    string(24) "50a87dd084f045a19b220dd6"
-  }
-  ["Name"]=>
-  string(5) "Apple"
-  ["Type"]=>
-  string(5) "Fruit"
-  ["Details"]=>
-  array(2) {
-    ["Taste"]=>
-    string(5) "Sweet"
-    ["Colour"]=>
-    string(3) "Red"
-  }
-}
-]]>
-   </screen>
-   <para>
-     See <classname>MongoCursor</classname> for more information how to work with cursors.
-   </para>
-  </example>
-  <example>
-   <title><function>MongoCollection::find</function> example</title>
-   <para>This example demonstrates how to search for a range.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->selectDB('test');
-$collection = new MongoCollection($db, 'phpmanual');
-
-// search for documents where 5 < x < 20
-$rangeQuery = array('x' => array( '$gt' => 5, '$lt' => 20 ));
-
-$cursor = $collection->find($rangeQuery);
-foreach ($cursor as $doc) {
-    var_dump($doc);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["_id"]=>
-  object(MongoId)#10 (1) {
-    ["$id"]=>
-    string(24) "4ebc3e3710b89f2349000000"
-  }
-  ["x"]=>
-  int(12)
-}
-array(2) {
-  ["_id"]=>
-  object(MongoId)#11 (1) {
-    ["$id"]=>
-    string(24) "4ebc3e3710b89f2349000001"
-  }
-  ["x"]=>
-  int(12)
-}
-]]>
-   </screen>
-   <para>
-     See <classname>MongoCursor</classname> for more information how to work with cursors.
-   </para>
-  </example>
-  <example>
-   <title><function>MongoCollection::find</function> example using $where</title>
-   <para>This example demonstrates how to search a collection using javascript code to reduce the resultset.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->selectDB('test');
-$collection = new MongoCollection($db, 'phpmanual');
-
-$js = "function() {
-    return this.name == 'Joe' || this.age == 50;
-}";
-$cursor = $collection->find(array('$where' => $js));
-foreach ($cursor as $doc) {
-    var_dump($doc);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(3) {
-  ["_id"]=>
-  object(MongoId)#7 (1) {
-    ["$id"]=>
-    string(24) "4ebc3e3710b89f2349000002"
-  }
-  ["name"]=>
-  string(3) "Joe"
-  ["age"]=>
-  int(20)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoCollection::find</function> example using $in</title>
-   <para>This example demonstrates how to search a collection using the $in operator.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->selectDB('test');
-$collection = new MongoCollection($db, 'phpmanual');
-
-$cursor = $collection->find(array(
-    'name' => array('$in' => array('Joe', 'Wendy'))
-));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(3) {
-  ["_id"]=>
-  object(MongoId)#7 (1) {
-    ["$id"]=>
-    string(24) "4ebc3e3710b89f2349000002"
-  }
-  ["name"]=>
-  string(3) "Joe"
-  ["age"]=>
-  int(20)
-}
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title>Getting results as an array</title>
-   <para>
-    This returns a <classname>MongoCursor</classname>.  Often, when people are 
-    starting out, they are more comfortable using an array.  To turn a cursor
-    into an array, use the <function>iterator_to_array</function> function.  
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->selectDB('test');
-$collection = new MongoCollection($db, 'phpmanual');
-
-$cursor = $collection->find();
-$array = iterator_to_array($cursor);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(3) {
-  ["4ebc40af10b89f5149000000"]=>
-  array(2) {
-    ["_id"]=>
-    object(MongoId)#6 (1) {
-      ["$id"]=>
-      string(24) "4ebc40af10b89f5149000000"
-    }
-    ["x"]=>
-    int(12)
-  }
-  ["4ebc40af10b89f5149000001"]=>
-  array(2) {
-    ["_id"]=>
-    object(MongoId)#11 (1) {
-      ["$id"]=>
-      string(24) "4ebc40af10b89f5149000001"
-    }
-    ["x"]=>
-    int(12)
-  }
-  ["4ebc40af10b89f5149000002"]=>
-  array(3) {
-    ["_id"]=>
-    object(MongoId)#12 (1) {
-      ["$id"]=>
-      string(24) "4ebc40af10b89f5149000002"
-    }
-    ["name"]=>
-    string(3) "Joe"
-    ["age"]=>
-    int(20)
-  }
-}
-]]>
-   </screen>
-   <para>
-    Using <function>iterator_to_array</function> forces the driver to load all of
-    the results into memory, so do not do this for result sets that are larger
-    than memory!
-   </para>
-   <para>
-    Also, certain system collections do not have an <literal>_id</literal> 
-    field.  If you are dealing with a collection that might have documents 
-    without <literal>_id</literal>s, pass &false; as the second argument to
-    <function>iterator_to_array</function> (so that it will not try to use the
-    non-existent <literal>_id</literal> values as keys).
-   </para>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCollection::findOne</function></member>
-   <member><function>MongoCollection::insert</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.find;">find</link>.</member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/findandmodify.xml b/reference/mongo/mongocollection/findandmodify.xml
deleted file mode 100644
index f622d6fc28..0000000000
--- a/reference/mongo/mongocollection/findandmodify.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocollection.findandmodify" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::findAndModify</refname>
-  <refpurpose>Update a document and return it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::findAndModify</methodname>
-   <methodparam><type>array</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>update</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>fields</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-  The findAndModify command atomically modifies and returns a single document.
-  By default, the returned document does not include the modifications made on
-  the update. To return the document with the modifications made on the
-  update, use the <varname>new</varname> option.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      The query criteria to search for.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>update</parameter></term>
-    <listitem>
-     <para>
-      The update criteria.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fields</parameter></term>
-    <listitem>
-     <para>
-      Optionally only return these fields.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      An array of options to apply, such as remove the match document from the
-      DB and return it.
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>&Description;</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry><varname>sort</varname> <type>array</type></entry>
-          <entry>
-           Determines which document the operation will modify if the
-           query selects multiple documents. findAndModify will modify the
-           first document in the sort order specified by this argument.
-          </entry>
-         </row>
-         <row>
-          <entry><varname>remove</varname> <type>bool</type></entry>
-          <entry>
-           Optional if <varname>update</varname> field exists. When &true;, removes the selected
-           document. The default is &false;.
-          </entry>
-         </row>
-         <row>
-          <entry><varname>update</varname> <type>array</type></entry>
-          <entry>
-           Optional if <varname>remove</varname> field exists.
-           Performs an update of the selected document.
-          </entry>
-         </row>
-         <row>
-          <entry><varname>new</varname> <type>bool</type></entry>
-          <entry>
-           Optional. When &true;, returns the modified document rather than the
-           original. The findAndModify method ignores the <varname>new</varname> option for
-           remove operations. The default is &false;.
-          </entry>
-         </row>
-         <row>
-          <entry><varname>upsert</varname> <type>bool</type></entry>
-          <entry>
-           Optional. Used in conjunction with the <varname>update</varname> field. When &true;, the
-           findAndModify command creates a new document if the query returns
-           no documents. The default is false. In MongoDB 2.2, the
-           findAndModify command returns &null; when upsert is &true;.
-          </entry>
-         </row>
-         <row>
-          <entry><varname></varname></entry>
-          <entry>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the original document, or the modified document when
-   <varname>new</varname> is set.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoResultException</classname> on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongocollection.findandmodify.example.basic">
-   <title><methodname>MongoCollection::findAndModify</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Mongo;
-$col = $m->selectDB("test")->jobs;
-
-$col->insert(array(
-     "name" => "Next promo",
-     "inprogress" => false,
-     "priority" => 0,
-     "tasks" => array( "select product", "add inventory", "do placement"),
-) );
-
-$col->insert(array(
-     "name" => "Biz report",
-     "inprogress" => false,
-     "priority" => 1,
-     "tasks" => array( "run sales report", "email report" )
-) );
-
-$col->insert(array(
-     "name" => "Biz report",
-     "inprogress" => false,
-     "priority" => 2,
-     "tasks" => array( "run marketing report", "email report" )
-    ),
-    array("w" => 1)
-);
-
-
-
-$retval = $col->findAndModify(
-     array("inprogress" => false, "name" => "Biz report"),
-     array('$set' => array('inprogress' => true, "started" => new MongoDate())),
-     null,
-     array(
-        "sort" => array("priority" => -1),
-        "new" => true,
-    )
-);
-
-var_dump($retval);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(6) {
-  ["_id"]=>
-  object(MongoId)#7 (1) {
-    ["$id"]=>
-    string(24) "5091b5b244415e8cc3000002"
-  }
-  ["inprogress"]=>
-  bool(true)
-  ["name"]=>
-  string(10) "Biz report"
-  ["priority"]=>
-  int(2)
-  ["started"]=>
-  object(MongoDate)#8 (2) {
-    ["sec"]=>
-    int(1351726514)
-    ["usec"]=>
-    int(925000)
-  }
-  ["tasks"]=>
-  array(2) {
-    [0]=>
-    string(20) "run marketing report"
-    [1]=>
-    string(12) "email report"
-  }
-}
-]]>
-   </screen>
-  </example>
-  <example xml:id="mongocollection.findandmodify.example.error">
-   <title><methodname>MongoCollection::findAndModify</methodname> error handling</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Mongo;
-$col = $m->selectDB("test")->jobs;
-try {
-    $retval = $col->findAndModify(
-         array("inprogress" => false, "name" => "Next promo"),
-         array('$pop' => array("tasks" => -1)),
-         array("tasks" => array('$pop' => array("stuff"))),
-         array("new" => true)
-    );
-} catch(MongoResultException $e) {
-    echo $e->getCode(), " : ", $e->getMessage(), "\n";
-    var_dump($e->getDocument());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-13097 : exception: Unsupported projection option: $pop
-array(3) {
-  ["errmsg"]=>
-  string(46) "exception: Unsupported projection option: $pop"
-  ["code"]=>
-  int(13097)
-  ["ok"]=>
-  float(0)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The MongoDB <link xlink:href="&url.mongodb.docs.command;findAndModify/">findAndModify command</link> docs</member>
-  </simplelist>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/findone.xml b/reference/mongo/mongocollection/findone.xml
deleted file mode 100644
index a920b40932..0000000000
--- a/reference/mongo/mongocollection/findone.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.findone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::findOne</refname>
-  <refpurpose>Queries this collection, returning a single element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::findOne</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>fields</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   As opposed to <function>MongoCollection::find</function>, this method
-   will return only the <emphasis>first</emphasis> result from the result set,
-   and not a <classname>MongoCursor</classname> that can be iterated over.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       The fields for which to search. MongoDB's query language is quite
-       extensive. The PHP driver will in almost all cases pass the query
-       straight through to the server, so reading the MongoDB core docs on
-       <link xlink:href="&url.mongodb.dochub.find;">find</link> is a good idea.
-      </para>
-      <warning>
-       <para>
-        Please make sure that for all special query operaters (starting with
-        <literal>$</literal>) you use single quotes so that PHP doesn't try to
-        replace <literal>"$exists"</literal> with the value of the variable
-        <literal>$exists</literal>.
-       </para>
-      </warning>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>fields</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields of the results to return. The array is in the format
-       <literal>array('fieldname' => true, 'fieldname2' => true)</literal>.
-       The <literal>_id</literal> field is always returned.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       This parameter is an associative array of the form 
-       <literal>array("name" => &lt;value&gt;, ...)</literal>. Currently
-       supported options are:
-      </para>
-      <itemizedlist>
-       &mongo.command.parameters.maxtimems;
-      </itemizedlist>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns record matching the search or &null;.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the 
-   database.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.5.0</entry>
-      <entry>
-       Added optional <parameter>options</parameter> argument.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCollection::findOne</methodname> document by its id.</title>
-   <para>This example demonstrates how to find a single document in a collection by its id.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$articles = $mongo->my_db->articles;
-
-$article = $articles->findOne(array('_id' => new MongoId('47cc67093475061e3d9536d2')));
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><methodname>MongoCollection::findOne</methodname> document by some condition.</title>
-   <para>This example demonstrates how to find a single document in a collection by some condition and limiting the returned fields.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$users = $mongo->my_db->users;
-$user = $users->findOne(array('username' => 'jwage'), array('password'));
-print_r($user);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [_id] => MongoId Object
-        (
-        )
-
-    [password] => test
-)
-]]>
-   </screen>
-   <para>
-    Notice how even though the document does have a username field, we limited the results
-    to only contain the password field.
-   </para>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCollection::find</function></member>
-   <member><function>MongoCollection::insert</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.find;">find</link>.</member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/get.xml b/reference/mongo/mongocollection/get.xml
deleted file mode 100644
index 6c09efd26c..0000000000
--- a/reference/mongo/mongocollection/get.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::__get</refname>
-  <refpurpose>Gets a collection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCollection</type><methodname>MongoCollection::__get</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A concise syntax for getting a collection with a dot-separated name.  If a
-   collection name contains strange characters, you may have to use
-   <function>MongoDB::selectCollection</function> instead.
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mongo = new MongoClient();
-
-// the following two lines are equivalent
-$collection = $mongo->selectDB("foo")->selectCollection("bar.baz");
-$collection = $mongo->foo->bar->baz;
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       The next string in the collection name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the collection.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/getdbref.xml b/reference/mongo/mongocollection/getdbref.xml
deleted file mode 100644
index 759d79f9ea..0000000000
--- a/reference/mongo/mongocollection/getdbref.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.getdbref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::getDBRef</refname>
-  <refpurpose>Fetches the document pointed to by a database reference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::getDBRef</methodname>
-   <methodparam><type>array</type><parameter>ref</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ref</parameter>
-     </term>
-     <listitem>
-      <para>
-       A database reference.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database document pointed to by the reference.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCollection::getDBRef</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$playlists = $db->playlists;
-
-$myList = $playlists->findOne(array('username' => 'me'));
-
-// fetch each song in the playlist
-foreach ($myList['songlist'] as $songRef) {
-    $song = $playlists->getDBRef($songRef);
-    echo $song['title'] . "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Dazed and Confused
-Ma na ma na
-Bohemian Rhapsody
-]]>
-   </screen>
-   <screen> 
-    In the above example each $songRef looks something like the following:
-    <![CDATA[
-    Array
-    (
-        [$ref] => songs
-        [$id] => 49902cde5162504500b45c2c
-    )
-    ]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoCollection::createDBRef</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/getindexinfo.xml b/reference/mongo/mongocollection/getindexinfo.xml
deleted file mode 100644
index c7b4efeabb..0000000000
--- a/reference/mongo/mongocollection/getindexinfo.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.getindexinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::getIndexInfo</refname>
-  <refpurpose>Returns information about indexes on this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::getIndexInfo</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This function returns an array in which each element describes an index.
-   Elements will contain the values <literal>name</literal> for the name of
-   the index, <literal>ns</literal> for the namespace (a combination of the
-   database and collection name), and <literal>key</literal> for a list of all
-   fields in the index and their ordering. Additional values may be present for
-   special indexes, such as <literal>unique</literal> or
-   <literal>sparse</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::getIndexInfo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$c = $m->selectCollection('test', 'venues');
-var_dump($c->getIndexInfo());
-
-?>
-]]>
-   </programlisting>
-    &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  array(4) {
-    ["v"]=>
-    int(1)
-    ["key"]=>
-    array(1) {
-      ["_id"]=>
-      int(1)
-    }
-    ["name"]=>
-    string(4) "_id_"
-    ["ns"]=>
-    string(11) "test.venues"
-  }
-  [1]=>
-  array(4) {
-    ["v"]=>
-    int(1)
-    ["key"]=>
-    array(1) {
-      ["name"]=>
-      float(1)
-    }
-    ["name"]=>
-    string(6) "name_1"
-    ["ns"]=>
-    string(11) "test.venues"
-  }
-  [2]=>
-  array(4) {
-    ["v"]=>
-    int(1)
-    ["key"]=>
-    array(2) {
-      ["type"]=>
-      float(1)
-      ["createdAt"]=>
-      float(-1)
-    }
-    ["name"]=>
-    string(19) "type_1_createdAt_-1"
-    ["ns"]=>
-    string(11) "test.venues"
-  }
-  [3]=>
-  array(5) {
-    ["v"]=>
-    int(1)
-    ["key"]=>
-    array(1) {
-      ["location"]=>
-      string(8) "2dsphere"
-    }
-    ["name"]=>
-    string(17) "location_2dsphere"
-    ["ns"]=>
-    string(11) "test.venues"
-    ["2dsphereIndexVersion"]=>
-    int(2)
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on 
-   <link xlink:href="&url.mongodb.dochub.indexes;">vanilla indexes</link> and
-   <link xlink:href="&url.mongodb.dochub.geo;">geospatial indexes</link>.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/getname.xml b/reference/mongo/mongocollection/getname.xml
deleted file mode 100644
index cce2c50aaa..0000000000
--- a/reference/mongo/mongocollection/getname.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::getName</refname>
-  <refpurpose>Returns this collection&apos;s name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoCollection::getName</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the name of this collection.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MongoCollection::getName</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$c = $m->foo->bar->baz;
-
-echo "Working with collection " . $c->getName() . ".\n";
-
-// the full namespace is given by the MongoCollection::__toString() method
-echo "Working in namespace $c.\n";
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Working with collection bar.baz.
-Working in namespace foo.bar.baz.
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/getreadpreference.xml b/reference/mongo/mongocollection/getreadpreference.xml
deleted file mode 100644
index 9e7a5ebd56..0000000000
--- a/reference/mongo/mongocollection/getreadpreference.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocollection.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::getReadPreference</refname>
-  <refpurpose>Get the read preference for this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::getReadPreference</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.3.3</entry>
-       <entry>
-        The return value has changed to be consistent with
-        <methodname>MongoCollection::setReadPreference</methodname>. The
-        <literal>type</literal> value was changed from a number to a string,
-        <literal>type_string</literal> was removed, and
-        <literal>tagsets</literal> now expresses tags as key/value pairs instead
-        of colon-delimited strings.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCollection::getReadPreference</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$c = $m->test->users;
-$c->setReadPreference(MongoClient::RP_SECONDARY, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-    array(),
-));
-var_dump($c->getReadPreference());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["type"]=>
-  string(9) "secondary"
-  ["tagsets"]=>
-  array(3) {
-    [0]=>
-    array(2) {
-      ["dc"]=>
-      string(4) "east"
-      ["use"]=>
-      string(9) "reporting"
-    }
-    [1]=>
-    array(1) {
-      ["dc"]=>
-      string(7) "west"
-    }
-    [2]=>
-    array(0) {
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCollection::setReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/getslaveokay.xml b/reference/mongo/mongocollection/getslaveokay.xml
deleted file mode 100644
index 8144cc4511..0000000000
--- a/reference/mongo/mongocollection/getslaveokay.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.getslaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::getSlaveOkay</refname>
-  <refpurpose>Get slaveOkay setting for this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCollection::getSlaveOkay</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of slaveOkay for this instance.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoCollection::getReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/getwriteconcern.xml b/reference/mongo/mongocollection/getwriteconcern.xml
deleted file mode 100644
index 12b6b5b16a..0000000000
--- a/reference/mongo/mongocollection/getwriteconcern.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocollection.getwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::getWriteConcern</refname>
-  <refpurpose>Get the write concern for this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::getWriteConcern</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getwriteconcern.returnvalues;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCollection::getWriteConcern</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mc = new MongoClient('mongodb://localhost:27017', array('wTimeoutMS' => 500));
-$coll = $mc->selectCollection('test', 'foo');
-var_dump($coll->getWriteConcern());
-
-$coll->setWriteConcern(1, 1000);
-var_dump($coll->getWriteConcern());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["w"]=>
-  int(1)
-  ["wtimeout"]=>
-  int(500)
-}
-array(2) {
-  ["w"]=>
-  int(1)
-  ["wtimeout"]=>
-  int(1000)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.writeconcerns">write concern</link> documentation.</member>
-   <member><function>MongoCollection::setWriteConcern</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/group.xml b/reference/mongo/mongocollection/group.xml
deleted file mode 100644
index 99dd1238bf..0000000000
--- a/reference/mongo/mongocollection/group.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.group" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::group</refname>
-  <refpurpose>Performs an operation similar to SQL's GROUP BY command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::group</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <methodparam><type>array</type><parameter>initial</parameter></methodparam>
-   <methodparam><type>MongoCode</type><parameter>reduce</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>keys</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields to group by.  If an array or non-code object is passed, it will be
-       the key used to group results. 
-      </para>
-      <para>1.0.4+: If <parameter>keys</parameter> is an instance of 
-       <classname>MongoCode</classname>, <parameter>keys</parameter> will be treated as
-       a function that returns the key to group by (see the "Passing a 
-       <parameter>keys</parameter> function" example below).  
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>initial</parameter>
-     </term>
-     <listitem>
-      <para>
-       Initial value of the aggregation counter object.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>reduce</parameter>
-     </term>
-     <listitem>
-      <para>
-       A function that takes two arguments (the current document and the 
-       aggregation to this point) and does the aggregation.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       Optional parameters to the group command.  Valid options include:
-      </para>
-      <itemizedlist>
-       <listitem>
-        <para>
-         <literal>"condition"</literal>
-        </para>
-        <para>
-         Criteria for including a document in the aggregation.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         <literal>"finalize"</literal>
-        </para>
-        <para>
-         Function called once per unique key that takes the final output of the
-         reduce function.
-        </para>
-       </listitem>
-       &mongo.command.parameters.maxtimems;
-      </itemizedlist>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the result.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>Added <literal>"maxTimeMS"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when
-        <parameter>options</parameter> is <type>scalar</type>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::group</function> example</title>
-   <para>
-    This groups documents by category and creates a list of names within that
-    category.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array("category" => "fruit", "name" => "apple"));
-$collection->insert(array("category" => "fruit", "name" => "peach"));
-$collection->insert(array("category" => "fruit", "name" => "banana"));
-$collection->insert(array("category" => "veggie", "name" => "corn"));
-$collection->insert(array("category" => "veggie", "name" => "broccoli"));
-
-$keys = array("category" => 1);
-
-$initial = array("items" => array());
-
-$reduce = "function (obj, prev) { prev.items.push(obj.name); }";
-
-$g = $collection->group($keys, $initial, $reduce);
-
-echo json_encode($g['retval']);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-[{"category":"fruit","items":["apple","peach","banana"]},{"category":"veggie","items":["corn","broccoli"]}]
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoCollection::group</function> example</title>
-   <para>
-    This example doesn't use any key, so every document will be its own group.
-    It also uses a condition: only documents that match this condition will be
-    processed by the grouping function.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->save(array("a" => 2));
-$collection->save(array("b" => 5));
-$collection->save(array("a" => 1));
-
-// use all fields
-$keys = array();
-
-// set intial values
-$initial = array("count" => 0);
-
-// JavaScript function to perform
-$reduce = "function (obj, prev) { prev.count++; }";
-
-// only use documents where the "a" field is greater than 1
-$condition = array('condition' => array("a" => array( '$gt' => 1)));
-
-$g = $collection->group($keys, $initial, $reduce, $condition);
-
-var_dump($g);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(4) {
-  ["retval"]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      ["count"]=>
-      float(1)
-    }
-  }
-  ["count"]=>
-  float(1)
-  ["keys"]=>
-  int(1)
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title>Passing a <parameter>keys</parameter> function</title>
-   <para>
-    If you want to group by something other than a field name, you can pass
-    a function as the first parameter of 
-    <function>MongoCollection::group</function> and it will be run against each
-    document.  The return value of the function will be used as its grouping 
-    value.
-   </para>
-   <para>
-    This example demonstrates grouping by the num field modulo 4.
-   </para>
-
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c->group(new MongoCode('function(doc) { return {mod : doc.num % 4}; }'),
-     array("count" => 0),
-     new MongoCode('function(current, total) { total.count++; }'));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/insert.xml b/reference/mongo/mongocollection/insert.xml
deleted file mode 100644
index 48ca6495a1..0000000000
--- a/reference/mongo/mongocollection/insert.xml
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::insert</refname>
-  <refpurpose>Inserts a document into the collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>array</type></type><methodname>MongoCollection::insert</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>document</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   All strings sent to the database must be UTF-8.  If a string is not UTF-8, a 
-   <classname>MongoException</classname> will be thrown.  To insert 
-   (or query for) a non-UTF-8 string, use <classname>MongoBinData</classname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>document</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array or object. If an object is used, it may not have protected or
-       private properties.
-      </para>
-      <note>
-       <para>
-        If the parameter does not have an <literal>_id</literal> key or
-        property, a new <classname>MongoId</classname> instance will be created
-        and assigned to it. This special behavior does not mean that the
-        parameter is passed by reference.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the insert operation. Currently available options
-       include:
-       <itemizedlist>
-        &mongo.writes.parameters.fsync;
-        &mongo.writes.parameters.journal;
-        &mongo.writes.parameters.sockettimeoutms;
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-        &mongo.writes.parameters.writeconcerntimeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the insertion if the
-   <literal>"w"</literal> option is set. Otherwise, returns &true; if the
-   inserted array is not empty (a <classname>MongoException</classname> will be
-   thrown if the inserted array is empty).
-  </para>
-  <para>
-   If an array is returned, the following keys may be present:
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ok</parameter>
-     </term>
-     <listitem>
-      <para>
-       This should almost always be 1 (unless last_error itself failed).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>err</parameter>
-     </term>
-     <listitem>
-      <para>
-       If this field is non-null, an error occurred on the previous operation.
-       If this field is set, it will be a string describing the error that
-       occurred. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>code</parameter>
-     </term>
-     <listitem>
-      <para>
-       If a database error occurred, the relevant error code will be passed
-       back to the client. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>errmsg</parameter>
-     </term>
-     <listitem>
-      <para>
-       This field is set if something goes wrong with a database command. It
-       is coupled with <literal>ok</literal> being 0. For example, if
-       <literal>w</literal> is set and times out, errmsg will be set to "timed
-       out waiting for slaves" and <literal>ok</literal> will be 0.  If this
-       field is set, it will be a string describing the error that occurred. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>n</parameter>
-     </term>
-     <listitem>
-      <para>
-       If the last operation was an update, upsert, or a remove, the number
-       of documents affected will be returned. For insert operations, this value
-       is always <literal>0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>wtimeout</parameter>
-     </term>
-     <listitem>
-      <para>
-       If the previous option timed out waiting for replication. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>waited</parameter>
-     </term>
-     <listitem>
-      <para>
-       How long the operation waited before timing out. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>wtime</parameter>
-     </term>
-     <listitem>
-      <para>
-       If <literal>w</literal> was set and the operation succeeded, how long it took to
-       replicate to <literal>w</literal> servers. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>upserted</parameter>
-     </term>
-     <listitem>
-      <para>
-       If an upsert occurred, this field will contain the new record's
-       <literal>_id</literal> field. For upserts, either this field or
-       <literal>updatedExisting</literal> will be present (unless an error
-       occurred). 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>updatedExisting</parameter>
-     </term>
-     <listitem>
-      <para>
-       If an upsert updated an existing element, this field will be true. For
-       upserts, either this field or upserted will be present (unless an error
-       occurred). 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoException</classname> if the inserted document is
-   empty or if it contains zero-length keys. Attempting to insert an object with
-   protected and private properties will cause a zero-length key error.
-  </para>
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added the <literal>"wTimeoutMS"</literal> option, which replaces
-         <literal>"wtimeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"wtimeout"</literal> is used.
-        </para>
-        <para>
-         Added the <literal>"socketTimeoutMS"</literal> option, which replaces
-         <literal>"timeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"timeout"</literal> is used.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when <literal>"safe"</literal>
-         is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.4</entry>
-       <entry>Added <literal>"wtimeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        <para>Added <literal>"w"</literal> option.</para>
-        <para>
-         The <parameter>options</parameter> parameter no longer accepts a
-         boolean to signify an acknowledged write. Instead, this now has to be
-         done with <literal>array('w' => 1)</literal> (the default behaviour of
-         <classname>MongoClient</classname>).
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>Added <literal>"timeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.9</entry>
-       <entry>
-        <para>
-         Added ability to pass integers to the <literal>"safe"</literal> option,
-         which previously only accepted booleans.
-        </para>
-        <para>
-         Added <literal>"fsync"</literal> option.
-        </para>
-        <para>
-         The return type was changed to be an array containing error information
-         if the <literal>"safe"</literal> option is used. Otherwise, a boolean
-         is returned as before.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.2</entry>
-       <entry>
-        Changed second parameter to be an array of options. Pre-1.0.2, the
-        second parameter was a boolean indicating the <literal>"safe"</literal>
-        option.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.1</entry>
-       <entry>
-        Throw a <classname>MongoCursorException</classname> if the
-        <literal>"safe"</literal> option is set and the insert fails.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::insert</function> <literal>_id</literal> example</title>
-   <para>
-    An <literal>_id</literal> field will be added to the inserted document if
-    not already present. Depending on how the parameter is passed, a generated
-    <literal>_id</literal> may or may not be available to calling code.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$collection = $m->selectCollection('test', 'phpmanual');
-
-// If an array literal is used, there is no way to access the generated _id
-$collection->insert(array('x' => 1));
-
-// The _id is available on an array passed by value
-$a = array('x' => 2);
-$collection->insert($a);
-var_dump($a);
-
-// The _id is not available on an array passed by reference
-$b = array('x' => 3);
-$ref = &$b;
-$collection->insert($ref);
-var_dump($ref);
-
-// The _id is available if a wrapping function does not trigger copy-on-write
-function insert_no_cow($collection, $document)
-{
-    $collection->insert($document);
-}
-
-$c = array('x' => 4);
-insert_no_cow($collection, $c);
-var_dump($c);
-
-// The _id is not available if a wrapping function triggers copy-on-write
-function insert_cow($collection, $document)
-{
-    $document['y'] = 1;
-    $collection->insert($document);
-}
-
-$d = array('x' => 5);
-insert_cow($collection, $d);
-var_dump($d);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["x"]=>
-  int(2)
-  ["_id"]=>
-  object(MongoId)#4 (0) {
-  }
-}
-array(1) {
-  ["x"]=>
-  int(3)
-}
-array(2) {
-  ["x"]=>
-  int(4)
-  ["_id"]=>
-  object(MongoId)#5 (0) {
-  }
-}
-array(1) {
-  ["x"]=>
-  int(5)
-}
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoCollection::insert</function> acknowledged write example</title>
-   <para>
-    This example shows inserting two elements with the same _id, which causes 
-    a <classname>MongoCursorException</classname> to be thrown, as 
-    <parameter>w</parameter> was set.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$person = array("name" => "Joe", "age" => 20);
-$collection->insert($person);
-
-// now $person has an _id field, so if we save it 
-// again, we will get an exception
-try {
-    $collection->insert($person, array("w" => 1));
-} catch(MongoCursorException $e) {
-    echo "Can't save the same person twice!\n";
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCollection::batchInsert</function></member>
-   <member><function>MongoCollection::update</function></member>
-   <member><function>MongoCollection::find</function></member>
-   <member><function>MongoCollection::remove</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.insert;">insert</link>.</member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/parallelcollectionscan.xml b/reference/mongo/mongocollection/parallelcollectionscan.xml
deleted file mode 100644
index 05ae02236a..0000000000
--- a/reference/mongo/mongocollection/parallelcollectionscan.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.parallelcollectionscan" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::parallelCollectionScan</refname>
-  <refpurpose>Returns an array of cursors to iterator over a full collection in parallel</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array[MongoCommandCursor]</type><methodname>MongoCollection::parallelCollectionScan</methodname>
-   <methodparam><type>int</type><parameter>num_cursors</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method returns an array of a maximum of <literal>num_cursors</literal>
-   cursors. An iteration over one of the returned cursors results in a partial
-   set of documents for a collection. Iteration over all the returned cursors
-   results in getting every document back from the collection.
-  </para>
-  <para>
-   This method is a wrapper for the <literal>parallelCollectionScan</literal>
-   MongoDB command.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>num_cursors</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of cursors to request from the server. Please note, that the
-       server can return less cursors than you requested.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns an array of <classname>MongoCommandCursor</classname> objects.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::parallelCollectionScan</function> example</title>
-   <para>
-    Returning all documents in a collection by using multiple cursors.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$c = $m->demo->cities;
-
-/* Request three cursors */
-$cursors = $c->parallelCollectionScan( 3 );
-
-/* Add all the cursors to the MultipleIterator */
-$mi = new MultipleIterator( MultipleIterator::MIT_NEED_ANY );
-foreach ( $cursors as $cursor )
-{
-    $mi->attachIterator( $cursor );
-}
-
-/* Iterate over all the associated cursors */
-foreach ( $mi as $items )
-{
-    foreach ( $items as $item )
-    {
-        if ( $item !== NULL )
-        {
-            echo $item['name'], "\n";
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><classname>MultipleIterator</classname></member>
-    <member><classname>MongoCommandCursor</classname></member>
-    <member><methodname>MongoDB::command</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/remove.xml b/reference/mongo/mongocollection/remove.xml
deleted file mode 100644
index f264d54dd1..0000000000
--- a/reference/mongo/mongocollection/remove.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::remove</refname>
-  <refpurpose>Remove records from this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>array</type></type><methodname>MongoCollection::remove</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>criteria</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry xml:id="mongocollection.remove.criteria">
-     <term>
-      <parameter>criteria</parameter>
-     </term>
-     <listitem>
-      <para>
-       Query criteria for the documents to delete.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the remove operation. Currently available options
-       include:
-       <itemizedlist>
-        &mongo.writes.parameters.writeconcern;
-        <listitem xml:id="mongocollection.remove.justone">
-         <para>
-          <literal>"justOne"</literal>
-         </para>
-         <para>
-          Specify &true; to limit deletion to just one document. If &false; or
-          omitted, all documents matching the criteria will be deleted.
-         </para>
-        </listitem>
-        &mongo.writes.parameters.fsync;
-        &mongo.writes.parameters.journal;
-        &mongo.writes.parameters.sockettimeoutms;
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-        &mongo.writes.parameters.writeconcerntimeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the removal if the
-   <literal>"w"</literal> option is set. Otherwise, returns &true;.
-  </para>
-  <para>
-   Fields in the status array are described in the documentation for
-   <function>MongoCollection::insert</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added <literal>"wTimeoutMS"</literal> option, which replaces
-         <literal>"wtimeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"wtimeout"</literal> is used.
-        </para>
-        <para>
-         Added <literal>"socketTimeoutMS"</literal> option, which replaces
-         <literal>"timeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"timeout"</literal> is used.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when <literal>"safe"</literal>
-         is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.4</entry>
-       <entry>Added <literal>"wtimeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        <para>Added <literal>"w"</literal> option.</para>
-        <para>
-         The <parameter>options</parameter> parameter no longer accepts a
-         boolean to signify <literal>"justOne"</literal>. Instead, this now has
-         to be done with <literal>array('justOne' => true)</literal>.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when
-        <parameter>options</parameter> is <type>scalar</type>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>Added <literal>"timeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.9</entry>
-       <entry>
-        <para>
-         Added ability to pass integers to the <literal>"safe"</literal> option,
-         which previously only accepted booleans.
-        </para>
-        <para>
-         Added <literal>"fsync"</literal> option.
-        </para>
-        <para>
-         The return type was changed to be an array containing error information
-         if the <literal>"safe"</literal> option is used. Otherwise, a boolean
-         is returned as before.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.5</entry>
-       <entry>
-        Changed second parameter to be an array of options. Pre-1.0.5, the
-        second parameter was a boolean indicating the <literal>"safe"</literal>
-        option.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::remove</function> with justOne example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$radioactive = $db->radioactive;
-
-// count how much more plutonium there is
-$remaining = $radioactive->count(array('type' => 94));
-
-$halflife = $remaining/2;
-
-// remove half of it
-while ($halflife > 0) {
-    $radioactive->remove(array('type' => 94), array("justOne" => true));
-    $halflife--;
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCollection::insert</function></member>
-   <member><function>MongoCollection::update</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.remove;">remove</link>.</member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/save.xml b/reference/mongo/mongocollection/save.xml
deleted file mode 100644
index ff90de74b5..0000000000
--- a/reference/mongo/mongocollection/save.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.save" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::save</refname>
-  <refpurpose>Saves a document to this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoCollection::save</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>document</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   If the object is from the database, update the existing database object, otherwise 
-   insert this object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>document</parameter>
-     </term>
-     <listitem>
-      <para>
-       Array or object to save. If an object is used, it may not have protected
-       or private properties.
-      </para>
-      <note>
-       <para>
-        If the parameter does not have an <literal>_id</literal> key or
-        property, a new <classname>MongoId</classname> instance will be created
-        and assigned to it. See <function>MongoCollection::insert</function> for
-        additional information on this behavior.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       Options for the save.
-       <itemizedlist>
-        &mongo.writes.parameters.fsync;
-        &mongo.writes.parameters.journal;
-        &mongo.writes.parameters.sockettimeoutms;
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeout;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If <parameter>w</parameter> was set, returns an array containing the status of the save.
-   Otherwise, returns a boolean representing if the array was not empty (an empty array will not 
-   be inserted).
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoException</classname> if the inserted document is
-   empty or if it contains zero-length keys. Attempting to insert an object with
-   protected and private properties will cause a zero-length key error.
-  </para>
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added <literal>"wTimeoutMS"</literal> option, which replaces
-         <literal>"wtimeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"wtimeout"</literal> is used.
-        </para>
-        <para>
-         Added <literal>"socketTimeoutMS"</literal> option, which replaces
-         <literal>"timeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"timeout"</literal> is used.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when <literal>"safe"</literal>
-         is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>Added <literal>"timeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.9</entry>
-       <entry>
-        <para>
-         Added <literal>"fsync"</literal> option.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.5</entry>
-       <entry>Added <parameter>options</parameter> parameter.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::save</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$obj = array('x' => 1);
-
-// insert $obj into the db
-$collection->save($obj);
-var_dump($obj);
-
-// add another field
-$obj['foo'] = 'bar';
-
-// $obj cannot be inserted again, causes duplicate _id error
-$collection->insert($obj);
-
-// save updates $obj with the new field
-$collection->save($obj);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["x"]=>
-  int(1)
-  ["_id"]=>
-  object(MongoId)#4 (1) {
-    ["$id"]=>
-    string(24) "50b6afe544415ed606000000"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/setreadpreference.xml b/reference/mongo/mongocollection/setreadpreference.xml
deleted file mode 100644
index 3c8786865a..0000000000
--- a/reference/mongo/mongocollection/setreadpreference.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocollection.setreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::setReadPreference</refname>
-  <refpurpose>Set the read preference for this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCollection::setReadPreference</methodname>
-   <methodparam><type>string</type><parameter>read_preference</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tags</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setreadpreference.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.setreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setreadpreference.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCollection::setReadPreference</methodname> tag set array syntax example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$c = $m->test->users;
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$c->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCollection::getReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/setslaveokay.xml b/reference/mongo/mongocollection/setslaveokay.xml
deleted file mode 100644
index 0ff9b3e0f4..0000000000
--- a/reference/mongo/mongocollection/setslaveokay.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.setslaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::setSlaveOkay</refname>
-  <refpurpose>Change slaveOkay setting for this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCollection::setSlaveOkay</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>ok</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ok</parameter>
-     </term>
-     <listitem>
-      <para>
-       If reads should be sent to secondary members of a replica set for all 
-       possible queries using this <classname>MongoCollection</classname> 
-       instance.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the former value of slaveOkay for this instance.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoCollection::setReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/setwriteconcern.xml b/reference/mongo/mongocollection/setwriteconcern.xml
deleted file mode 100644
index b34470aff3..0000000000
--- a/reference/mongo/mongocollection/setwriteconcern.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocollection.setwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::setWriteConcern</refname>
-  <refpurpose>Set the write concern for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCollection::setWriteConcern</methodname>
-   <methodparam><type>mixed</type><parameter>w</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>wtimeout</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setwriteconcern.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.setwriteconcern.returnvalues;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setwriteconcern.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB::setWriteConcern</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mc = new MongoClient('mongodb://rs1.example.com,rs2.example.com');
-$coll = $mc->selectCollection('test', 'foo');
-
-// Require that the majority of servers in the replica set acknowledge writes
-// within three seconds.
-$coll->setWriteConcern('majority', 3000);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.writeconcerns">write concern</link> documentation.</member>
-   <member><function>MongoCollection::getWriteConcern</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/toindexstring.xml b/reference/mongo/mongocollection/toindexstring.xml
deleted file mode 100644
index 0c6ec1eea8..0000000000
--- a/reference/mongo/mongocollection/toindexstring.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.toindexstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::toIndexString</refname>
-  <refpurpose>Converts keys specifying an index to its identifying string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>static protected</modifier> <type>string</type><methodname>MongoCollection::toIndexString</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-  </methodsynopsis>
-  <warning>
-   <para>
-    This method is deprecated since version 1.5.0.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>keys</parameter>
-     </term>
-     <listitem>
-      <para>
-       Field or fields to convert to the identifying string
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string that describes the index.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::toIndexString</function> example</title>
-   <para>This example shows how you can create an index name out of keys.
-   Because this is a protected (static) method, you need to overload it in a
-   child class first.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Create inherited class to make the method "public".
-class MyCollection extends MongoCollection
-{
-    static public function toIndexString($a)
-    {
-        return parent::toIndexString($a);
-    }
-}
-
-echo MyCollection::toIndexString("foo"), "\n";
-// Outputs: foo_1
-
-echo MyCollection::toIndexString(array('name' => 1, 'age' => -1)), "\n";
-// Outputs: name_1_age_-1
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.dochub.indexes;">indexes</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        This method has been deprecated.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/tostring.xml b/reference/mongo/mongocollection/tostring.xml
deleted file mode 100644
index 56872128e5..0000000000
--- a/reference/mongo/mongocollection/tostring.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.--tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::__toString</refname>
-  <refpurpose>String representation of this collection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoCollection::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the full name of this collection.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MongoCollection::__toString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-
-$c1 = $m->foo->bar->baz;
-echo "Working with collection $c1.";
-
-$c2 = $m->selectCollection('[]', '&');
-echo "Working with collection $c2.";
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Working with collection foo.bar.baz.
-Working with collection [].&.
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocollection/update.xml b/reference/mongo/mongocollection/update.xml
deleted file mode 100644
index 19c468acd8..0000000000
--- a/reference/mongo/mongocollection/update.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::update</refname>
-  <refpurpose>Update records based on a given criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>array</type></type><methodname>MongoCollection::update</methodname>
-   <methodparam><type>array</type><parameter>criteria</parameter></methodparam>
-   <methodparam><type>array</type><parameter>new_object</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry xml:id="mongocollection.update.criteria">
-     <term>
-      <parameter>criteria</parameter>
-     </term>
-     <listitem>
-      <para>
-       Query criteria for the documents to update.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongocollection.update.new_object">
-     <term>
-      <parameter>new_object</parameter>
-     </term>
-     <listitem>
-      <para>
-       The object used to update the matched documents. This may either contain
-       update operators (for modifying specific fields) or be a replacement
-       document.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the update operation. Currently available options
-       include:
-       <itemizedlist>
-        <listitem xml:id="mongocollection.update.upsert">
-         <para>
-          <literal>"upsert"</literal>
-         </para>
-         <para>
-          If no document matches <parameter>$criteria</parameter>, a new
-          document will be inserted.
-         </para>
-         <para>
-          If a new document would be inserted and
-          <parameter>$new_object</parameter> contains atomic modifiers
-          (i.e. <literal>$</literal> operators), those operations will be
-          applied to the <parameter>$criteria</parameter> parameter to create
-          the new document. If <parameter>$new_object</parameter> does not
-          contain atomic modifiers, it will be used as-is for the inserted
-          document. See the upsert examples below for more information.
-         </para>
-        </listitem>
-        <listitem xml:id="mongocollection.update.multiple">
-         <para>
-          <literal>"multiple"</literal>
-         </para>
-         <para>
-          All documents matching $criteria will be updated.  
-          <function>MongoCollection::update</function> has exactly the opposite 
-          behavior of <function>MongoCollection::remove</function>: it updates 
-          one document by default, not all matching documents.  <emphasis>It is 
-          recommended that you always specify whether you want to update 
-           multiple documents or a single document</emphasis>, as the database 
-          may change its default behavior at some point in the future.
-         </para>
-        </listitem>
-        &mongo.writes.parameters.fsync;
-        &mongo.writes.parameters.journal;
-        &mongo.writes.parameters.sockettimeoutms;
-        &mongo.writes.parameters.writeconcern;
-        &mongo.writes.parameters.writeconcerntimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.safe;
-        &mongo.writes.parameters.timeout;
-        &mongo.writes.parameters.writeconcerntimeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the update if the
-   <literal>"w"</literal> option is set. Otherwise, returns &true;.
-  </para>
-  <para>
-   Fields in the status array are described in the documentation for
-   <function>MongoCollection::insert</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Added the <literal>"wTimeoutMS"</literal> option, which replaces
-         <literal>"wtimeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"wtimeout"</literal> is used.
-        </para>
-        <para>
-         Added the <literal>"socketTimeoutMS"</literal> option, which replaces
-         <literal>"timeout"</literal>. Emits <constant>E_DEPRECATED</constant>
-         when <literal>"timeout"</literal> is used.
-        </para>
-        <para>
-         Emits <constant>E_DEPRECATED</constant> when <literal>"safe"</literal>
-         is used.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.4</entry>
-       <entry>Added <literal>"wtimeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        <para>Added <literal>"w"</literal> option.</para>
-        <para>
-         The <parameter>options</parameter> parameter no longer accepts a boolean
-         to signify an upsert. Instead, this now has to be done with
-         <literal>array('upsert' => true)</literal>.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when
-        <parameter>options</parameter> is <type>scalar</type>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>Added <literal>"timeout"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.9</entry>
-       <entry>
-        <para>
-         Added ability to pass integers to the <literal>"safe"</literal> option,
-         which previously only accepted booleans.
-        </para>
-        <para>
-         Added <literal>"fsync"</literal> option.
-        </para>
-        <para>
-         The return type was changed to be an array containing error information
-         if the <literal>"safe"</literal> option is used. Otherwise, a boolean
-         is returned as before.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.5</entry>
-       <entry>Added <literal>"safe"</literal> option.</entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.1</entry>
-       <entry>
-        Changed <parameter>options</parameter> parameter from boolean to array.
-        Pre-1.0.1, the second parameter was an optional boolean value specifying
-        an upsert.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::update</function></title>
-   <para>
-    Adding an address field to a document.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c->insert(array("firstname" => "Bob", "lastname" => "Jones" ));
-$newdata = array('$set' => array("address" => "1 Smith Lane"));
-$c->update(array("firstname" => "Bob"), $newdata);
-
-var_dump($c->findOne(array("firstname" => "Bob")));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(4) {
-  ["_id"]=>
-  object(MongoId)#6 (0) {
-  }
-  ["firstname"]=>
-  string(3) "Bob"
-  ["lastname"]=>
-  string(5) "Jones"
-  ["address"]=>
-  string(12) "1 Smith Lane"
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoCollection::update</function> upsert examples</title>
-   <para>
-    Upserts can simplify code, as a single line can create the document if it
-    does not exist (based on <parameter>$criteria</parameter>), or update an
-    existing document if it matches.
-   </para>
-   <para>
-    In the following example, <parameter>$new_object</parameter> contains an
-    atomic modifier. Since the collection is empty and upsert must insert a new
-    document, it will apply those operations to the
-    <parameter>$criteria</parameter> parameter in order to create the document.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c->drop();
-$c->update(
-    array("uri" => "/summer_pics"),
-    array('$inc' => array("page hits" => 1)),
-    array("upsert" => true)
-);
-var_dump($c->findOne());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["_id"]=>
-  object(MongoId)#9 (0) {
-  }
-  ["uri"]=>
-  string(12) "/summer_pics"
-  ["page hits"]=>
-  int(1)
-}
-]]>
-   </screen>
-   <para>
-    If <parameter>$new_object</parameter> does not contain atomic modifiers
-    (i.e. <literal>$</literal> operators), upsert will use
-    <parameter>$new_object</parameter> as-is for the new document. This matches
-    the behavior of a normal update, where not using atomic modifiers causes the
-    document to be overwritten.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c->drop();
-$c->update(
-    array("name" => "joe"),
-    array("username" => "joe312", "createdAt" => new MongoDate()), 
-    array("upsert" => true)
-);
-var_dump($c->findOne());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["_id"]=>
-  object(MongoId)#10 (0) {
-  }
-  ["username"]=>
-  string(6) "joe312"
-  ["createdAt"]=>
-  object(MongoDate)#4 (0) {
-  }
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoCollection::update</function> multiple example</title>
-   <para>
-    By default, <function>MongoCollection::update</function> will only update
-    the first document matching <parameter>$criteria</parameter> that it
-    finds. Using the "multiple" option can override this behavior, if needed.
-   </para>
-   <para>
-    This example adds a "gift" field to every person whose birthday is in the
-    next day.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$today = array('$gt' => new MongoDate(), '$lt' => new MongoDate(strtotime("+1 day")));
-$people->update(
-    array("birthday" => $today),
-    array('$set' => array('gift' => $surprise)),
-    array("multiple" => true)
-);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   The <link linkend="mongo.updates">PHP documentation on updates</link> and the
-   <link xlink:href="&url.mongodb.dochub.update;">MongoDB core docs</link>.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocollection/validate.xml b/reference/mongo/mongocollection/validate.xml
deleted file mode 100644
index 36c88ce5b7..0000000000
--- a/reference/mongo/mongocollection/validate.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocollection.validate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCollection::validate</refname>
-  <refpurpose>Validates this collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCollection::validate</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>scan_data</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>scan_data</parameter>
-     </term>
-     <listitem>
-      <para>
-       Only validate indices, not the base collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database&apos;s evaluation of this object.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor.xml b/reference/mongo/mongocommandcursor.xml
deleted file mode 100644
index 000209c873..0000000000
--- a/reference/mongo/mongocommandcursor.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongocommandcursor" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCommandCursor class</title>
- <titleabbrev>MongoCommandCursor</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ MongocommandCursor intro -->
-  <section xml:id="mongocommandcursor.intro">
-   &reftitle.intro;
-   <para>
-    A command cursor is similar to a <classname>MongoCursor</classname> except
-    that you use it for iterating through the results of a database command
-    instead of a normal query. Command cursors are useful for iterating over
-    large result sets that might exceed the document size limit (currently 16MB)
-    of a single <function>MongoDB::command</function> response.
-   </para>
-   <para>
-    While you can create command cursors using
-    <function>MongoCommandCursor::__construct</function> or the
-    <function>MongoCommandCursor::createFromDocument</function> factory method,
-    you will generally want to use command-specific helpers such as
-    <function>MongoCollection::aggregateCursor</function>.
-   </para>
-   <para>
-    Note that the cursor does not "contain" the database command's results; it
-    just manages iteration through them. Thus, if you print a cursor (f.e. with
-    <function>var_dump</function> or <function>print_r</function>), you will see
-    the cursor object but not the result documents.
-   </para>
-  </section>
-
-  <section>
-   <title>Cursor Stages</title>
-   <para>
-    A <classname>MongoCommandCursor</classname> has two "life stages": pre-
-    and post- command. When a cursor is created, it has not yet contacted the
-    database, so it is in its pre-command state. When the client first attempts
-    to get a result (by calling <function>MongoCommandCursor::rewind</function>,
-    directly or indirectly), the cursor moves into the post-command state.
-   </para>
-   <para>
-    The command cursor's batch size and socket timeout may be configured in both
-    the pre- and post- command states.
-   </para>
-   <para>
-    <example xml:id="mongocommandcursor.stages.adding-options">
-     <title>Adding options to <classname>MongoCommandCursor</classname></title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = new MongoCommandCursor(...);
-
-$cursor = $cursor->batchSize( 4 );
-
-foreach ($cursor as $result) {
-    var_dump($result);
-}
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongocommandcursor.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCommandCursor</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCommandCursor</classname>
-     </ooclass>
-     <oointerface>
-      <interfacename>MongoCursorInterface</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-    <!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongocommandcursor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
-  <section role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><methodname>MongoDB::command</methodname></member>
-    <member><methodname>MongoCollection::aggregateCursor</methodname></member>
-   </simplelist>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongocommandcursor;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocommandcursor/batchsize.xml b/reference/mongo/mongocommandcursor/batchsize.xml
deleted file mode 100644
index ef8f6b7dfd..0000000000
--- a/reference/mongo/mongocommandcursor/batchsize.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.batchsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::batchSize</refname>
-  <refpurpose>Limits the number of elements returned in one batch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCommandCursor</type><methodname>MongoCommandCursor::batchSize</methodname>
-   <methodparam><type>int</type><parameter>batchSize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A cursor typically fetches a batch of result objects and store them
-   locally. This method sets the batchSize value to configure the amount of
-   documents retrieved from the server in one round trip.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>batchSize</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of results to return per batch. Each batch requires a
-       round-trip to the server. 
-      </para>
-      <para>
-       This cannot override MongoDB's limit on the amount of data it will return to 
-       the client (i.e., if you set batch size to 1,000,000,000, MongoDB will still 
-       only return 4-16MB of results per batch). 
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCommandCursor::batchSize</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$commandCursor->batchSize(20);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCursorInterface::batchSize</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/construct.xml b/reference/mongo/mongocommandcursor/construct.xml
deleted file mode 100644
index 77ffca28ce..0000000000
--- a/reference/mongo/mongocommandcursor/construct.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::__construct</refname>
-  <refpurpose>Create a new command cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoCommandCursor::__construct</methodname>
-   <methodparam><type>MongoClient</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ns</parameter></methodparam>
-   <methodparam><type>array</type><parameter>command</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Generally, you should not have to construct a
-   <classname>MongoCommandCursor</classname> manually, as there are helper
-   functions such as <methodname>MongoCollection::aggregateCursor</methodname>
-   and <methodname>MongoCollection::parallelCollectionScan</methodname>;
-   however, if the server introduces new commands that can return cursors, this
-   constructor will be useful in the absence of specific helper methods. You may
-   also consider using
-   <methodname>MongoCommandCursor::createFromDocument</methodname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>connection</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database connection.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>ns</parameter>
-     </term>
-     <listitem>
-      <para>
-       Full name of the database and collection (e.g.
-       <literal>"test.foo"</literal>)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>command</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database command.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the new cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><classname>MongoCommandCursor</classname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-
-// Define the aggregation pipeline
-$pipeline = [
-    [ '$group' => [
-        '_id' => '$country_code',
-        'timezones' => [ '$addToSet' => '$timezone' ]
-    ] ],
-    [ '$sort' => [ '_id' => 1 ] ],
-];
-
-// Construct a MongoCommandCursor object
-$cursor = new MongoCommandCursor(
-    $m, // MongoClient object
-    'demo.cities', // namespace
-    [
-        'aggregate' => 'cities',
-        'pipeline' => $pipeline,
-        'cursor' => [ 'batchSize' => 0 ],
-    ]
-);
-
-foreach($cursor as $result) {
-   …
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCommandCursor::createFromDocument</function></member>
-   <member><function>MongoCollection::aggregateCursor</function></member>
-   <member><function>MongoCollection::parallelCollectionScan</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/createfromdocument.xml b/reference/mongo/mongocommandcursor/createfromdocument.xml
deleted file mode 100644
index bbcf2fdb33..0000000000
--- a/reference/mongo/mongocommandcursor/createfromdocument.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.createfromdocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::createFromDocument</refname>
-  <refpurpose>Create a new command cursor from an existing command response document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>MongoCommandCursor</type><methodname>MongoCommandCursor::createFromDocument</methodname>
-   <methodparam><type>MongoClient</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hash</parameter></methodparam>
-   <methodparam><type>array</type><parameter>document</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Use this method if you have a raw command result with cursor information in
-   it. Note that cursors created with this method cannot be iterated multiple
-   times, as they will lack the original command necessary for re-execution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>connection</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database connection.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>hash</parameter>
-     </term>
-     <listitem>
-      <para>
-       The connection hash, as obtained through the third by-reference argument
-       to <methodname>MongoDB::command</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>document</parameter>
-     </term>
-     <listitem>
-      <para>
-       Document with cursor information in it. This document needs to contain
-       the <literal>id</literal>, <literal>ns</literal> and
-       <literal>firstBatch</literal> fields. Such a document is obtained by
-       calling the <methodname>MongoDB::command</methodname> with appropriate
-       arguments to return a cursor, and not just an inline result. See the
-       example below.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the new cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCommandCursor::createFromDocument</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$d = $m->demo;
-
-// Define the aggregation pipeline
-$pipeline = [
-    [ '$group' => [
-        '_id' => '$country_code',
-        'timezones' => [ '$addToSet' => '$timezone' ]
-    ] ],
-    [ '$sort' => [ '_id' => 1 ] ],
-];
-
-// Execute the command. The "cursor" option instructs the server to return
-// cursor information in the response instead of inline results.
-$r = $d->command(
-    [
-        'aggregate' => 'cities',
-        'pipeline' => $pipeline,
-        'cursor' => [ 'batchSize' => 1 ],
-    ],
-    null,
-    $hash
-);
-
-// Show result and hash
-var_dump( $r, $hash );
-
-// Construct the command cursor
-$cursor = MongoCommandCursor::createFromDocument( $m, $hash, $r );
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["cursor"]=>
-  array(3) {
-    ["id"]=>
-    object(MongoInt64)#5 (1) {
-      ["value"]=>
-      string(12) "392143983421"
-    }
-    ["ns"]=>
-    string(11) "demo.cities"
-    ["firstBatch"]=>
-    array(1) {
-      [0]=>
-      array(2) {
-        ["_id"]=>
-        string(2) "AD"
-        ["timezones"]=>
-        array(1) {
-          [0]=>
-          string(14) "Europe/Andorra"
-        }
-      }
-    }
-  }
-  ["ok"]=>
-  float(1)
-}
-string(25) "localhost:27017;-;.;17617"
-]]>
-   </screen>
-   <para>
-    As you can see, the returned cursor information has the
-    <literal>id</literal>, <literal>ns</literal> and
-    <literal>firstBatch</literal> fields.
-   </para>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCommandCursor::__construct</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/current.xml b/reference/mongo/mongocommandcursor/current.xml
deleted file mode 100644
index 47a6d66e9c..0000000000
--- a/reference/mongo/mongocommandcursor/current.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::current</refname>
-  <refpurpose>Returns the current element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCommandCursor::current</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This returns &null; until <function>MongoCommandCursor::rewind</function> is called.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   The current result document as an associative array. &null; will be returned
-   if there is no result.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::current</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/dead.xml b/reference/mongo/mongocommandcursor/dead.xml
deleted file mode 100644
index 59dbe73cd0..0000000000
--- a/reference/mongo/mongocommandcursor/dead.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.dead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::dead</refname>
-  <refpurpose>Checks if there are results that have not yet been sent from the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCommandCursor::dead</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This method checks whether the <classname>MongoCommandCursor</classname>
-   cursor has been exhausted and the database has no more results to send to the
-   client. A cursor being "dead" does not necessarily mean that there are no
-   more results available for iteration.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if there are more results that have not yet been sent to the
-   client, and &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCursorInterface::dead</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/getreadpreference.xml b/reference/mongo/mongocommandcursor/getreadpreference.xml
deleted file mode 100644
index 478a3eb3c1..0000000000
--- a/reference/mongo/mongocommandcursor/getreadpreference.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::getReadPreference</refname>
-  <refpurpose>Get the read preference for this command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCommandCursor::getReadPreference</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCommandCursor::getReadPreference</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient('mongodb://rs1.example.com:27017', array('replicaSet' => 'myReplSetName'));
-$collection = $m->selectCollection('test', 'people');
-
-// If a MongoCommandCursor is constructed directly, it will inherit the read
-// preference of the MongoClient instance passed to its constructor; however,
-// MongoCollection::aggregateCursor() will have the MongoCommandCursor inherit
-// the collection's read preference.
-$collection->setReadPreference(MongoClient::RP_SECONDARY);
-
-$cursor = $collection->aggregateCursor( [
-    [ '$group' => [ '_id' => '$name', 'points' => [ '$sum' => '$points' ] ] ],
-    [ '$sort' => [ 'points' => -1 ] ],
-] );
-
-var_dump($cursor->getReadPreference());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["type"]=>
-  string(9) "secondary"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCommandCursor::setReadPreference</function></member>
-   <member><function>MongoCursorInterface::getReadPreference</function></member>
-  </simplelist>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocommandcursor/info.xml b/reference/mongo/mongocommandcursor/info.xml
deleted file mode 100644
index 7d562d7b36..0000000000
--- a/reference/mongo/mongocommandcursor/info.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::info</refname>
-  <refpurpose>Gets information about the cursor's creation and iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCommandCursor::info</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This can be called before or after the cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the namespace, batch size, limit, skip, flags, query, and projected
-   fields for this cursor. If the cursor has started iterating, additional
-   information about iteration and the connection will be included.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCommandCursor::info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-
-$cursor = new MongoCommandCursor(
-    $m, // MongoClient object
-    'demo.cities', // namespace
-    [
-        'aggregate' => 'cities',
-        'pipeline' => [ [ '$match' => [ '_id' => [ '$exists' => true ] ] ] ],
-        'cursor' => [ 'batchSize' => 1 ],
-    ]
-);
-
-echo "Before iteration started:\n";
-var_dump($cursor->info());
-
-echo "\nAfter iteration started:\n";
-$cursor->rewind();
-var_dump($cursor->info());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Before iteration started:
-array(8) {
-  ["ns"]=>
-  string(11) "demo.cities"
-  ["limit"]=>
-  int(0)
-  ["batchSize"]=>
-  int(0)
-  ["skip"]=>
-  int(0)
-  ["flags"]=>
-  int(0)
-  ["query"]=>
-  array(3) {
-    ["aggregate"]=>
-    string(6) "cities"
-    ["pipeline"]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        ["$match"]=>
-        array(1) {
-          ["_id"]=>
-          array(1) {
-            ["$exists"]=>
-            bool(true)
-          }
-        }
-      }
-    }
-    ["cursor"]=>
-    array(1) {
-      ["batchSize"]=>
-      int(1)
-    }
-  }
-  ["fields"]=>
-  NULL
-  ["started_iterating"]=>
-  bool(false)
-}
-
-After iteration started:
-array(17) {
-  ["ns"]=>
-  string(11) "demo.cities"
-  ["limit"]=>
-  int(0)
-  ["batchSize"]=>
-  int(0)
-  ["skip"]=>
-  int(0)
-  ["flags"]=>
-  int(0)
-  ["query"]=>
-  array(3) {
-    ["aggregate"]=>
-    string(6) "cities"
-    ["pipeline"]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        ["$match"]=>
-        array(1) {
-          ["_id"]=>
-          array(1) {
-            ["$exists"]=>
-            bool(true)
-          }
-        }
-      }
-    }
-    ["cursor"]=>
-    array(1) {
-      ["batchSize"]=>
-      int(1)
-    }
-  }
-  ["fields"]=>
-  NULL
-  ["started_iterating"]=>
-  bool(true)
-  ["id"]=>
-  int(185840310129)
-  ["at"]=>
-  int(0)
-  ["numReturned"]=>
-  int(0)
-  ["server"]=>
-  string(25) "localhost:27017;-;.;23991"
-  ["host"]=>
-  string(9) "localhost"
-  ["port"]=>
-  int(27017)
-  ["connection_type_desc"]=>
-  string(10) "STANDALONE"
-  ["firstBatchAt"]=>
-  int(0)
-  ["firstBatchNumReturned"]=>
-  int(1)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCursorInterface::info</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/key.xml b/reference/mongo/mongocommandcursor/key.xml
deleted file mode 100644
index 79df013cce..0000000000
--- a/reference/mongo/mongocommandcursor/key.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::key</refname>
-  <refpurpose>Returns the current result&apos;s index within the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoCommandCursor::key</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current result&apos;s index within the result set.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::key</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/rewind.xml b/reference/mongo/mongocommandcursor/rewind.xml
deleted file mode 100644
index b50aab8fd4..0000000000
--- a/reference/mongo/mongocommandcursor/rewind.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::rewind</refname>
-  <refpurpose>Executes the command and resets the cursor to the start of the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCommandCursor::rewind</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   If the cursor has already started iteration, the command will be re-executed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The raw server result document.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the
-   database and <classname>MongoCursorTimeoutException</classname> if the
-   timeout is exceeded.
-  </para>
-  <para>
-   Throws <classname>MongoCursorException</classname> if the cursor was created
-   with <function>MongoCommandCursor::createFromDocument</function> and has
-   already started iteration. Such cursors cannot be iterated multiple times, as
-   they lack the original command necessary for re-execution.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCommandCursor::rewind</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rawResult = $commandCursor->rewind();
-
-// Command cursor is now reset to the start of the result set
-
-var_dump($rawResult);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["cursor"]=>
-  array(3) {
-    ["id"]=>
-    object(MongoInt64)#5 (1) {
-      ["value"]=>
-      string(12) "310050110216"
-    }
-    ["ns"]=>
-    string(9) "demo.test"
-    ["firstBatch"]=>
-    array(1) {
-      [0]=>
-      array(2) {
-        ["_id"]=>
-        object(MongoId)#6 (1) {
-          ["$id"]=>
-          string(24) "52f5691544670a8077b0dc51"
-        }
-        ["value"]=>
-        string(2) "42"
-      }
-    }
-  }
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::rewind</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/setreadpreference.xml b/reference/mongo/mongocommandcursor/setreadpreference.xml
deleted file mode 100644
index e22b77c999..0000000000
--- a/reference/mongo/mongocommandcursor/setreadpreference.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.setreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::setReadPreference</refname>
-  <refpurpose>Set the read preference for this command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCommandCursor</type><methodname>MongoCommandCursor::setReadPreference</methodname>
-   <methodparam><type>string</type><parameter>read_preference</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tags</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setreadpreference.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setreadpreference.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCommandCursor::setReadPreference</methodname> tag set array syntax example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient('mongodb://rs1.example.com:27017', array('replicaSet' => 'myReplSetName'));
-$collection = $m->selectCollection('test', 'people');
-
-$cursor = $collection->aggregateCursor( [
-    [ '$group' => [ '_id' => '$name', 'points' => [ '$sum' => '$points' ] ] ],
-    [ '$sort' => [ 'points' => -1 ] ],
-] );
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$cursor->setReadPreference(MongoClient::RP_NEAREST, [
-    [ 'dc' => 'east', 'use' => 'reporting' ],
-    [ 'dc' => 'west' ],
-] );
-
-foreach ($cursor as $person) {
-    // ...
-}
-
-// If the read preference is changed, it will be used the next time the cursor
-// is rewound and the command is re-executed.
-$cursor->setReadPreference(MongoClient::RP_PRIMARY);
-
-foreach ($cursor as $person) {
-    // ...
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCommandCursor::getReadPreference</function></member>
-   <member><function>MongoCursorInterface::setReadPreference</function></member>
-  </simplelist>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocommandcursor/timeout.xml b/reference/mongo/mongocommandcursor/timeout.xml
deleted file mode 100644
index 02568dab57..0000000000
--- a/reference/mongo/mongocommandcursor/timeout.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.timeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::timeout</refname>
-  <refpurpose>Sets a client-side timeout for this command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCommandCursor</type><methodname>MongoCommandCursor::timeout</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A timeout can be set at any time and will affect subsequent data retrieval
-   associated with this cursor, including fetching more results from the
-   database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>ms</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of milliseconds for the cursor to wait for a response. Use
-      <literal>-1</literal> to wait forever. By default, the cursor will wait
-      <varname>30000</varname> milliseconds (30 seconds).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Causes methods that fetch results to throw a
-   <classname>MongoCursorTimeoutException</classname> if the data fetch takes
-   longer than the specified number of milliseconds.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCommandCursor::timeout</function> example</title>
-   <para>
-    In the following example, the driver will wait for 60 seconds for the
-    first response from the aggregate command. It will also wait for 60
-    seconds each time the server needs to be polled for more information.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient;
-$col = $m->database->collection;
-
-$pipeline = [ … ];
-
-$cursor = $col->aggregateCursor( $pipeline );
-$cursor->timeout( 60000 ); // for 60 seconds
-
-foreach ( $cursor as $result ) {
-   …
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-     This does not cause the MongoDB server to cancel long-running operations;
-     it only instructs the driver to stop waiting for a response and throw a
-     <classname>MongoCursorTimeoutException</classname> after a set time.
-     If you need to specify a server-side timeout for a command, considering
-     passing the <literal>maxTimeMS</literal> option to
-     <methodname>MongoCollection::aggregateCursor</methodname>.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoCollection::aggregateCursor</function></member>
-   <member><methodname>MongoCursorInterface::timeout</methodname></member>
-   <member>The <literal>socketTimeoutMS</literal> option for <function>MongoClient::__construct</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocommandcursor/valid.xml b/reference/mongo/mongocommandcursor/valid.xml
deleted file mode 100644
index 53b4ed8e81..0000000000
--- a/reference/mongo/mongocommandcursor/valid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCommandCursor::valid</refname>
-  <refpurpose>Checks if the cursor is reading a valid result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCommandCursor::valid</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the current result is not null, and &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::valid</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoconnectionexception.xml b/reference/mongo/mongoconnectionexception.xml
deleted file mode 100644
index 5129d82aae..0000000000
--- a/reference/mongo/mongoconnectionexception.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongoconnectionexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoConnectionException class</title>
- <titleabbrev>MongoConnectionException</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ Mongoconnectionexception intro -->
-  <section xml:id="mongoconnectionexception.intro">
-   &reftitle.intro;
-   <para>
-    Thrown when the driver fails to connect to the database.
-   </para>
-
-   <para>
-    There are a number of possible error messages to help you diagnose the 
-    connection problem.  These are:
-   </para>
-
-   <itemizedlist>
-    <listitem>
-     <para>
-      <literal>No candidate servers found</literal>
-     </para>
-     <para>
-     Thrown when the driver cannot establish a connection to MongoDB
-     (fulfilling the ReadPreferences, if specified).
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>No server name given.</literal>
-     </para>
-     <para>
-      This error occurs if you pass in "" as the server name, 
-      probably because of an typo with string interpolation, 
-      e.g., "$servr" instead of "$server".
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>
-       failed to get host [hostname] or port [portnum] 
-       from [server].
-      </literal>
-     </para>
-     <para>
-       This indicated that the server string was malformed.  
-       "[hostname]" and "[portnum]" will be as much as the 
-       driver could dicipher of it.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>Operation in progress</literal>
-     </para>
-     <para>
-      Connecting to the database timed out.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>Transport endpoint is not connected</literal>
-     </para>
-     <para>
-      Generally means that the connection string isn't correct, the driver
-      couldn't even find the database server.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>couldn't determine master</literal>
-     </para>
-     <para>
-      No server in a replica set connection was identified as the primary.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>couldn't get host info for [server]</literal>
-     </para>
-     <para>
-      This indicated that DNS could not resolve the server address 
-      you gave.  This could easily be caused by a typo, for example, 
-      "server" instead of "$server".
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>Invalid Argument</literal>
-     </para>
-     <para>
-      This can be caused by attempting to connect to a machine that is up but
-      that the database isn't actually running on.  Make sure that you've
-      started the database server before connecting.      
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>Permission denied</literal>
-     </para>
-     <para>
-      This means that the socket could not be opened due to permissions issues.
-      On Red Hat variants, this can be caused by a default setting that does not
-      allow Apache to create network connections.  You can override this setting
-      by running:
-      <programlisting role="shell">
-<![CDATA[
-$ /usr/sbin/setsebool -P httpd_can_network_connect 1
-]]>
-      </programlisting>
-      then restarting Apache.
-     </para>
-    </listitem>
-   </itemizedlist>
-
-   <para>  
-    If the error message is not listed above, it is probably an error 
-    from the C socket, and you can search the web for its usual cause.
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongoconnectionexception.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoConnectionException</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoConnectionException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-    
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursor.xml b/reference/mongo/mongocursor.xml
deleted file mode 100644
index 84dff81ef4..0000000000
--- a/reference/mongo/mongocursor.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongocursor" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCursor class</title>
- <titleabbrev>MongoCursor</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ Mongocursor intro -->
-  <section xml:id="mongocursor.intro">
-   &reftitle.intro;
-   <para>
-    A cursor is used to iterate through the results of a database query.  For 
-    example, to query the database and see all results, you could do:
-    <example xml:id="mongocursor.intro-example">
-     <title><classname>MongoCursor</classname> basic usage</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find();
-var_dump(iterator_to_array($cursor));
-
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <para>
-    You don't generally create cursors using the 
-    <classname>MongoCursor</classname> constructor, you get a new cursor by
-    calling <function>MongoCollection::find</function> (as shown above).
-   </para>
-   <para>
-    Suppose that, in the example above, <literal>$collection</literal> was a
-    50GB collection.  We certainly wouldn't want to load that into memory all 
-    at once, which is what a cursor is for: allowing the client to access the 
-    collection in dribs and drabs.  
-   </para>
-   <para>
-    If we have a large result set, we can iterate through it, loading a few 
-    megabytes of results into memory at a time.  For example, we could do:
-    <example>
-     <title>Iterating over <classname>MongoCursor</classname></title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find();
-
-foreach ($cursor as $doc) {
-    // do something to each document
-}
-
-?>
-]]>
-     </programlisting>
-    </example>
-    This will go through each document in the collection, loading and garbage 
-    collecting documents as needed.
-   </para>
-   <para>
-    Note that this means that a cursor does not "contain" the database results, 
-    it just manages them.  Thus, if you print a cursor (with, say, 
-    <function>var_dump</function> or <function>print_r</function>), you'll just 
-    get the cursor object, not your documents.  To get the documents themselves, 
-    you can use one of the methods shown above.
-   </para>
-  </section>
-
-  <section>
-   <title>Cursor Stages</title>
-   <para>
-    A <classname>MongoCursor</classname> has two "life stages": pre- and post-
-    query. When a cursor is created, it has not yet contacted the database, so 
-    it is in its pre-query state.  In this state, the client can further specify
-    what they want the query to do, including adding limits, skips, sorts, and 
-    more advanced options.
-   </para>
-   <para>
-    When the client attempts to get a result (by calling 
-    <function>MongoCursor::next</function>, directly or indirectly), the cursor
-    moves into the post-query stage.  At this point, the query has been executed
-    by the database and cannot be modified anymore.
-   </para>
-   <para>
-    <example xml:id="mongocursor.stages.adding-options">
-     <title>Adding options to <classname>MongoCursor</classname></title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find()->limit(10);
-
-// database has not yet been queried, so more search options can be added
-$cursor = $cursor->sort(array("a" => 1));
-
-var_dump($cursor->getNext());
-// now database has been queried and more options cannot be added
-
-// so this will throw an exception:
-$cursor->skip(4);
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongocursor.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCursor</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCursor</classname>
-     </ooclass>
-     <oointerface>
-      <interfacename>MongoCursorInterface</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-    <!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Static Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>static</modifier>
-     <type>bool</type>
-     <varname linkend="mongocursor.props.slaveokay">slaveOkay</varname>
-     <initializer>&false;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>static</modifier>
-     <type>int</type>
-     <varname linkend="mongocursor.props.timeout">timeout</varname>
-     <initializer>30000</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongocursor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
-  <section>
-   <title>Static Variables</title>
-
-   <variablelist>
-    <varlistentry xml:id="mongocursor.props.slaveokay">
-     <term><varname>slaveOkay</varname></term>
-     <listitem>
-      <para>
-       If the query should have the "slaveOkay" flag set, which allows reads on
-       the secondary (secondaries are, by default, just for backup and not
-       queried). Can be overridden with <function>MongoCursor::slaveOkay</function>.
-      </para>
-      <para>
-       This functionality is <emphasis>deprecated</emphasis>. Please use
-       <xref linkend="mongo.readpreferences" /> instead.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongocursor.props.timeout">
-     <term><varname>timeout</varname></term>
-     <listitem>
-      <para>
-       Set timeout in milliseconds for all database responses. Use
-       <literal>-1</literal> to wait forever. Can be overridden with
-       <function>MongoCursor::timeout</function>. This does not cause the
-       MongoDB server to cancel the operation; it only instructs the driver to
-       stop waiting for a response and throw a
-       <classname>MongoCursorTimeoutException</classname> after a set time.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
-  <section role="seealso">
-   &reftitle.seealso;
-   <para>
-    MongoDB core docs on <link xlink:href="&url.mongodb.dochub.cursors;">cursors</link>.
-   </para>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongocursor;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursor/addoption.xml b/reference/mongo/mongocursor/addoption.xml
deleted file mode 100644
index 8ddd3a32a0..0000000000
--- a/reference/mongo/mongocursor/addoption.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.addoption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::addOption</refname>
-  <refpurpose>Adds a top-level key/value pair to a query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::addOption</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This is an advanced function and should not be used unless you know what 
-   you're doing.
-  </para>
-  <para>
-   A query can optionally be nested in a "query" field if other options, such as
-   a sort or hint, are given.  For instance, adding a sort causes the query 
-   to become a subfield of a bigger query object, like:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$query = array("query" => $query, "orderby" => $sort);
-
-?>
-]]>
-   </programlisting>
-  </para>
-  <para>
-   This method is for adding a top-level field to a query.  It makes the query a
-   subobject (if it isn't already) and adds the key/value pair of your chosing
-   to the top level.
-  </para>
-  <warning>
-   <para>
-    It cannot be used to add extra criteria to a query on the fly.  For instance,
-    this <emphasis>will not</emphasis> work:
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// NOT CORRECT
-$cursor = $users->find()->addOption("name", "joe")->addOption("age", 20);
-
-?>
-]]>
-    </programlisting>
-    This <emphasis>does not</emphasis> query for a user named "joe" with an age of 20.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>key</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fieldname to add.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>value</parameter>
-     </term>
-     <listitem>
-      <para>
-       Value to add.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Adding a comment with <function>MongoCursor::addOption</function> example</title>
-   <para>
-    MongoDB supports special options to be send to the server. The shell uses
-    the <literal>_addSpecial</literal> option to send a
-    <literal>$comment</literal> to the server. This comment will show up in
-    the profiling log (for slow queries f.e.). In the PHP driver, you use the
-    <function>MongoCursor::addOption</function> method.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient;
-$c = $m->demo->demo;
-$cursor = $c->find();
-$cursor->addOption('$comment', "This comment will show up in the profiling log");
-
-foreach ($cursor as $document) { /* empty */ }
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-{
-    "op" : "query",
-    "ns" : "demo.demo",
-    "query" : {
-        "$query" : {
-             
-        },
-        "$comment" : "This comment will show up in the profiling log"
-    },
-    "cursorid" : 168463566447,
-    "ntoreturn" : 0,
-    "ntoskip" : 0,
-    "nscanned" : 101,
-    "nscannedObjects" : 101,
-    "keyUpdates" : 0,
-    "numYield" : 0,
-…
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoCursor::addOption</function> example</title>
-   <para>
-    Using <function>MongoCursor::skip</function> to skip over millions of 
-    results can become slow.  One way around this is to use 
-    <literal>$min</literal> or <literal>$max</literal> options for the query.
-    These can be handy, but they require an index on exactly the fields being 
-    searched for.  This is an example of how to use <literal>$min</literal> as
-    an alternative to <function>MongoCursor::skip</function>.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// make sure we have an index
-$c->ensureIndex(array("ts" => 1));
-
-// you may have to modify this to run in a reasonable amount of time on slow 
-// machines (should take about 30 seconds on a good machine)
-for ($i = 0; $i < 30000000; $i++) {
-    $c->insert(array("ts" => new MongoDate(), "i" => $i));
-}
-
-$now = strtotime("now");
-
-// find documents inserted in the last 2 seconds
-$cursor = $c->find()->addOption('$min', array("ts" => $now-2));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/awaitdata.xml b/reference/mongo/mongocursor/awaitdata.xml
deleted file mode 100644
index 4da87f908c..0000000000
--- a/reference/mongo/mongocursor/awaitdata.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.awaitdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::awaitData</refname>
-  <refpurpose>Sets whether this cursor will wait for a while for a tailable cursor to return more data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::awaitData</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>wait</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is to be used with tailable cursors. If we are at the end of
-   the data, block for a while rather than returning no data. After a timeout
-   period, we do return as normal.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>wait</parameter>
-     </term>
-     <listitem>
-      <para>
-       If the cursor should wait for more data to become available.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::awaitData</function> example</title>
-   <para>
-    In this example we tail the "oplog" and instead of sleeping during every
-    iteration, we set the <function>MongoCursor::awaitData</function> option.
-    <function>MongoCursor::hasNext</function> will now block until there is
-    more data available.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient( 'mongodb://localhost:13000', array( 'replSet' => 'seta' ) );
-$c = $m->local->selectCollection( 'oplog.rs' );
-$cursor = $c->find( array( 'ns' => 'demo.article', 'op' => 'i' ) );
-$cursor->tailable( true );
-$cursor->awaitData( true );
-
-while (true) {
-    if (!$cursor->hasNext()) {
-        // we've read all the results, exit
-        if ($cursor->dead()) {
-            break;
-        }
-    } else {
-        var_dump( $cursor->getNext() );
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.dochub.tailable;">tailable cursors</link>.
-  </para>
-  <para>
-   <simplelist>
-    <member><function>MongoCursor::tailable</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/batchsize.xml b/reference/mongo/mongocursor/batchsize.xml
deleted file mode 100644
index b76f72275b..0000000000
--- a/reference/mongo/mongocursor/batchsize.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.batchsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::batchSize</refname>
-  <refpurpose>Limits the number of elements returned in one batch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::batchSize</methodname>
-   <methodparam><type>int</type><parameter>batchSize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A cursor typically fetches a batch of result objects and store them
-   locally. This method sets the batchSize value to configure the amount of
-   documents retrieved from the server in one round trip. However, it will
-   never return more documents than fit in the max batch size limit (usually
-   4MB).  
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>batchSize</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of results to return per batch. Each batch requires a
-       round-trip to the server. 
-      </para>
-      <para>
-       If <parameter>batchSize</parameter> is <emphasis>2 or
-       more</emphasis>, it represents the size of each batch of objects retrieved.
-       It can be adjusted to optimize performance and limit data transfer.
-      </para>
-      <para>
-       If <parameter>batchSize</parameter> is <literal>1</literal> or negative, it
-       will limit of number returned documents to the absolute value of batchSize,
-       and the cursor will be closed. For example if
-       batchSize is <literal>-10</literal>, then the server will return a maximum
-       of 10 documents and as many as can fit in 4MB, then close the cursor.
-      </para>
-      <warning>
-       <para>
-        A <parameter>batchSize</parameter> of <literal>1</literal> is special, and
-        means the same as <literal>-1</literal>, i.e. a value of
-        <literal>1</literal> makes the cursor only capable of returning
-        <emphasis>one</emphasis> document.
-       </para>
-      </warning>
-      <para>
-       Note that this feature is different from
-       <function>MongoCursor::limit</function> in that documents must fit within a
-       maximum size, and it removes the need to send a request to close the cursor
-       server-side. The batch size can be changed even after a cursor is iterated,
-       in which case the setting will apply on the next batch retrieval. 
-      </para>
-      <para>
-       This cannot override MongoDB's limit on the amount of data it will return to 
-       the client (i.e., if you set batch size to 1,000,000,000, MongoDB will still 
-       only return 4-16MB of results per batch). 
-      </para>
-      <para>
-       To ensure consistent behavior, the rules of
-       <function>MongoCursor::batchSize</function> and
-       <function>MongoCursor::limit</function> behave a 
-       little complex but work "as expected".  The rules are: hard limits override 
-       soft limits with preference given to <function>MongoCursor::limit</function>
-       over <function>MongoCursor::batchSize</function>.  After that, whichever is 
-       set and lower than the other will take precedence. See below.
-       section for some examples.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::batchSize</function> and combinations with
-   <function>MongoCursor::limit</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// one batch, at most 10 items. The -10 makes the server to return 10 items,
-// and then remove the cursor.
-$cursor->limit(20)->batchSize(-10);
-
-// first batch: at most 10 items
-$cursor->limit(10);
-
-// first batch: at most 10 items
-$cursor->limit(10)->batchSize(20);
-
-// results are fetched in batches of 10 each, with a maximum of 20 items
-// returned (that means two batches of 10).
-$cursor->limit(20)->batchSize(10);
-
-// results are fetched in batches of 7 each, with a maximum of 30 items
-// returned (that means that the driver requests 4 batches of 7, and one batch
-// of 2).
-$cursor->limit(30)->batchSize(7)
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.dochub.batchsize;">batchSize</link>.
-  </para>
-  <para>
-   <simplelist>
-    <member><function>MongoCursor::limit</function></member>
-    <member><methodname>MongoCursorInterface::batchSize</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.4.5</entry>
-       <entry>
-        <para>
-         Before 1.4.5, this method would throw an
-         <classname>MongoCursorException</classname> if the cursor had already
-         started iterating.
-        </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/construct.xml b/reference/mongo/mongocursor/construct.xml
deleted file mode 100644
index 824b78dd83..0000000000
--- a/reference/mongo/mongocursor/construct.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::__construct</refname>
-  <refpurpose>Create a new cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoCursor::__construct</methodname>
-   <methodparam><type>MongoClient</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ns</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>fields</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>connection</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database connection.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>ns</parameter>
-     </term>
-     <listitem>
-      <para>
-       Full name of database and collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database query.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>fields</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields to return.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the new cursor.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/count.xml b/reference/mongo/mongocursor/count.xml
deleted file mode 100644
index ba7ab30d89..0000000000
--- a/reference/mongo/mongocursor/count.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::count</refname>
-  <refpurpose>Counts the number of results for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoCursor::count</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>foundOnly</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method does not affect the state of the cursor: if you haven't queried 
-   yet, you can still apply limits, skips, etc.  If you have started iterating
-   through results, it will not move the current position of the cursor.  If you
-   have exhausted the cursor, it will not reset it.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>foundOnly</parameter>
-    </term>
-    <listitem>
-     <para>
-      Send cursor limit and skip information to the count function, if applicable.
-     </para>
-    </listitem>
-   </varlistentry>   
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   The number of documents returned by this cursor's query.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array('x'=>1));
-$collection->insert(array('x'=>2));
-$collection->insert(array('x'=>3));
-
-$cursor = $collection->find();
-
-var_dump($cursor->count());
-var_dump($cursor->count(true));
-
-$cursor->limit(2);
-
-var_dump($cursor->count());
-var_dump($cursor->count(true));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(3)
-int(3)
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the 
-   database.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/current.xml b/reference/mongo/mongocursor/current.xml
deleted file mode 100644
index 940f29d574..0000000000
--- a/reference/mongo/mongocursor/current.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::current</refname>
-  <refpurpose>Returns the current element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCursor::current</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This returns &null; until <function>MongoCursor::next</function> is called.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   The current result document as an associative array. &null; will be returned
-   if there is no result.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::current</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/dead.xml b/reference/mongo/mongocursor/dead.xml
deleted file mode 100644
index 3889fabd13..0000000000
--- a/reference/mongo/mongocursor/dead.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.dead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::dead</refname>
-  <refpurpose>Checks if there are results that have not yet been sent from the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCursor::dead</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   The database sends responses in batches of documents, up to 4MB of documents
-   per response. This method checks if the database has more batches or if the 
-   result set has been exhausted.
-  </para>
-  <para>
-   A cursor being "dead" does not mean that 
-   <function>MongoCursor::hasNext</function> will return &false;, it only means
-   that the database is done sending results to the client. The client should
-   continue iterating through results until 
-   <function>MongoCursor::hasNext</function> is &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if there are more results that have not yet been sent to the
-   client, and &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCursorInterface::dead</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/doquery.xml b/reference/mongo/mongocursor/doquery.xml
deleted file mode 100644
index c00789adb2..0000000000
--- a/reference/mongo/mongocursor/doquery.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.doquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::doQuery</refname>
-  <refpurpose>Execute the query</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <type>void</type><methodname>MongoCursor::doQuery</methodname>
-   <void/>
-  </methodsynopsis>
-  <warning>
-   <para>
-    Please do not use me.
-   </para>
-  </warning>
-  <para>
-   This function actually queries the database.  All queries and commands go 
-   through this function.  Thus, this function can be overridden to provide 
-   custom query handling.  
-  </para>
-  <para>
-   This handles serializing your query, sending it to the database, receiving a 
-   response, and deserializing it.  Thus, if you are planning to override this,
-   your code should probably call out to the original to use the existing
-   functionality (see the example below).
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &null;.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the 
-   database.
-  </para>
- </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <para>
-   <example xml:id="mongocursor.doquery.example.basic"><!-- {{{ -->
-    <title><function>MongoCursor::doQuery</function> example</title>
-    <para>
-     You could override this function to attempt a query on a secondary and, if
-     that fails, try it again on the primary.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-class MyCursor extends MongoCursor {
-
-    protected function doQuery() {
-
-        $this->slaveOkay();
-
-        try {
-            MongoCursor::doQuery();
-        }
-        catch(MongoCursorException $e) {
-            $this->slaveOkay(false);
-            MongoCursor::doQuery();
-        }
-    }
-}
-
-?>
-]]>
-    </programlisting>
-   </example><!-- }}} -->
-  </para>
- </refsect1><!-- }}} --> 
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/explain.xml b/reference/mongo/mongocursor/explain.xml
deleted file mode 100644
index 253bf10f17..0000000000
--- a/reference/mongo/mongocursor/explain.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.explain" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::explain</refname>
-  <refpurpose>Return an explanation of the query, often useful for optimization and debugging</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCursor::explain</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns an explanation of the query.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::explain</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find(array("x"=>1), array("y"));
-$cursor->sort(array("z" => 1))->limit(4)->skip(5);
-
-var_dump($cursor->explain());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(8) {
-  ["cursor"]=>
-  string(15) "BtreeCursor x_1"
-  ["startKey"]=>
-  array(1) {
-    ["x"]=>
-    int(1)
-  }
-  ["endKey"]=>
-  array(1) {
-    ["x"]=>
-    int(1)
-  }
-  ["nscanned"]=>
-  float(4)
-  ["n"]=>
-  int(4)
-  ["scanAndOrder"]=>
-  int(1)
-  ["millis"]=>
-  int(3)
-  ["allPlans"]=>
-  array(2) {
-    [0]=>
-    array(3) {
-      ["cursor"]=>
-      string(15) "BtreeCursor x_1"
-      ["startKey"]=>
-      array(1) {
-        ["x"]=>
-        int(1)
-      }
-      ["endKey"]=>
-      array(1) {
-        ["x"]=>
-        int(1)
-      }
-    }
-    [1]=>
-    array(3) {
-      ["cursor"]=>
-      string(11) "BasicCursor"
-      ["startKey"]=>
-      array(0) {
-      }
-      ["endKey"]=>
-      array(0) {
-      }
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the 
-   database.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.dochub.explain;">explain</link>.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/fields.xml b/reference/mongo/mongocursor/fields.xml
deleted file mode 100644
index 77e0034c6b..0000000000
--- a/reference/mongo/mongocursor/fields.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.fields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::fields</refname>
-  <refpurpose>Sets the fields for a query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::fields</methodname>
-   <methodparam><type>array</type><parameter>f</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Fields are specified by <literal>"fieldname" : bool</literal>.  &true; 
-   indicates that a field should be returned, &false; indicates that it should
-   not be returned.  You can also use 1 and 0 instead of &true; and &false;.
-  </para>
-  <para>
-   Thus, to return only the "summary" field, one could say:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor->fields(array("summary" => true));
-
-?>
-]]>
-  </programlisting>
-  <para>
-   To return all fields except the "hidden" field:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor->fields(array("hidden" => false));
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>f</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields to return (or not return).
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started
-   iterating or a scalar argument is given.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/getnext.xml b/reference/mongo/mongocursor/getnext.xml
deleted file mode 100644
index ba470bd0ec..0000000000
--- a/reference/mongo/mongocursor/getnext.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.getnext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::getNext</refname>
-  <refpurpose>Advances the cursor to the next result, and returns that result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCursor::getNext</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <note>
-   <para>
-    <methodname>MongoCursor::getNext</methodname> is an alias of <methodname>MongoCursor::next</methodname>.
-   </para>
-  </note>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/getreadpreference.xml b/reference/mongo/mongocursor/getreadpreference.xml
deleted file mode 100644
index 2373dca64d..0000000000
--- a/reference/mongo/mongocursor/getreadpreference.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocursor.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::getReadPreference</refname>
-  <refpurpose>Get the read preference for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCursor::getReadPreference</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCursor::getReadPreference</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$cursor = $m->test->users->find();
-$cursor->setReadPreference(MongoClient::RP_SECONDARY, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-    array(),
-));
-var_dump($cursor->getReadPreference());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["type"]=>
-  string(9) "secondary"
-  ["tagsets"]=>
-  array(3) {
-    [0]=>
-    array(2) {
-      ["dc"]=>
-      string(4) "east"
-      ["use"]=>
-      string(9) "reporting"
-    }
-    [1]=>
-    array(1) {
-      ["dc"]=>
-      string(7) "west"
-    }
-    [2]=>
-    array(0) {
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCursor::setReadPreference</function></member>
-   <member><function>MongoCursorInterface::getReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursor/hasnext.xml b/reference/mongo/mongocursor/hasnext.xml
deleted file mode 100644
index 7194f454b9..0000000000
--- a/reference/mongo/mongocursor/hasnext.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.hasnext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::hasNext</refname>
-  <refpurpose>Checks if there are any more elements in this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCursor::hasNext</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns if there is another element.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach 
-   the database and <classname>MongoCursorTimeoutException</classname> if the
-   timeout is exceeded.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/hint.xml b/reference/mongo/mongocursor/hint.xml
deleted file mode 100644
index 6081f6322b..0000000000
--- a/reference/mongo/mongocursor/hint.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.hint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::hint</refname>
-  <refpurpose>Gives the database a hint about the query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::hint</methodname>
-   <methodparam><type>mixed</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>index</parameter>
-     </term>
-     <listitem>
-      <para>
-       Index to use for the query. If a string is passed, it should correspond
-       to an index name. If an array or object is passed, it should correspond
-       to the specification used to create the index (i.e. the first argument
-       to <function>MongoCollection::ensureIndex</function>).
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.4.0</entry>
-       <entry>
-        <para>
-         The <parameter>index</parameter> argument now supports index names as
-         string values. In versions before 1.4.0, only array or object values
-         were accepted.
-        </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/immortal.xml b/reference/mongo/mongocursor/immortal.xml
deleted file mode 100644
index c3773fc1f1..0000000000
--- a/reference/mongo/mongocursor/immortal.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.immortal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::immortal</refname>
-  <refpurpose>Sets whether this cursor will timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::immortal</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>liveForever</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   After remaining idle on the server for some amount of time, cursors, by
-   default, "die."  This is generally the behavior one wants. The database
-   cleans up a cursor once all of its results have been sent to the client,
-   but if the client doesn't request all of the results, the cursor will
-   languish there, taking up resources.  Thus, after a few minutes, the cursor
-   "times out" and the database assumes the client has gotten everything it
-   needs and cleans up its the cursor's resources.
-  </para>
-  <para>
-   If, for some reason, you need a cursor to hang around for a long time, you
-   can prevent the database from cleaning it up by using this method.
-   However, if you make a cursor immortal, you need to iterate through all of
-   its results (or at least until <methodname>MongoCursor::dead</methodname>
-   returns &true;) or the cursor will hang around the database
-   <emphasis>forever</emphasis>, taking up resources.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>liveForever</parameter>
-     </term>
-     <listitem>
-      <para>
-       If the cursor should be immortal.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/info.xml b/reference/mongo/mongocursor/info.xml
deleted file mode 100644
index d9b427ed58..0000000000
--- a/reference/mongo/mongocursor/info.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::info</refname>
-  <refpurpose>Gets information about the cursor's creation and iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCursor::info</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This can be called before or after the cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the namespace, batch size, limit, skip, flags, query, and projected
-   fields for this cursor. If the cursor has started iterating, additional
-   information about iteration and the connection will be included.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.1.0</entry>
-       <entry>
-        Added a number of other fields, including <literal>id</literal> (the 
-        cursor id), <literal>at</literal> (the driver's counter of which 
-        document is current), <literal>numReturned</literal> (the number 
-        returned by the server in the current batch), and 
-        <literal>server</literal> (which server the query was sent 
-        to—useful in conjunction with
-        <xref linkend="mongo.readpreferences" />.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.0.10</entry>
-       <entry>
-        Added <literal>started_iterating</literal> field, a boolean indicating
-        if cursor is pre- or post-query.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-
-$cursor = $m->test->foo->find(array("x" => 4), array("y" => 0));
-
-echo "Before iteration started:\n";
-var_dump($cursor->info());
-
-echo "\nAfter iteration started:\n";
-$cursor->rewind();
-var_dump($cursor->info());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Before iteration started:
-array(8) {
-  ["ns"]=>
-  string(8) "test.foo"
-  ["limit"]=>
-  int(0)
-  ["batchSize"]=>
-  int(0)
-  ["skip"]=>
-  int(0)
-  ["flags"]=>
-  int(0)
-  ["query"]=>
-  array(1) {
-    ["x"]=>
-    int(4)
-  }
-  ["fields"]=>
-  array(1) {
-    ["y"]=>
-    int(0)
-  }
-  ["started_iterating"]=>
-  bool(false)
-}
-
-After iteration started:
-array(15) {
-  ["ns"]=>
-  string(8) "test.foo"
-  ["limit"]=>
-  int(0)
-  ["batchSize"]=>
-  int(0)
-  ["skip"]=>
-  int(0)
-  ["flags"]=>
-  int(0)
-  ["query"]=>
-  array(1) {
-    ["x"]=>
-    int(4)
-  }
-  ["fields"]=>
-  array(1) {
-    ["y"]=>
-    int(0)
-  }
-  ["started_iterating"]=>
-  bool(true)
-  ["id"]=>
-  int(0)
-  ["at"]=>
-  int(0)
-  ["numReturned"]=>
-  int(1)
-  ["server"]=>
-  string(25) "localhost:27017;-;.;26450"
-  ["host"]=>
-  string(9) "localhost"
-  ["port"]=>
-  int(27017)
-  ["connection_type_desc"]=>
-  string(10) "STANDALONE"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCursorInterface::info</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/key.xml b/reference/mongo/mongocursor/key.xml
deleted file mode 100644
index 952af7c4c0..0000000000
--- a/reference/mongo/mongocursor/key.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::key</refname>
-  <refpurpose>Returns the current result&apos;s _id, or its index within the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>int</type></type><methodname>MongoCursor::key</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   The current result&apos;s <literal>_id</literal> as a string. If the result
-   has no <literal>_id</literal>, its numeric index within the result set will
-   be returned as an integer.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::key</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/limit.xml b/reference/mongo/mongocursor/limit.xml
deleted file mode 100644
index ac52c8a97b..0000000000
--- a/reference/mongo/mongocursor/limit.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::limit</refname>
-  <refpurpose>Limits the number of results returned</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::limit</methodname>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>num</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of results to return.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.limit;">limit</link>.</member>
-    <member><function>MongoCursor::batchSize</function></member>
-    <member><methodname>MongoCursor::skip</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/maxtimems.xml b/reference/mongo/mongocursor/maxtimems.xml
deleted file mode 100644
index 91b9b99dca..0000000000
--- a/reference/mongo/mongocursor/maxtimems.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.maxtimems" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::maxTimeMS</refname>
-  <refpurpose>Sets a server-side timeout for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::maxTimeMS</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies a cumulative time limit in milliseconds to be allowed by the server
-   for processing operations on the cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>ms</parameter>
-    </term>
-    <listitem>
-     <para>
-      Specifies a cumulative time limit in milliseconds to be allowed by the
-      server for processing operations on the cursor.
-     </para>
-    </listitem>
-   </varlistentry>   
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started
-   iterating.
-  </para>
-  <para>
-   Causes methods that fetch results to throw a
-   <classname>MongoExecutionTimeoutException</classname> if the query takes
-   longer than the specified number of milliseconds in processing time.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCursor::maxTimeMS</methodname> example</title>
-   <para>
-    In the following example, the server will abort the query if the cursor
-    requires more than two seconds in processing time to return its results.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find();
-$cursor->maxTimeMS(2000);
-
-try {
-    $results = iterator_to_array($cursor);
-} catch (MongoExecutionTimeoutException $e) {
-    echo "query took too long!";
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-     Unlike <methodname>MongoCursor::timeout</methodname>, which specifies a
-     client-side timeout, <methodname>MongoCursor::maxTimeMS</methodname> can be
-     used to cause the MongoDB server to abort long-running queries. This
-     timeout is cumulative for the lifetime of the cursor (i.e. each batch will
-     contribute to this time limit). The timeout only considers processing time;
-     idle time is not considered.
-   </para>
-  </warning>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/next.xml b/reference/mongo/mongocursor/next.xml
deleted file mode 100644
index 8b9fb049e1..0000000000
--- a/reference/mongo/mongocursor/next.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::next</refname>
-  <refpurpose>Advances the cursor to the next result, and returns that result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoCursor::next</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the next document.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the
-   database and <classname>MongoCursorTimeoutException</classname> if the
-   timeout is exceeded.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::next</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/partial.xml b/reference/mongo/mongocursor/partial.xml
deleted file mode 100644
index 7d78e7496d..0000000000
--- a/reference/mongo/mongocursor/partial.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.partial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::partial</refname>
-  <refpurpose>If this query should fetch partial results from <emphasis>mongos</emphasis> if a shard is down</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::partial</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>okay</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This option allows <emphasis>mongos</emphasis> to send partial query results 
-   if a shard is unreachable.  This is only applicable when running a sharded 
-   MongoDB cluster and connecting to a <emphasis>mongos</emphasis>.
-  </para>
-  <para>
-   If a shard goes down and a query needs to be sent to that shard, 
-   <emphasis>mongos</emphasis> will return the results (if any) from shards it
-   already contacted, then an error message that it could not reach the shard
-   (a <classname>MongoCursorException</classname> in PHP).  If you would like to
-   get whatever results <emphasis>mongos</emphasis> can provide and no 
-   exception, you can use this method.  Note that this means that you won't have
-   an indication that a shard is down in your query response.
-  </para>
-  <para>
-   This has no effect on the query if all shards are reachable.  This flag was
-   implemented in MongoDB version 1.7.5, so will only work with that version and
-   higher.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>okay</parameter>
-     </term>
-     <listitem>
-      <para>
-       If receiving partial results is okay.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/reset.xml b/reference/mongo/mongocursor/reset.xml
deleted file mode 100644
index 21bb9d1fd9..0000000000
--- a/reference/mongo/mongocursor/reset.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::reset</refname>
-  <refpurpose>Clears the cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoCursor::reset</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   &null;.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/rewind.xml b/reference/mongo/mongocursor/rewind.xml
deleted file mode 100644
index 3cc6e56aea..0000000000
--- a/reference/mongo/mongocursor/rewind.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::rewind</refname>
-  <refpurpose>Returns the cursor to the beginning of the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoCursor::rewind</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This is identical to the function:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-public function rewind() {
-    $this->reset();
-    $this->next();
-}
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   &null;.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the
-   database and <classname>MongoCursorTimeoutException</classname> if the
-   timeout is exceeded.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::rewind</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/setflag.xml b/reference/mongo/mongocursor/setflag.xml
deleted file mode 100644
index 7592e1b461..0000000000
--- a/reference/mongo/mongocursor/setflag.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.setflag" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::setFlag</refname>
-  <refpurpose>Sets arbitrary flags in case there is no method available the specific flag</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::setFlag</methodname>
-   <methodparam><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>set</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   The <classname>MongoCursor</classname> class has several methods for
-   setting flags on the query object. This method is available in case the
-   MongoDB wire protocol has acquired a new flag, and the driver has not been
-   updated with a method for this new flag. In all other cases, the method
-   should be used. See the "See also" section for available methods.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>flag</parameter>
-     </term>
-     <listitem>
-      <para>
-       Which flag to set. You can not set flag 6 (EXHAUST) as the driver does
-       not know how to handle them. You will get a warning if you try to use
-       this flag. For available flags, please refer to the wire protocol
-       <link xlink:href="&url.mongodb.dochub.wireprotocol;#MongoWireProtocol-OPQUERY">documentation</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>set</parameter>
-     </term>
-     <listitem>
-      <para>
-       Whether the flag should be set (&true;) or unset (&false;).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Shows a warning when an unsupport flag is attempted to be set.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.4.0</entry>
-       <entry>
-        Support for flag 3 (OPLOG_REPLAY) is added. Versions before 1.4.0
-        would throw a warning saying that the flag is unsupported.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::setFlag</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient( 'mongodb://localhost:13000', array( 'replSet' => 'seta' ) );
-$c = $m->local->selectCollection( 'oplog.rs' );
-$cursor = $c->find( array( 'ns' => 'demo.article', 'op' => 'i' ) );
-$cursor->setFlag( 1, true ); // sets the tailable flag
-$cursor->setFlag( 5, true ); // sets the await data flag
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>MongoCursor::tailable</function></member>
-    <member><function>MongoCursor::immortal</function></member>
-    <member><function>MongoCursor::awaitData</function></member>
-    <member><function>MongoCursor::partial</function></member>
-    <member>MongoDB core docs on<link xlink:href="&url.mongodb.dochub.wireprotocol;#MongoWireProtocol-OPQUERY">wire protocol query flags</link></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/setreadpreference.xml b/reference/mongo/mongocursor/setreadpreference.xml
deleted file mode 100644
index ca5928b2e9..0000000000
--- a/reference/mongo/mongocursor/setreadpreference.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongocursor.setreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::setReadPreference</refname>
-  <refpurpose>Set the read preference for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::setReadPreference</methodname>
-   <methodparam><type>string</type><parameter>read_preference</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tags</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setreadpreference.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setreadpreference.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoCursor::setReadPreference</methodname> tag set array syntax example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$cursor = $m->test->users->find();
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$cursor->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCursor::getReadPreference</function></member>
-   <member><function>MongoCursorInterface::setReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursor/skip.xml b/reference/mongo/mongocursor/skip.xml
deleted file mode 100644
index c5d007f6d7..0000000000
--- a/reference/mongo/mongocursor/skip.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.skip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::skip</refname>
-  <refpurpose>Skips a number of results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::skip</methodname>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>num</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of results to skip.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoCursor::limit</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/slaveokay.xml b/reference/mongo/mongocursor/slaveokay.xml
deleted file mode 100644
index fc83f237a1..0000000000
--- a/reference/mongo/mongocursor/slaveokay.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.slaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::slaveOkay</refname>
-  <refpurpose>Sets whether this query can be done on a secondary [deprecated]</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::slaveOkay</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>okay</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <warning>
-   <para>
-    This method is deprecated since version 1.5.0. Instead, please use
-    <methodname>MongoCursor::setReadPreference</methodname> and <xref
-    linkend="mongo.readpreferences" />.
-   </para>
-  </warning>
-  <para>
-   Calling this will make the driver route reads to secondaries if:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      You are using a replica set, and
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      You created a <classname>MongoClient</classname> instance using the option
-      <literal>"replicaSet" => "setName"</literal>, and
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      There is a healthy secondary that can be reached by the driver.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-   You can check which server was used for this query by calling 
-   <function>MongoCursor::info</function> after running the query.  It's
-   <literal>server</literal> field will show which server the query was sent to.
-  </para>
-  <para>
-   Note that you should use this function even if you do not use the automatic
-   routing to secondaries. If you connect directly to a secondary in a replica
-   set, you still need to call this function, which basically tells the database
-   that you are aware that you might be getting older data and you're okay with
-   that. If you do not call this, you'll get "not master" errors when you try to
-   query.
-  </para>
-  <para>
-   This method will override the static class variable 
-   <varname>MongoCursor::$slaveOkay</varname>.  It will also override 
-   <function>Mongo::setSlaveOkay</function>, 
-   <function>MongoDB::setSlaveOkay</function> and
-   <function>MongoCollection::setSlaveOkay</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>okay</parameter>
-     </term>
-     <listitem>
-      <para>
-       If it is okay to query the secondary.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::slaveOkay</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-MongoCursor::$slaveOkay = false;
-
-// cannot query secondary
-$cursor = $collection->find();
-
-// can query secondary
-$cursor = $collection->find()->slaveOkay();
-
-MongoCursor::$slaveOkay = true;
-
-// can query secondary
-$cursor = $collection->find();
-
-// cannot query secondary
-$cursor = $collection->find()->slaveOkay(false);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoCursor::setReadPreference</methodname></member>
-   <member><methodname>MongoCursor::getReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        This method has been deprecated in favour of
-        <methodname>MongoCursor::setReadPreference</methodname> and <xref
-        linkend="mongo.readpreferences" />.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/snapshot.xml b/reference/mongo/mongocursor/snapshot.xml
deleted file mode 100644
index bb9854307e..0000000000
--- a/reference/mongo/mongocursor/snapshot.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.snapshot" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::snapshot</refname>
-  <refpurpose>Use snapshot mode for the query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::snapshot</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Use snapshot mode for the query. Snapshot mode ensures that a document will
-   not be returned more than once because an intervening write operation results
-   in a move of the document. Documents inserted or deleted during the lifetime
-   of the cursor may or may not be returned, irrespective of snapshot mode.
-  </para>
-  <para>
-   Queries with short responses (less than 1MB) are always effectively
-   snapshotted.
-  </para>
-  <para>
-   Snapshot mode may not be used with sorting, explicit hints, or queries on
-   sharded collections.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.docs.operator.meta.snapshot;">$snapshot operator</link>.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/sort.xml b/reference/mongo/mongocursor/sort.xml
deleted file mode 100644
index fda21fb335..0000000000
--- a/reference/mongo/mongocursor/sort.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::sort</refname>
-  <refpurpose>Sorts the results by given fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::sort</methodname>
-   <methodparam><type>array</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>fields</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of fields by which to sort. Each element in the array has as
-       key the field name, and as value either <literal>1</literal> for
-       ascending sort, or <literal>-1</literal> for descending sort.
-      </para>
-      <para>
-       Each result is first sorted on the first field in the array, then (if
-       it exists) on the second field in the array, etc. This means that the
-       order of the fields in the <parameter>fields</parameter> array is
-       important. See also the examples section.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the same cursor that this method was called on.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Sort on field x, ascending
-$cursor->sort(array('x' => 1));
-
-// The order in the associative array is important. For instance, these two
-// examples will yield different results:
-
-// Sort on date ascending and age descending
-$cursor->sort(array('date' => 1, 'age' => -1));
-
-// Sort on age descending and date ascending
-$cursor->sort(array('age' => -1, 'date' => 1));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/tailable.xml b/reference/mongo/mongocursor/tailable.xml
deleted file mode 100644
index 5ece23827d..0000000000
--- a/reference/mongo/mongocursor/tailable.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.tailable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::tailable</refname>
-  <refpurpose>Sets whether this cursor will be left open after fetching the last results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::tailable</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>tail</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Mongo has a feature known as tailable cursors which are similar to the Unix 
-   "tail -f" command.
-  </para>
-  <para>
-   Tailable means cursor is not closed when the last data is retrieved.  Rather,
-   the cursor marks the final object's position.  you can resume using the 
-   cursor later, from where it was located, if more data were received.
-  </para>
-  <para>
-   Like any "latent cursor", the cursor may become invalid at some point -- for 
-   example if that final object it references were deleted.  Thus, you should be
-   prepared to requery if the cursor is <function>MongoCursor::dead</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>tail</parameter>
-     </term>
-     <listitem>
-      <para>
-       If the cursor should be tailable.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoCursorException</classname> if this cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::tailable</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find()->tailable();
-
-$results = array();
-
-while (1) {
-    if (!$cursor->hasNext()) {
-        // we've read all the results, exit
-        if ($cursor->dead()) {
-            break;
-        }
-        // read all results so far, wait for more
-        sleep(10);
-    }
-    else {
-        $results[] = $cursor->getNext();
-    }
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.dochub.tailable;">tailable cursors</link>.
-  </para>
-  <para>
-   <simplelist>
-    <member><function>MongoCursor::awaitData</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/timeout.xml b/reference/mongo/mongocursor/timeout.xml
deleted file mode 100644
index 4e8128f807..0000000000
--- a/reference/mongo/mongocursor/timeout.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.timeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::timeout</refname>
-  <refpurpose>Sets a client-side timeout for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCursor</type><methodname>MongoCursor::timeout</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A timeout can be set at any time and will affect subsequent queries on the 
-   cursor, including fetching more results from the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>ms</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of milliseconds for the cursor to wait for a response. Use
-      <literal>-1</literal> to wait forever. By default, the cursor will wait
-      <varname>30000</varname> milliseconds (30 seconds).
-     </para>
-    </listitem>
-   </varlistentry>   
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   This cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Causes methods that fetch results to throw a
-   <classname>MongoCursorTimeoutException</classname> if the query takes longer
-   than the specified number of milliseconds.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCursor::timeout</function> example</title>
-   <para>
-    In the following example, the driver will wait forever for the initial
-    database response, and then wait 100ms for subsequent responses.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find();
-$cursor->timeout(-1);
-
-/* $cursor->hasNext() executes the query. An infinite timeout has been set, so
- * the driver will wait as long as necessary for a response.
- */
-while ($cursor->hasNext()) {
-    $cursor->timeout(100);
-
-    /* A timeout has now been set, so if the cursor needs to get more results
-     * from the database, it will only wait 100ms for a response.
-     */
-    try {
-        print_r($cursor->getNext());
-    } catch (MongoCursorTimeoutException $e) {
-        echo "query took too long!";
-    }
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-     This does not cause the MongoDB server to cancel long-running operations;
-     it only instructs the driver to stop waiting for a response and throw a
-     <classname>MongoCursorTimeoutException</classname> after a set time.
-     If you need to specify a server-side timeout for a query, consider using
-     <methodname>MongoCursor::maxTimeMS</methodname>.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoCursorInterface::timeout</methodname></member>
-   <member>The <literal>socketTimeoutMS</literal> option for <function>MongoClient::__construct</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursor/valid.xml b/reference/mongo/mongocursor/valid.xml
deleted file mode 100644
index 0c492172e7..0000000000
--- a/reference/mongo/mongocursor/valid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursor.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursor::valid</refname>
-  <refpurpose>Checks if the cursor is reading a valid result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoCursor::valid</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the current result is not null, and &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Iterator::valid</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongocursorexception.xml b/reference/mongo/mongocursorexception.xml
deleted file mode 100644
index 51b14acc80..0000000000
--- a/reference/mongo/mongocursorexception.xml
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongocursorexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCursorException class</title>
- <titleabbrev>MongoCursorException</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ MongoCursorException intro -->
-  <section xml:id="mongocursorexception.intro">
-   &reftitle.intro;
-   <para>
-    Caused by accessing a cursor incorrectly or a error receiving a reply. Note
-    that this can be thrown by any database request that receives a reply, not
-    just queries.  Writes, commands, and any other operation that sends
-    information to the database and waits for a response can throw a
-    <classname>MongoCursorException</classname>.  The only exception is
-    <literal>new MongoClient()</literal> (creating a new connection), which will
-    only throw <classname>MongoConnectionException</classname>s.
-   </para>
-
-   <para>
-    This returns a specific error message to help diagnose the problem and a
-    numeric error code associated with the cause of the exception.
-   </para>
-
-   <para>
-    For example, suppose you tried to insert two documents with the same _id:
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-try {
-    $collection->insert(array("_id" => 1), array("w" => 1));
-    $collection->insert(array("_id" => 1), array("w" => 1));
-}
-catch (MongoCursorException $e) {
-    echo "error message: ".$e->getMessage()."\n";
-    echo "error code: ".$e->getCode()."\n";
-}
-
-?>
-]]>
-    </programlisting>
-    This would produce output like:
-    <programlisting role="txt">
-<![CDATA[
-error message: E11000 duplicate key error index: foo.bar.$_id_  dup key: { : 1 }
-error code: 11000
-]]>
-    </programlisting>
-    Note that the MongoDB error code (11000) is used for the PHP error code. The
-    PHP driver uses the "native" error code wherever possible.
-   </para>
-
-   <para>
-    The following is a list of common errors, codes, and causes.  Exact errors
-    are in italics, errors where the message can vary are described in obliques.
-   </para>
-
-   <itemizedlist>
-    <listitem>
-     <para>
-      <literal>cannot modify cursor after beginning iteration</literal>
-     </para>
-     <para>
-      Code: 0
-     </para>
-     <para>
-      You are calling a method that sets up the query after executing the query.
-      Reset the cursor and try again.
-     </para>
-     <para>
-      An example:
-      <programlisting role="php">
-<![CDATA[
-<?php
-
-try {
-    $cursor = $collection->find();
-    var_dump($cursor->getNext());
-
-    // getNext() queried the database, it's too late to set a limit
-    $cursor->limit(1);
-}
-catch (MongoCursorException $e) {
-    echo "error message: ".$e->getMessage()."\n";
-    echo "error code: ".$e->getCode()."\n";
-}
-
-// this will work, though:
-$cursor->getNext();
-$cursor->reset();
-$cursor->limit(1);
-
-?>
-]]>
-      </programlisting>
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Get next batch send errors
-     </para>
-     <para>
-      Code: 1
-     </para>
-     <para>
-      Could not send the query to the database.  Make sure the database is
-      still up and the network is okay.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>cursor not found</literal>
-     </para>
-     <para>
-      Code: 2
-     </para>
-     <para>
-      The driver was trying to fetch more results from the database, but the
-      database did not have a record of the query.  This usually means that the
-      cursor timed out on the server side: after a few minutes of inactivity,
-      the database will kill a cursor (see
-      <function>MongoCursor::immortal</function> for information on preventing
-      this).
-     </para>
-     <para>
-      An example:
-      <programlisting role="php">
-<![CDATA[
-<?php
-
-try {
-    $cursor = $collection->find();
-    $cursor->getNext();
-
-    // sleep for 15 minutes
-    sleep(60*15);
-
-    while ($cursor->hasNext()) {
-        $cursor->getNext();
-    }
-}
-catch (MongoCursorException $e) {
-    echo "error message: ".$e->getMessage()."\n";
-    echo "error code: ".$e->getCode()."\n";
-}
-
-?>
-]]>
-      </programlisting>
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>cursor->buf.pos is null</literal>
-     </para>
-     <para>
-      Code: 3
-     </para>
-     <para>
-      This may indicate you are out of RAM or some other extraordinary
-      circumstance.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>couldn't get response header</literal>
-     </para>
-     <para>
-      Code: 4
-     </para>
-     <para>
-      A common error if the database or network goes down. This means that the
-      driver couldn't get a response from the connection.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>no db response</literal>
-     </para>
-     <para>
-      Code: 5
-     </para>
-     <para>
-      This may not even be an error, for example, the database command
-      "shutdown" returns no response.  However, if you were expecting a
-      response, this means the database didn't give one.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>bad response length: %d, did the db assert?</literal>
-     </para>
-     <para>
-      Code: 6
-     </para>
-     <para>
-      This means that the database said that its response was less than 0.  This
-      error probably indicates a network error or database corruption.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>incomplete header</literal>
-     </para>
-     <para>
-      Code: 7
-     </para>
-     <para>
-      Highly unusual.  Occurs if the database response started out correctly,
-      but broke off in the middle.  Probably indicates a network problem.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>incomplete response</literal>
-     </para>
-     <para>
-      Code: 8
-     </para>
-     <para>
-      Highly unusual.  Occurs if the database response started out correctly,
-      but broke off in the middle.  Probably indicates a network problem.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>couldn't find a response</literal>
-     </para>
-     <para>
-      Code: 9
-     </para>
-     <para>
-      If the response was cached and now cannot be located.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>error getting socket</literal>
-     </para>
-     <para>
-      Code: 10
-     </para>
-     <para>
-      The socket was closed or encountered an error.  The driver should
-      automatically reconnect (if possible) on the next operation.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>couldn't find reply, please try again</literal>
-     </para>
-     <para>
-      Code: 11
-     </para>
-     <para>
-      The driver saves any database responses it cannot immediately match with a
-      request. This exception occurs if the driver has already passed your
-      request's response and cannot find your response in its cache.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>error getting database response: errstr</literal>
-     </para>
-     <para>
-      <literal>WSA error getting database response: errstr</literal>
-     </para>
-     <para>
-      "errstr" is an io error reported directly from the C socket
-      subsystem.  On Windows, the error message is prefixed with "WSA".
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>Timeout error</literal>
-     </para>
-     <para>
-      Code: 13
-     </para>
-     <para>
-      If there was an error while waiting for a query to complete.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>couldn't send query: &lt;various&gt;</literal>
-     </para>
-     <para>
-      Code: 14
-     </para>
-     <para>
-      C socket error on send.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>max number of retries exhausted, couldn't send query</literal>
-     </para>
-     <para>
-      Code: 19
-     </para>
-     <para>
-      The driver will automatically retry "plain" queries (not commands) a
-      couple of times if the first attempt failed for certain reasons.  This is
-      to cause fewer exceptions during replica set failover (although you will
-      probably still have to deal with some) and gloss over transient network
-      issues.
-     </para>
-     <para>
-      This can also be caused by the driver not being able to reconnect at all
-      to the database (if, for example, the database is unreachable).
-     </para>
-     <para>
-      Version 1.2.2+.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </section>
-
-
-  <section>
-   <title>Errors passed through by the database</title>
-   <para>
-    Database errors should always trigger
-    <classname>MongoCursorExceptions</classname> on queries.
-    Error messages and codes are sent directly from the database and you should
-    be able to see matching errors in the database log.
-   </para>
-
-   <para>
-    A few common database errors are listed below:
-   </para>
-
-   <itemizedlist>
-    <listitem>
-     <para>
-      <literal>E11000 duplicate key error index: foo.bar.$X  dup key: { /* ... */ }</literal>
-     </para>
-     <para>
-      Code: 11000
-     </para>
-     <para>
-      Database error for duplicate keys.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>not master</literal>
-     </para>
-     <para>
-      Codes: 10107, 13435, and 10058
-     </para>
-     <para>
-      Not master errors, piped through by the database.  ach of these will
-      cause the driver to disconnect and attempt to find a new primary. The
-      actual error you get on failover may not be a "not master" error,
-      depending on when the change in primary occurs.
-     </para>
-    </listitem>
-   </itemizedlist>
-
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongocursorexception.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCursorException</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCursorException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongocursorexception;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorexception/gethost.xml b/reference/mongo/mongocursorexception/gethost.xml
deleted file mode 100644
index 5acc2288e8..0000000000
--- a/reference/mongo/mongocursorexception/gethost.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongocursorexception.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursorException::getHost</refname>
-  <refpurpose>The hostname of the server that encountered the error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoCursorException::getHost</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Returns the hostname of the server the query was sent too.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the hostname, or <type>NULL</type> if the hostname is unknown.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorinterface.xml b/reference/mongo/mongocursorinterface.xml
deleted file mode 100644
index 0079075980..0000000000
--- a/reference/mongo/mongocursorinterface.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongocursorinterface" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCursorInterface interface</title>
- <titleabbrev>MongoCursorInterface</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ mongocursorinterface intro -->
-  <section xml:id="mongocursorinterface.intro">
-   &reftitle.intro;
-   <para>
-    Interface for cursors, which can be used to iterate through results of a
-    database query or command. This interface is implemented by the
-    <classname>MongoCursor</classname> and
-    <classname>MongoCommandCursor</classname> classes.
-   </para>
-   <note>
-    <simpara>
-     Similar to <classname>Traversable</classname>, this interface cannot be
-     implemented in PHP scripts.
-    </simpara>
-   </note>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongocursorinterface.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCursorInterface</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCursorInterface</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Iterator</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongocursorinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-   <!-- }}} -->
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongocursorinterface;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorinterface/batchsize.xml b/reference/mongo/mongocursorinterface/batchsize.xml
deleted file mode 100644
index 7a83c78400..0000000000
--- a/reference/mongo/mongocursorinterface/batchsize.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursorinterface.batchsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursorInterface::batchSize</refname>
-  <refpurpose>Limits the number of elements returned in one batch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>MongoCursorInterface</type><methodname>MongoCursorInterface::batchSize</methodname>
-   <methodparam><type>int</type><parameter>batchSize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A cursor typically fetches a batch of result objects and stores them
-   locally. This method sets the batch size value to configure the amount of
-   documents retrieved from the server in one round trip.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>batchSize</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of results to return per batch.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorinterface/dead.xml b/reference/mongo/mongocursorinterface/dead.xml
deleted file mode 100644
index 4aef6503db..0000000000
--- a/reference/mongo/mongocursorinterface/dead.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursorinterface.dead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursorInterface::dead</refname>
-  <refpurpose>Checks if there are results that have not yet been sent from the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoCursorInterface::dead</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This method checks whether the cursor has been exhausted and the database has
-   no more results to send to the client. A cursor being "dead" does not
-   necessarily mean that there are no more results available for iteration.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if there are more results that have not yet been sent to the
-   client, and &false; otherwise.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorinterface/info.xml b/reference/mongo/mongocursorinterface/info.xml
deleted file mode 100644
index fdb0376142..0000000000
--- a/reference/mongo/mongocursorinterface/info.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursorinterface.info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursorInterface::info</refname>
-  <refpurpose>Gets information about the cursor's creation and iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoCursorInterface::info</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns information about the cursor's creation and iteration. This can be
-   called before or after the cursor has started iterating.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the namespace, batch size, limit, skip, flags, query, and projected
-   fields for this cursor. If the cursor has started iterating, additional
-   information about iteration and the connection will be included.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorinterface/setreadpreference.xml b/reference/mongo/mongocursorinterface/setreadpreference.xml
deleted file mode 100644
index ba6e253a3e..0000000000
--- a/reference/mongo/mongocursorinterface/setreadpreference.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursorinterface.setreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursorInterface::setReadPreference</refname>
-  <refpurpose>Set the read preference for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>MongoCursorInterface</type><methodname>MongoCursorInterface::setReadPreference</methodname>
-   <methodparam><type>string</type><parameter>read_preference</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tags</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setreadpreference.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setreadpreference.errors;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCursorInterface::getReadPreference</function></member>
-  </simplelist>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursorinterface/timeout.xml b/reference/mongo/mongocursorinterface/timeout.xml
deleted file mode 100644
index 7c0272bf0f..0000000000
--- a/reference/mongo/mongocursorinterface/timeout.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongocursorinterface.timeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoCursorInterface::timeout</refname>
-  <refpurpose>Sets a client-side timeout for this query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>MongoCursorInterface</type><methodname>MongoCursorInterface::timeout</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A timeout can be set at any time and will affect subsequent data retrieval
-   associated with this cursor, including fetching more results from the
-   database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>ms</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of milliseconds for the cursor to wait for a response. Use
-      <literal>-1</literal> to wait forever. By default, the cursor will wait
-      <varname>30000</varname> milliseconds (30 seconds).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this cursor.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Causes methods that fetch results to throw a
-   <classname>MongoCursorTimeoutException</classname> if the data fetch takes
-   longer than the specified number of milliseconds.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <literal>socketTimeoutMS</literal> option for <function>MongoClient::__construct</function></member>
-  </simplelist>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongocursortimeoutexception.xml b/reference/mongo/mongocursortimeoutexception.xml
deleted file mode 100644
index 0bd2ff42ef..0000000000
--- a/reference/mongo/mongocursortimeoutexception.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongocursortimeoutexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoCursorTimeoutException class</title>
- <titleabbrev>MongoCursorTimeoutException</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ MongoCursorTimeoutException intro -->
-  <section xml:id="mongocursortimeoutexception.intro">
-   &reftitle.intro;
-   <para>
-    Caused by a query timing out.  You can set the length of time to wait before
-    this exception is thrown by calling 
-    <function>MongoCursor::timeout</function> on the cursor or setting
-    <literal>MongoCursor::$timeout</literal>.  The static variable is useful for
-    queries such as database commands and 
-    <function>MongoCollection::findOne</function>, both of which implicitly use 
-    cursors.
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongocursortimeoutexception.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoCursorTimeoutException</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoCursorTimeoutException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoCursorException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-    
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodate.xml b/reference/mongo/mongodate.xml
deleted file mode 100644
index 2a37c78a25..0000000000
--- a/reference/mongo/mongodate.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongodate" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoDate class</title>
- <titleabbrev>MongoDate</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\UTCDateTime</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ Mongodate intro -->
-  <section xml:id="mongodate.intro">
-   &reftitle.intro;
-   <para>
-    Represent date objects for the database.  This class should be used to save
-    dates to the database and to query for dates.  For example:
-   </para>
-   <example>
-    <title>Storing dates with <classname>MongoDate</classname></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// save a date to the database
-$collection->save(array("ts" => new MongoDate()));
-
-$start = new MongoDate(strtotime("2010-01-15 00:00:00"));
-$end = new MongoDate(strtotime("2010-01-30 00:00:00"));
-
-// find dates between 1/15/2010 and 1/30/2010
-$collection->find(array("ts" => array('$gt' => $start, '$lte' => $end)));
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    MongoDB stores dates as milliseconds past the epoch.  This means that dates 
-    <emphasis>do not</emphasis> contain timezone information.  Timezones must be
-    stored in a separate field if needed.  Second, this means that any precision
-    beyond milliseconds will be lost when the document is sent to/from the 
-    database.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodate.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDate</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDate</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-  
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>sec</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>usec</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodate')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongodate;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodate/construct.xml b/reference/mongo/mongodate/construct.xml
deleted file mode 100644
index 6f2a6f2aa0..0000000000
--- a/reference/mongo/mongodate/construct.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodate.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDate::__construct</refname>
-  <refpurpose>Creates a new date</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\UTCDateTime::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoDate::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>sec</parameter><initializer>time()</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>usec</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new date.  If no parameters are given, the current time is used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>sec</parameter>
-     </term>
-     <listitem>
-      <para>
-       Number of seconds since the epoch (i.e. 1 Jan 1970 00:00:00.000 UTC).
-      </para>
-     </listitem>
-    </varlistentry>     
-    <varlistentry>
-     <term>
-      <parameter>usec</parameter>
-     </term>
-     <listitem>
-      <para>
-       Microseconds. Please be aware though that MongoDB's resolution is
-       <emphasis>milliseconds</emphasis> and not microseconds, which means this
-       value will be truncated to millisecond resolution.
-      </para>
-     </listitem>
-    </varlistentry>     
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns this new date.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDate::__construct</function> example</title>
-   <para>This example demonstrates creating a new date with the current time and a new date with a given time.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$d = new MongoDate();
-echo "$d\n";
-$d = new MongoDate(1234567890);
-echo "$d\n";
-$d = new MongoDate(strtotime("2009-05-01 00:00:01"));
-echo "$d\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-0.23660600 1235685067
-0.00000000 1234567890
-0.00000000 1241150401
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoDate::__toString</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodate/todatetime.xml b/reference/mongo/mongodate/todatetime.xml
deleted file mode 100644
index 1f08f86f4f..0000000000
--- a/reference/mongo/mongodate/todatetime.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodate.todatetime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDate::toDateTime</refname>
-  <refpurpose>Returns a DateTime object representing this date</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\UTCDateTime::toDateTime</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>DateTime</type><methodname>MongoDate::toDateTime</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the <classname>DateTime</classname> representation of this date. The
-   returned <classname>DateTime</classname> will use the UTC time zone.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This date as a <classname>DateTime</classname> object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDate::toDateTime</function> example</title>
-   <para>This example demonstrates creating a DateTime object from a MongoDate
-   object.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$d = new MongoDate(strtotime("2014-11-18 11:01:25"));
-var_dump( $d->toDateTime() );
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-class DateTime#2 (3) {
-  public $date =>
-  string(26) "2014-11-18 11:01:25.000000"
-  public $timezone_type =>
-  int(1)
-  public $timezone =>
-  string(6) "+00:00"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodate/tostring.xml b/reference/mongo/mongodate/tostring.xml
deleted file mode 100644
index 8ff8aa0c39..0000000000
--- a/reference/mongo/mongodate/tostring.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodate.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDate::__toString</refname>
-  <refpurpose>Returns a string representation of this date</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\UTCDateTime::__toString</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoDate::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a string representation of this date, similar to the representation returned by <function>microtime</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This date.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb.xml b/reference/mongo/mongodb.xml
deleted file mode 100644
index 3da17a070b..0000000000
--- a/reference/mongo/mongodb.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongodb" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoDB class</title>
- <titleabbrev>MongoDB</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Mongodb intro -->
-  <section xml:id="mongodb.intro">
-   &reftitle.intro;
-   <para>
-    Instances of this class are used to interact with a database.  To get a
-    database:
-    <example>
-     <title>Selecting a database</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient(); // connect
-$db = $m->selectDB("example");
-
-?>
-]]>
-     </programlisting>
-    </example>
-    Database names can use almost any character in the ASCII range.  However,
-    they cannot contain &quot; &quot;, &quot;.&quot; or be the empty string.
-    The name "system" is also reserved.
-   </para>
-   <para>
-    A few unusual, but valid, database names: &quot;null&quot;, &quot;[x,y]&quot;, &quot;3&quot;, &quot;\&quot;&quot;, &quot;/&quot;.
-   </para>
-   <para>
-    Unlike collection names, database names may contain &quot;$&quot;.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb.constants.profilingoff">MongoDB::PROFILING_OFF</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb.constants.profilingslow">MongoDB::PROFILING_SLOW</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb.constants.profilingon">MongoDB::PROFILING_ON</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="mongodb.props.w">w</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="mongodb.props.wtimeout">wtimeout</varname>
-     <initializer>10000</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   &reftitle.constants;
-   <section xml:id="mongodb.constants.types">
-    <title>MongoDB Log Levels</title>
-    <variablelist>
-
-     <varlistentry xml:id="mongodb.constants.profilingoff">
-      <term><constant>MongoDB::PROFILING_OFF</constant></term>
-      <listitem>
-       <simpara>
-        Profiling is off.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongodb.constants.profilingslow">
-      <term><constant>MongoDB::PROFILING_SLOW</constant></term>
-      <listitem>
-       <simpara>
-        Profiling is on for slow operations (&gt;100 ms).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongodb.constants.profilingon">
-      <term><constant>MongoDB::PROFILING_ON</constant></term>
-      <listitem>
-       <simpara>
-        Profiling is on for all operations.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-  </section>
-
-  <section>
-   <title>Fields</title>
-   <variablelist>
-    <varlistentry xml:id="mongodb.props.w">
-     <term><varname>w</varname></term>
-     <term>1</term>
-     <listitem>
-      <para>
-       The number of servers to replicate a change to before returning success.
-       Inherited by instances of <classname>MongoCollection</classname> derived
-       from this.  <literal>w</literal> functionality is only available in 
-       version 1.5.1+ of the MongoDB server and 1.0.8+ of the driver.
-      </para>
-      <para>
-       <literal>w</literal> is used whenever you need to adjust the
-       acknowledgement level
-       (<function>MongoCollection::insert</function>, 
-       <function>MongoCollection::update</function>, 
-       <function>MongoCollection::remove</function>, 
-       <function>MongoCollection::save</function>, and
-       <function>MongoCollection::ensureIndex</function> all support this
-       option). With the default value (1), an acknowledged operation will return once
-       the database server has the operation. If the server goes down before
-       the operation has been replicated to a secondary, it is possible to lose
-       the operation forever. Thus, you can specify <literal>w</literal> to be
-       higher than one and guarantee that at least one secondary has the
-       operation before it is considered successful.
-      </para>
-      <para>
-       For example, if <literal>w</literal> is 2, the primary and one secondary
-       must have a record of the operation or the driver will throw a
-       <classname>MongoCursorException</classname>. It is tempting to set
-       <literal>w</literal> to the total number of secondaries + primary, but
-       then if one secondary is down the operation will fail and an exception
-       will be thrown, so usually <literal>w=2</literal> is safest (primary and
-       one secondary).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb.props.wtimeout">
-     <term><varname>wtimeout</varname></term>
-     <term>10000</term>
-     <listitem>
-      <para>
-       The number of milliseconds to wait for <literal>MongoDB::$w</literal> 
-       replications to take place.  Inherited by instances of
-       <classname>MongoCollection</classname> derived from this. 
-       <literal>w</literal> functionality is only available in version 1.5.1+ of
-       the MongoDB server and 1.0.8+ of the driver.
-      </para>
-      <para>
-       Unless <literal>wtimeout</literal> is set, the server waits forever for 
-       replicating to <literal>w</literal> servers to finish.  The driver 
-       defaults to waiting for 10 seconds, you can change this value to alter
-       its behavior.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
-  <section>
-   &reftitle.seealso;
-   <para>
-    MongoDB core docs on <link xlink:href="&url.mongodb.glossary;#term-database">databases</link>.
-   </para>
-  </section>
- </partintro>
-
- &reference.mongo.entities.mongodb;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/authenticate.xml b/reference/mongo/mongodb/authenticate.xml
deleted file mode 100644
index 4ce587dc01..0000000000
--- a/reference/mongo/mongodb/authenticate.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.authenticate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::authenticate</refname>
-  <refpurpose>Log in to this database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-   <para>Instead, you need to provide credentials through the connection
-   string.</para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::authenticate</methodname>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method causes its connection to be authenticated.  If authentication is
-   enabled for the database server (it's not, by default), you need to log in
-   before the database will allow you to do anything.
-  </para>
-  <para>
-   In general, you should use the authenticate built into
-   <function>MongoClient::__construct</function> in preference to this method.
-   If you authenticate on connection and the connection drops and reconnects
-   during your session, you'll be reauthenticated.  If you manually
-   authenticated using this method and the connection drops, you'll have to call
-   this method again once you're reconnected.
-  </para>
-  <para>
-   This method is identical to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$salted = "${username}:mongo:${password}";
-$hash = md5($salted);
-
-$nonce = $db->command(array("getnonce" => 1));
-
-$saltedHash = md5($nonce["nonce"]."${username}${hash}");
-
-$result = $db->command(array("authenticate" => 1,
-    "user" => $username,
-    "nonce" => $nonce["nonce"],
-    "key" => $saltedHash
-));
-
-?>
-]]>
-   </programlisting>
-  </para>
-  <para>
-   Once a connection has been authenticated, it can only be un-authenticated by
-   using the "logout" database command:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$db->command(array("logout" => 1));
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>username</parameter>
-     </term>
-     <listitem>
-      <para>
-       The username.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>password</parameter>
-     </term>
-     <listitem>
-      <para>
-       The password (in plaintext).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns database response.  If the login was successful, it will return
-  <programlisting role="php">
-<![CDATA[
-<?php
-array("ok" => 1);
-?>
-]]>
-  </programlisting>
-  If something went wrong, it will return
-  <programlisting role="php">
-<![CDATA[
-<?php
-array("ok" => 0, "errmsg" => "auth fails");
-?>
-]]>
-  </programlisting>
-  ("auth fails" could be another message, depending on database version and what
-  when wrong).
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.docs.command;authenticate">authenticate</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when used. Please pass in the
-        authentication details to the constructor.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/command.xml b/reference/mongo/mongodb/command.xml
deleted file mode 100644
index f0d57b61f2..0000000000
--- a/reference/mongo/mongodb/command.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.command" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::command</refname>
-  <refpurpose>Execute a database command</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::command</methodname>
-   <methodparam><type>array</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">hash</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Almost everything that is not a CRUD operation can be done with a database
-   command.  Need to know the database version?  There's a command for that.
-   Need to do aggregation?  There's a command for that.  Need to turn up
-   logging?  You get the idea.
-  </para>
-  <para>
-   This method is identical to:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function command($data) {
-    return $this->selectCollection('$cmd')->findOne($data);
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>command</parameter>
-     </term>
-     <listitem>
-      <para>
-       The query to send.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the index creation. Currently available options
-       include:
-       <itemizedlist>
-        &mongo.writes.parameters.sockettimeoutms;
-       </itemizedlist>
-      </para>
-      <para>
-       The following options are deprecated and should no longer be used:
-       <itemizedlist>
-        &mongo.writes.parameters.timeout;
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>hash</parameter>
-     </term>
-     <listitem>
-      <para>
-       Set to the connection hash of the server that executed the command. When
-       the command result is suitable for creating a
-       <classname>MongoCommandCursor</classname>, the hash is intended to be
-       passed to <function>MongoCommandCursor::createFromDocument</function>.
-      </para>
-      <para>
-       The hash will also correspond to a connection returned from
-       <function>MongoClient::getConnections</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.5.0</entry>
-       <entry>
-        <para>
-         Renamed the <literal>"timeout"</literal> option to
-         <literal>"socketTimeoutMS"</literal>. Emits
-         <constant>E_DEPRECATED</constant> when <literal>"timeout"</literal> is
-         used.
-        </para>
-        <para>
-         Added <literal>hash</literal> by-reference parameter.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongo 1.2.0</entry>
-       <entry>
-        Added <literal>options</literal> parameter with a single option: 
-        <literal>"timeout"</literal>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns database response. Every database response is always maximum one
-   document, which means that the result of a database command can never
-   exceed 16MB. The resulting document's structure depends on the command, but
-   most results will have the <literal>ok</literal> field to indicate success
-   or failure and <literal>results</literal> containing an array of each of
-   the resulting documents.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::command</function> "distinct" example</title>
-   <para>
-    Finding all of the distinct values for a key.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$people = $db->people;
-
-$people->insert(array("name" => "Joe", "age" => 4));
-$people->insert(array("name" => "Sally", "age" => 22));
-$people->insert(array("name" => "Dave", "age" => 22));
-$people->insert(array("name" => "Molly", "age" => 87));
-
-$ages = $db->command(array("distinct" => "people", "key" => "age"));
-
-foreach ($ages['values'] as $age) {
-    echo "$age\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-4
-22
-87
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoDB::command</function> "distinct" example</title>
-   <para>
-    Finding all of the distinct values for a key, where the value is larger
-    than or equal to 18.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$people = $db->people;
-
-$people->insert(array("name" => "Joe", "age" => 4));
-$people->insert(array("name" => "Sally", "age" => 22));
-$people->insert(array("name" => "Dave", "age" => 22));
-$people->insert(array("name" => "Molly", "age" => 87));
-
-$ages = $db->command(
-    array(
-        "distinct" => "people",
-        "key" => "age", 
-        "query" => array("age" => array('$gte' => 18))
-    )
-);  
-
-foreach ($ages['values'] as $age) {
-    echo "$age\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-22
-87
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoDB::command</function> MapReduce example</title>
-   <para>
-    Get all users with at least on "sale" event, and how many times each
-    of these users has had a sale.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// sample event document
-$events->insert(array("user_id" => $id, 
-    "type" => $type, 
-    "time" => new MongoDate(), 
-    "desc" => $description));
-
-// construct map and reduce functions
-$map = new MongoCode("function() { emit(this.user_id,1); }");
-$reduce = new MongoCode("function(k, vals) { ".
-    "var sum = 0;".
-    "for (var i in vals) {".
-        "sum += vals[i];". 
-    "}".
-    "return sum; }");
-
-$sales = $db->command(array(
-    "mapreduce" => "events", 
-    "map" => $map,
-    "reduce" => $reduce,
-    "query" => array("type" => "sale"),
-    "out" => array("merge" => "eventCounts")));
-
-$users = $db->selectCollection($sales['result'])->find();
-
-foreach ($users as $user) {
-    echo "{$user['_id']} had {$user['value']} sale(s).\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-User 47cc67093475061e3d9536d2 had 3 sale(s).
-User 49902cde5162504500b45c2c had 14 sale(s).
-User 4af467e4fd543cce7b0ea8e2 had 1 sale(s).
-   </screen>
-   <note>
-    <title>Using <classname>MongoCode</classname></title>
-    <para>
-     This example uses <classname>MongoCode</classname>, which can also take a 
-     scope argument.  However, at the moment, MongoDB does not support using
-     scopes in MapReduce.  If you would like to use client-side variables in the
-     MapReduce functions, you can add them to the global scope by using the 
-     optional scope field with the database command.  See the
-     <link xlink:href="&url.mongodb.dochub.mapreduce;">MapReduce documentation</link> 
-     for more information.
-    </para>
-   </note>
-   <note>
-    <title>The <literal>out</literal> argument</title>
-    <para>
-     Before 1.8.0, the <literal>out</literal> argument was optional. If you did
-     not use it, MapReduce results would be written to a temporary collection,
-     which would be deleted when your connection was closed. In 1.8.0+, the 
-     <literal>out</literal> argument is required. See the
-     <link xlink:href="&url.mongodb.dochub.mapreduce;">MapReduce documentation</link> 
-     for more information.
-    </para>
-   </note>
-  </example>
-
-  <example>
-   <title><function>MongoDB::command</function> "geoNear" example</title>
-   <para>
-    This example shows how to use the geoNear command.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$d = $m->demo;
-$c = $d->poiConcat;
-
-$r = $d->command(array(
-    'geoNear' => "poiConcat",      // Search in the poiConcat collection
-    'near' => array(-0.08, 51.48), // Search near 51.48°N, 0.08°E
-    'spherical' => true,           // Enable spherical search
-    'num' => 5,                    // Maximum 5 returned documents
-));
-print_r($r);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoCollection::aggregate</methodname></member>
-    <member><methodname>MongoCollection::findAndModify</methodname></member>
-    <member><methodname>MongoCollection::group</methodname></member>
-   </simplelist>
-  </para>
-  <para>
-   MongoDB core docs on 
-   <link xlink:href="&url.mongodb.docs.command;">database commands</link>.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/construct.xml b/reference/mongo/mongodb/construct.xml
deleted file mode 100644
index 532dcceef8..0000000000
--- a/reference/mongo/mongodb/construct.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::__construct</refname>
-  <refpurpose>Creates a new database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoDB::__construct</methodname>
-   <methodparam><type>MongoClient</type><parameter>conn</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is not meant to be called directly.  The preferred way to create
-   an instance of MongoDB is through <function>MongoClient::__get</function> or
-   <function>MongoClient::selectDB</function>.
-  </para>
-  <para>
-   If you're ignoring the previous paragraph and want to call it directly you
-   can do so:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = new MongoDB($m, 'mydbname');
-
-?>
-]]>
-  </programlisting>
-  <para>
-   But don't.  Isn't this much nicer:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->mydbname;
-
-// or, if the name contains weird characters:
-
-$db = $m->selectDB('my,db:name');
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <type>MongoClient</type>
-      <parameter>conn</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database connection.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws default exception if the database name is invalid.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/createcollection.xml b/reference/mongo/mongodb/createcollection.xml
deleted file mode 100644
index 8fa67097a8..0000000000
--- a/reference/mongo/mongodb/createcollection.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.createcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::createCollection</refname>
-  <refpurpose>Creates a collection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCollection</type><methodname>MongoDB::createCollection</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  
-  <para>
-   This method is used to create capped collections and other collections 
-   requiring special options.  It is identical to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection = $db->command(array(
-    "create" => $name,
-    "capped" => $options["capped"],
-    "size" => $options["size"],
-    "max" => $options["max"],
-    "autoIndexId" => $options["autoIndexId"],
-));
-
-?>
-]]>
-   </programlisting>
-   See <function>MongoDB::command</function> for more information about database commands.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       The name of the collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array containing options for the collections. Each option is its own
-       element in the options array, with the option name listed below being
-       the key of the element. The supported options depend on the MongoDB
-       server version and storage engine, and the driver passes any option
-       that you give it straight to the server. A few of the supported options
-       are, but you can find a full list in the MongoDB core docs on <link
-       xlink:href="&url.mongodb.docs;method/db.createCollection/">createCollection</link>:
-      </para>
-      <para>
-       <variablelist>
-        <varlistentry>
-         <term>
-          <parameter>capped</parameter>
-         </term>
-         <listitem>
-          <para>
-           If the collection should be a fixed size.
-          </para>
-         </listitem>
-        </varlistentry>   
-        <varlistentry>
-         <term>
-          <parameter>size</parameter>
-         </term>
-         <listitem>
-          <para>
-           If the collection is fixed size, its size in bytes.
-          </para>
-         </listitem>
-        </varlistentry>   
-        <varlistentry>
-         <term>
-          <parameter>max</parameter>
-         </term>
-         <listitem>
-          <para>
-           If the collection is fixed size, the maximum number of elements to
-           store in the collection.
-          </para>
-         </listitem>
-        </varlistentry>   
-        <varlistentry>
-         <term>
-          <parameter>autoIndexId</parameter>
-         </term>
-         <listitem>
-          <para>
-           If capped is &true; you can specify &false; to disable the
-           automatic index created on the <literal>_id</literal> field.
-           Before MongoDB 2.2, the default value for
-           <literal>autoIndexId</literal> was &false;.
-          </para>
-         </listitem>
-        </varlistentry>   
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a collection object representing the new collection.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::createCollection</function> capped collection example</title>
-   <para>
-    A capped collection is a special type of collection that has either a fixed
-    or a fixed number of elements. Once the collection is "full," the oldest
-    elements will be removed when new elements are added.  Capped collections
-    can be very useful for applications like logging, where you may want to
-    reserve a certain amount of space for logs and not worry about them
-    getting too big.
-   </para>
-   <para>
-    This example creates a very tiny log collection that will keep a maximum of
-    10 documents.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$log = $db->createCollection(
-    "logger",
-    array(
-        'capped' => true,
-        'size' => 10*1024,
-        'max' => 10
-    )
-);
-
-for ($i = 0; $i < 100; $i++) {
-    $log->insert(array("level" => WARN, "msg" => "sample log message #$i", "ts" => new MongoDate()));
-}
-
-$msgs = $log->find();
-
-foreach ($msgs as $msg) {
-    echo $msg['msg']."\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-sample log message #90
-sample log message #91
-sample log message #92
-sample log message #93
-sample log message #94
-sample log message #95
-sample log message #96
-sample log message #97
-sample log message #98
-sample log message #99
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.4.0</entry>
-       <entry>
-        <para>
-         In versions before 1.4.0, the options were all arguments to the method. The
-         function synopsis in those older versions is:
-        </para>
-        <para>
-         <methodsynopsis>
-          <modifier>public</modifier> <type>MongoCollection</type><methodname>MongoDB::createCollection</methodname>
-          <methodparam><type>string</type><parameter>name</parameter></methodparam>
-          <methodparam choice="opt"><type>bool</type><parameter>capped</parameter><initializer>&false;</initializer></methodparam>
-          <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
-          <methodparam choice="opt"><type>int</type><parameter>max</parameter><initializer>0</initializer></methodparam>
-         </methodsynopsis>
-        </para>
-        <para>
-         The meaning of the options is the same as described under the
-         <parameter>options</parameter> argument above.
-        </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/createdbref.xml b/reference/mongo/mongodb/createdbref.xml
deleted file mode 100644
index 57a9704594..0000000000
--- a/reference/mongo/mongodb/createdbref.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.createdbref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::createDBRef</refname>
-  <refpurpose>Creates a database reference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::createDBRef</methodname>
-   <methodparam><type>string</type><parameter>collection</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>document_or_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is a flexible interface for creating database refrences (see
-   <classname>MongoDBRef</classname>).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>collection</parameter>
-     </term>
-     <listitem>
-      <para>
-       The collection to which the database reference will point.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>document_or_id</parameter>
-     </term>
-     <listitem>
-      <para>
-       If an array or object is given, its <literal>_id</literal> field will be
-       used as the reference ID. If a <classname>MongoId</classname> or scalar
-       is given, it will be used as the reference ID.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a database reference array.
-  </para>
-  <para>
-   If an array without an <literal>_id</literal> field was provided as the
-   <literal>document_or_id</literal> parameter, &null; will be returned.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::createDBRef</function> example</title>
-   <para>
-    Example demonstrating how to programatically create a DB reference array from
-    a document.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$articles = $db->articles;
-
-$article = array(
- 'title' => 'Test article',
- 'description' => 'Test article description'
-);
-
-$articles->insert($article);
-$ref = $db->createDBRef('articles', $article);
-
-print_r($article);
-print_r($ref);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-     <![CDATA[
-     Array
-     (
-         [title] => Test article
-         [description] => Test article description
-         [_id] => MongoId Object
-             (
-             )
-
-     )
-     Array
-     (
-         [$ref] => articles
-         [$id] => MongoId Object
-             (
-             )
-
-     )
-     ]]>
-   </screen>
-   <para>
-     Now the $ref can be stored on another document and retrieved later with
-     <methodname>MongoDB::getDBRef</methodname> or <methodname>MongoCollection::getDBRef</methodname>.
-   </para>
-  </example>
-  <example>
-   <title><function>MongoDB::createDBRef</function> example</title>
-   <para>
-    Example demonstrating how to programatically create a DB reference from just an id.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$id = new MongoId('47cc67093475061e3d9536d2');
-$ref = $db->createDBRef('articles', $id);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/drop.xml b/reference/mongo/mongodb/drop.xml
deleted file mode 100644
index 89a96f1c5b..0000000000
--- a/reference/mongo/mongodb/drop.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.drop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::drop</refname>
-  <refpurpose>Drops this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::drop</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This drops the database currently being used.
-  </para>
-  <para>
-   This is identical to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function drop() {
-    $this->command(array("dropDatabase" => 1));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::drop</function> example</title>
-   <para>This example demonstrates how to drop a mongo database and the response to expect.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$db = $mongo->foo;
-$response = $db->drop();
-print_r($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [dropped] => foo.$cmd
-    [ok] => 1
-)
-]]>
-   </screen>
-  </example>  
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/dropcollection.xml b/reference/mongo/mongodb/dropcollection.xml
deleted file mode 100644
index 5895fcabff..0000000000
--- a/reference/mongo/mongodb/dropcollection.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.dropcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::dropCollection</refname>
-  <refpurpose>Drops a collection [deprecated]</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::dropCollection</methodname>
-   <methodparam><type>mixed</type><parameter>coll</parameter></methodparam>
-  </methodsynopsis>
-
-  <warning>
-   <title>Deprecated</title>
-   <para>
-    Use <function>MongoCollection::drop</function> instead.
-   </para>
-   <para>
-    <emphasis>
-     This function leaks memory in version 1.0.7 and earlier!
-    </emphasis>
-   </para>
-  </warning>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>coll</parameter>
-     </term>
-     <listitem>
-      <para>
-       MongoCollection or name of collection to drop.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/execute.xml b/reference/mongo/mongodb/execute.xml
deleted file mode 100644
index 15c3553e56..0000000000
--- a/reference/mongo/mongodb/execute.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::execute</refname>
-  <refpurpose>Runs JavaScript code on the database server [deprecated]</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::execute</methodname>
-   <methodparam><type>mixed</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>args</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <warning>
-   <para>
-    The <link xlink:href="&url.mongodb.docs.command;eval/">eval</link> command,
-    which this method invokes, is deprecated in MongoDB 3.0+.
-   </para>
-  </warning>
-  <para>
-   The Mongo database server runs a JavaScript engine.  This method allows you
-   to run arbitary JavaScript on the database.  This can be useful if you want
-   touch a number of collections lightly, or process some results on the
-   database side to reduce the amount that has to be sent to the client.
-  </para>
-  <para>
-   Running JavaScript in the database takes a write lock, meaning it blocks 
-   other operations.  Make sure you consider this before running a long script.
-  </para>
-  <para>
-   This is a wrapper for the
-   <link xlink:href="&url.mongodb.docs.command;eval/">eval</link> database
-   command. This method is basically:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function execute($code, $args) {
-    return $this->command(array('eval' => $code, 'args' => $args));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
-  <para>
-   MongoDB implies a return statement if you have a single statement on a single
-   line. This can cause some unintuitive behavior.  For example, this returns 
-   "foo":
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$db->execute('"foo";');
-
-?>
-]]>
-  </programlisting>
-  <para>
-   However, these return &null;:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$db->execute('"bar"; "foo";'); // more than one statement
-
-$db->execute('db.foo.count(
-);'); // more than one line
-
-?>
-]]>
-  </programlisting>
-  <para>
-   To avoid surprising behavior, it is best not to depend on MongoDB to decide 
-   what to return, but to explicitly state a return value. In the examples 
-   above, we can change them to:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$db->execute('"bar"; return "foo";');
-
-$db->execute('return db.foo.count(
-);');
-
-?>
-]]>
-  </programlisting>
-  <para>
-   Now the first statement will return "foo" and the second statement will 
-   return a count of the "foo" collection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>code</parameter>
-     </term>
-     <listitem>
-      <para>
-       <classname>MongoCode</classname> or string to execute.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>args</parameter>
-     </term>
-     <listitem>
-      <para>
-       Arguments to be passed to <literal>code</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the result of the evaluation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Simple <function>MongoDB::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$response = $db->execute("function() { return 'Hello, world!'; }");
-echo $response['retval'];
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-Hello, world!
-   </screen>
-  </example>
-  <example>
-   <title>Parameter <function>MongoDB::execute</function> example</title>
-   <para>
-    The optional array of parameters will be passed to the JavaScript function.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$response = $db->execute("function(greeting, name) { return greeting+', '+name+'!'; }", array("Good bye", "Joe"));
-echo $response['retval'];
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-Good bye, Joe!
-   </screen>
-  </example>
-  <example>
-   <title>Scope example</title>
-   <para>
-    If a <classname>MongoCode</classname> object is used instead of a string for
-    the first parameter, a scope can be passed in which the JavaScript will be 
-    executed.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$func = 
-    "function(greeting, name) { ".
-        "return greeting+', '+name+', says '+greeter;".
-    "}";
-$scope = array("greeter" => "Fred");
-
-$code = new MongoCode($func, $scope);
-
-$response = $db->execute($code, array("Goodbye", "Joe"));
-echo $response['retval'];
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-Goodbye, Joe, says Fred 
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The MongoDB <link xlink:href="&url.mongodb.docs.command;eval/">eval command</link> docs</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.7.0</entry>
-       <entry>
-        This method has been deprecated as a result of the underlaying
-        <link xlink:href="&url.mongodb.docs.command;eval/">eval</link> command
-        being deprecated in MongoDB 3.0+.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/forceerror.xml b/reference/mongo/mongodb/forceerror.xml
deleted file mode 100644
index c35bbc5037..0000000000
--- a/reference/mongo/mongodb/forceerror.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.forceerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::forceError</refname>
-  <refpurpose>Creates a database error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB::forceError</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This method is not very useful for normal MongoDB use.  It forces a database 
-   error to occur.  This means that <function>MongoDB::lastError</function> will
-   return a generic database error after running this command.
-  </para>
-  <para>
-   This command is identical to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function forceError() {
-    return $this->command(array('forceerror' => 1));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/get.xml b/reference/mongo/mongodb/get.xml
deleted file mode 100644
index d0cf059899..0000000000
--- a/reference/mongo/mongodb/get.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::__get</refname>
-  <refpurpose>Gets a collection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCollection</type><methodname>MongoDB::__get</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This is the easiest way of getting a collection from a database object.  If a
-   collection name contains strange characters, you may have to use 
-   <function>MongoDB::selectCollection</function> instead.
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mongo = new MongoClient();
-
-// the following two lines are equivalent
-$collection = $mongo->selectDB("foo")->selectCollection("bar");
-$collection = $mongo->foo->bar;
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       The name of the collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the collection.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/getcollectioninfo.xml b/reference/mongo/mongodb/getcollectioninfo.xml
deleted file mode 100644
index 3ea9eba50d..0000000000
--- a/reference/mongo/mongodb/getcollectioninfo.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.getcollectioninfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getCollectionInfo</refname>
-  <refpurpose>Returns information about collections in this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::getCollectionInfo</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a list of all collections in the database and returns them as an array
-   of documents, which contain their names and options.
-  </para>
-  &mongo.listcollections.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      An array of options for listing the collections. Currently available
-      options include:
-      <itemizedlist>
-       &mongo.listcollections.parameters.filter;
-       &mongo.listcollections.parameters.includesystemcollections;
-      </itemizedlist>
-     </para>
-     <para>
-      The following option may be used with MongoDB 2.8+:
-      <itemizedlist>
-       &mongo.command.parameters.maxtimems;
-      </itemizedlist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This function returns an array where each element is an array describing a
-   collection. Elements will contain a <literal>name</literal> key denoting the
-   name of the collection, and optionally contain an <literal>options</literal>
-   key denoting an array of objects used to create the collection. For example,
-   capped collections will include <literal>capped</literal> and
-   <literal>size</literal> options.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   For MongoDB 2.6 and earlier, <classname>MongoException</classname> will be
-   thrown if a non-string value was specified for the
-   <literal>"filter"</literal> option's <literal>"name"</literal> criteria.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::getCollectionInfo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$db = $m->selectDB("demo");
-var_dump($db->getCollectionInfo());
-?>
-]]>
-   </programlisting>
-    &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(2) {
-    ["name"]=>
-    string(4) "logs"
-    ["options"]=>
-    array(2) {
-      ["capped"]=>
-      bool(true)
-      ["size"]=>
-      int(10240)
-    }
-  }
-  [1]=>
-  array(2) {
-    ["name"]=>
-    string(5) "users"
-    ["options"]=>
-    array(1) {
-      ["flags"]=>
-      int(1)
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>MongoDB::getCollectionNames</function></member>
-    <member><function>MongoDB::listCollections</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/getcollectionnames.xml b/reference/mongo/mongodb/getcollectionnames.xml
deleted file mode 100644
index 1f4fb67b6b..0000000000
--- a/reference/mongo/mongodb/getcollectionnames.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb.getcollectionnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getCollectionNames</refname>
-  <refpurpose>Gets an array of names for all collections in this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::getCollectionNames</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a list of all collections in the database and returns their names as an
-   array of strings.
-  </para>
-  &mongo.listcollections.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      An array of options for listing the collections. Currently available
-      options include:
-      <itemizedlist>
-       &mongo.listcollections.parameters.filter;
-       &mongo.listcollections.parameters.includesystemcollections;
-      </itemizedlist>
-     </para>
-     <para>
-      The following option may be used with MongoDB 2.8+:
-      <itemizedlist>
-       &mongo.command.parameters.maxtimems;
-      </itemizedlist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the collection names as an array of strings.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   For MongoDB 2.6 and earlier, <classname>MongoException</classname> will be
-   thrown if a non-string value was specified for the
-   <literal>"filter"</literal> option's <literal>"name"</literal> criteria.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.6.0</entry>
-      <entry>
-       Changed first parameter to be an array of options. Pre-1.6.0, the
-       first parameter was a boolean indicating the
-       <literal>"includeSystemCollections"</literal> option.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::getCollectionNames</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$db = $m->selectDB("demo");
-$collections = $db->getCollectionNames();
-
-foreach ($collections as $collectionName) {
-    echo "Found collection: ", $collectionName, "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-Found collection: img
-Found collection: beer
-Found collection: collation
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>MongoDB::listCollections</function></member>
-    <member><function>MongoDB::getCollectionInfo</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/getdbref.xml b/reference/mongo/mongodb/getdbref.xml
deleted file mode 100644
index ab7e7c6ceb..0000000000
--- a/reference/mongo/mongodb/getdbref.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.getdbref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getDBRef</refname>
-  <refpurpose>Fetches the document pointed to by a database reference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::getDBRef</methodname>
-   <methodparam><type>array</type><parameter>ref</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ref</parameter>
-     </term>
-     <listitem>
-      <para>
-       A database reference.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the document pointed to by the reference.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::getDBRef</function> example</title>
-   <para>
-    Example demonstrating how to get a database reference and what the expected
-    input is.
-   </para>
-   <programlisting role="php">
- <![CDATA[
- <?php
-
- $ref = array(
-   '$ref' => 'profiles',
-   '$id' => new MongoId('47cc67093475061e3d9536d2')
- );
- 
- $profile = $db->getDBRef($ref);
- ?>
- ]]>
-   </programlisting>
-   <para>
-    See <function>MongoDB::createDBRef</function> for more information about how to programatically create DB references.
-   </para>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/getgridfs.xml b/reference/mongo/mongodb/getgridfs.xml
deleted file mode 100644
index 1060a7eb98..0000000000
--- a/reference/mongo/mongodb/getgridfs.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.getgridfs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getGridFS</refname>
-  <refpurpose>Fetches toolkit for dealing with files stored in this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoGridFS</type><methodname>MongoDB::getGridFS</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>prefix</parameter><initializer>&quot;fs&quot;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>prefix</parameter>
-     </term>
-     <listitem>
-      <para>
-       The prefix for the files and chunks collections.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns a new gridfs object for this database.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::getGridFS</function> example</title>
-   <para>This example demonstrates how get a MongoGridFS instance.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$db = $mongo->my_db;
-
-$prefix = 'files';
-$collection = $db->getGridFS($prefix);
-
-?>
-]]>
-   </programlisting>
-   <para>
-    Read more about the <classname>MongoGridFS</classname> to learn how to store files with MongoDB.
-   </para>
-  </example>  
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/getprofilinglevel.xml b/reference/mongo/mongodb/getprofilinglevel.xml
deleted file mode 100644
index e156f876d8..0000000000
--- a/reference/mongo/mongodb/getprofilinglevel.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.getprofilinglevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getProfilingLevel</refname>
-  <refpurpose>Gets this database&apos;s profiling level</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoDB::getProfilingLevel</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This returns the current database profiling level.
-  </para>
-  <para>
-   The database profiler tracks query execution times.  If you turn it on (say,
-   using <function>MongoDB::setProfilingLevel</function> or the shell), you can
-   see how many queries took longer than a given number of milliseconds or the
-   timing for all queries.
-  </para>
-  <para>
-   Note that profiling slows down queries, so it is better to use in development
-   or testing than in a time-sensitive application.
-  </para>
-  <para>
-   This function is equivalent to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function getProfilingLevel() {
-    return $this->command(array('profile' => -1));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the profiling level.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.profiling;">profiling</link></member>
-   <member><methodname>MongoDB::setProfilingLevel</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/getreadpreference.xml b/reference/mongo/mongodb/getreadpreference.xml
deleted file mode 100644
index 633f0cdc48..0000000000
--- a/reference/mongo/mongodb/getreadpreference.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getReadPreference</refname>
-  <refpurpose>Get the read preference for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::getReadPreference</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.3.3</entry>
-       <entry>
-        The return value has changed to be consistent with
-        <methodname>MongoDB::setReadPreference</methodname>. The
-        <literal>type</literal> value was changed from a number to a string,
-        <literal>type_string</literal> was removed, and
-        <literal>tagsets</literal> now expresses tags as key/value pairs instead
-        of colon-delimited strings.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB::getReadPreference</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->test;
-$db->setReadPreference(MongoClient::RP_SECONDARY, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-    array(),
-));
-var_dump($db->getReadPreference());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["type"]=>
-  string(9) "secondary"
-  ["tagsets"]=>
-  array(3) {
-    [0]=>
-    array(2) {
-      ["dc"]=>
-      string(4) "east"
-      ["use"]=>
-      string(9) "reporting"
-    }
-    [1]=>
-    array(1) {
-      ["dc"]=>
-      string(7) "west"
-    }
-    [2]=>
-    array(0) {
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoDB::setReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/getslaveokay.xml b/reference/mongo/mongodb/getslaveokay.xml
deleted file mode 100644
index 89290f9ee4..0000000000
--- a/reference/mongo/mongodb/getslaveokay.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.getslaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getSlaveOkay</refname>
-  <refpurpose>Get slaveOkay setting for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB::getSlaveOkay</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of slaveOkay for this instance.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoDB::getReadPreference</methodname></member>
-   <member><methodname>MongoDB::setReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/getwriteconcern.xml b/reference/mongo/mongodb/getwriteconcern.xml
deleted file mode 100644
index 2032a85e6a..0000000000
--- a/reference/mongo/mongodb/getwriteconcern.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb.getwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::getWriteConcern</refname>
-  <refpurpose>Get the write concern for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::getWriteConcern</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.getwriteconcern.returnvalues;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB::getWriteConcern</methodname> return value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mc = new MongoClient('mongodb://localhost:27017', array('wTimeoutMS' => 500));
-$db = $mc->selectDB('test');
-var_dump($db->getWriteConcern());
-
-$db->setWriteConcern(1, 1000);
-var_dump($db->getWriteConcern());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["w"]=>
-  int(1)
-  ["wtimeout"]=>
-  int(500)
-}
-array(2) {
-  ["w"]=>
-  int(1)
-  ["wtimeout"]=>
-  int(1000)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.writeconcerns">write concern</link> documentation.</member>
-   <member><function>MongoDB::setWriteConcern</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/lasterror.xml b/reference/mongo/mongodb/lasterror.xml
deleted file mode 100644
index 7a0599cb84..0000000000
--- a/reference/mongo/mongodb/lasterror.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.lasterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::lastError</refname>
-  <refpurpose>Check if there was an error on the most recent db operation performed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::lastError</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This method is equivalent to:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function lastError() {
-    return $this->command(array('getlasterror' => 1));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the error, if there was one.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::lastError</function> &null; error example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$db->resetError();
-var_dump($db->lastError());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["err"]=>
-  NULL
-  ["n"]=>
-  int(0)
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB::lastError</function> duplicate key example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$c = $db->selectCollection("foo");
-
-// insert two documents with the same _id
-$c->insert(array("_id" => 1));
-$c->insert(array("_id" => 1));
-
-var_dump($db->lastError());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["err"]=>
-  string(64) "E11000 duplicate key errorindex: foo.foo.$_id_  dup key: { : 1 }"
-  ["n"]=>
-  int(0)
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/listcollections.xml b/reference/mongo/mongodb/listcollections.xml
deleted file mode 100644
index c8bf548cdb..0000000000
--- a/reference/mongo/mongodb/listcollections.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.listcollections"  xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::listCollections</refname>
-  <refpurpose>Gets an array of MongoCollection objects for all collections in this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::listCollections</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a list of all collections in the database and returns them as an array
-   of <classname>MongoCollection</classname> objects.
-  </para>
-  &mongo.listcollections.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      An array of options for listing the collections. Currently available
-      options include:
-      <itemizedlist>
-       &mongo.listcollections.parameters.filter;
-       &mongo.listcollections.parameters.includesystemcollections;
-      </itemizedlist>
-     </para>
-     <para>
-      The following option may be used with MongoDB 2.8+:
-      <itemizedlist>
-       &mongo.command.parameters.maxtimems;
-      </itemizedlist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of MongoCollection objects.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   For MongoDB 2.6 and earlier, <classname>MongoException</classname> will be
-   thrown if a non-string value was specified for the
-   <literal>"filter"</literal> option's <literal>"name"</literal> criteria.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.6.0</entry>
-      <entry>
-       Changed first parameter to be an array of options. Pre-1.6.0, the
-       first parameter was a boolean indicating the
-       <literal>"includeSystemCollections"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongo 1.3.0</entry>
-      <entry>
-       Added the <parameter>includeSystemCollections</parameter> parameter.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::listCollections</function> example</title>
-   <para>
-    The following example demonstrates running count on each collection in a database.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->selectDB("demo");
-$collections = $db->listCollections();
-
-foreach ($collections as $collection) {
-    echo "amount of documents in $collection: ";
-    echo $collection->count(), "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-amount of documents in demo.pubs: 4
-amount of documents in demo.elephpants: 3
-amount of documents in demo.cities: 22840
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>MongoDB::getCollectionNames</function></member>
-    <member><function>MongoDB::getCollectionInfo</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->  
diff --git a/reference/mongo/mongodb/preverror.xml b/reference/mongo/mongodb/preverror.xml
deleted file mode 100644
index 8cf09e0800..0000000000
--- a/reference/mongo/mongodb/preverror.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.preverror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::prevError</refname>
-  <refpurpose>Checks for the last error thrown during a database operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::prevError</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>MongoDB::lastError</function> is usually preferred to this.  This 
-   method returns the last database error that occurred and how many operations
-   ago it occurred.  It is mostly deprecated.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the error and the number of operations ago it occurred.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/repair.xml b/reference/mongo/mongodb/repair.xml
deleted file mode 100644
index b67a825f88..0000000000
--- a/reference/mongo/mongodb/repair.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.repair" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::repair</refname>
-  <refpurpose>Repairs and compacts this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::repair</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>preserve_cloned_files</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>backup_original_files</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This creates a fresh copy of all database data.  It will remove any corrupt 
-   data and compact and large stretches of free space it finds.  This is a very
-   slow operation on a large database.
-  </para>
-  <para>
-   This is usually run from the shell or the command line, not the driver.
-  </para>
-  <para>  
-   It is equivalent to the function:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function repair() {
-    return $this->command(array('repairDatabase' => 1));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>preserve_cloned_files</parameter>
-     </term>
-     <listitem>
-      <para>
-       If cloned files should be kept if the repair fails.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>backup_original_files</parameter>
-     </term>
-     <listitem>
-      <para>
-       If original files should be backed up.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns db response.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   MongoDB core docs on <link xlink:href="&url.mongodb.docs.command;repairDatabase">repairDatabase</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB::repair</function> example</title>
-   <para>This example demonstrates how to repare and compact a database.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$db = $mongo->foo;
-
-$response = $db->repair();
-print_r($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [ok] => 1
-)
-]]>
-   </screen>
-  </example>  
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/reseterror.xml b/reference/mongo/mongodb/reseterror.xml
deleted file mode 100644
index d13f564997..0000000000
--- a/reference/mongo/mongodb/reseterror.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.reseterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::resetError</refname>
-  <refpurpose>Clears any flagged errors on the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoDB::resetError</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This method is not used in normal operations.  It resets the database error 
-   tracker (which can be incremented with 
-   <function>MongoDB::forceError</function>, also not normally used).  
-  </para>
-  <para>
-   It is equivalent to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function resetError() {
-    return $this->command(array('reseterror' => 1));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the database response.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/selectcollection.xml b/reference/mongo/mongodb/selectcollection.xml
deleted file mode 100644
index 656e9af710..0000000000
--- a/reference/mongo/mongodb/selectcollection.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.selectcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::selectCollection</refname>
-  <refpurpose>Gets a collection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoCollection</type><methodname>MongoDB::selectCollection</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       The collection name.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns a new collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>Exception</classname> if the collection name is invalid.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/setprofilinglevel.xml b/reference/mongo/mongodb/setprofilinglevel.xml
deleted file mode 100644
index b6234c020a..0000000000
--- a/reference/mongo/mongodb/setprofilinglevel.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.setprofilinglevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::setProfilingLevel</refname>
-  <refpurpose>Sets this database&apos;s profiling level</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoDB::setProfilingLevel</methodname>
-   <methodparam><type>int</type><parameter>level</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This changes the current database profiling level.
-  </para>
-  <para>
-   This function is equivalent to running:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-public function setProfilingLevel($level) {
-    return $this->command(array('profile' => $level));
-}
-
-?>
-]]>
-   </programlisting>
-  </para>
-  <para>
-   The options for level are 0 (off), 1 (queries > 100ms), and 2 (all queries).
-   If you would like to profile queries that take longer than another time 
-   period, use the database command and pass it a second option, the number of
-   milliseconds.  For example, to profile all queries that take longer than one
-   second, run:
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$result = $this->command(array('profile' => 1, 'slowms' => 1000));
-
-?>
-]]>
-   </programlisting>
-  </para>
-  <para>
-   Profiled queries will appear in the <literal>system.profile</literal> 
-   collection of this database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>level</parameter>
-     </term>
-     <listitem>
-      <para>
-       Profiling level.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the previous profiling level.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.dochub.profiling;">profiling</link></member>
-   <member><methodname>MongoDB::getProfilingLevel</methodname></member>
-  </simplelist>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/setreadpreference.xml b/reference/mongo/mongodb/setreadpreference.xml
deleted file mode 100644
index a99cbc3627..0000000000
--- a/reference/mongo/mongodb/setreadpreference.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb.setreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::setReadPreference</refname>
-  <refpurpose>Set the read preference for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB::setReadPreference</methodname>
-   <methodparam><type>string</type><parameter>read_preference</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tags</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setreadpreference.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.setreadpreference.returnvalues;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setreadpreference.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB::setReadPreference</methodname> tag set array syntax example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$db = $m->test;
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$db->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoDB::getReadPreference</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/setslaveokay.xml b/reference/mongo/mongodb/setslaveokay.xml
deleted file mode 100644
index af3a6c9b4d..0000000000
--- a/reference/mongo/mongodb/setslaveokay.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.setslaveokay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::setSlaveOkay</refname>
-  <refpurpose>Change slaveOkay setting for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB::setSlaveOkay</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>ok</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   See <link linkend="mongo.queries">the query section</link> of this manual for
-   information on distributing reads to secondaries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ok</parameter>
-     </term>
-     <listitem>
-      <para>
-       If reads should be sent to secondary members of a replica set for all 
-       possible queries using this <classname>MongoDB</classname> instance.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the former value of slaveOkay for this instance.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongo.readpreferences" /></member>
-   <member><methodname>MongoDB::setReadPreference</methodname></member>
-   <member><methodname>MongoDB::getReadPreference</methodname></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodb/setwriteconcern.xml b/reference/mongo/mongodb/setwriteconcern.xml
deleted file mode 100644
index 895e0d2b73..0000000000
--- a/reference/mongo/mongodb/setwriteconcern.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb.setwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::setWriteConcern</refname>
-  <refpurpose>Set the write concern for this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB::setWriteConcern</methodname>
-   <methodparam><type>mixed</type><parameter>w</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>wtimeout</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &mongo.setwriteconcern.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.setwriteconcern.returnvalues;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.setwriteconcern.errors;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB::setWriteConcern</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mc = new MongoClient('mongodb://rs1.example.com,rs2.example.com');
-$db = $mc->selectDB('test');
-
-// Require that the majority of servers in the replica set acknowledge writes
-// within three seconds.
-$db->setWriteConcern('majority', 3000);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>The <link linkend="mongo.writeconcerns">write concern</link> documentation.</member>
-   <member><function>MongoDB::getWriteConcern</function></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodb/tostring.xml b/reference/mongo/mongodb/tostring.xml
deleted file mode 100644
index ae103de469..0000000000
--- a/reference/mongo/mongodb/tostring.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb.--tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB::__toString</refname>
-  <refpurpose>The name of this database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoDB::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns this database&apos;s name.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodbref.xml b/reference/mongo/mongodbref.xml
deleted file mode 100644
index 8fc3d9627f..0000000000
--- a/reference/mongo/mongodbref.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongodbref" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoDBRef class</title>
- <titleabbrev>MongoDBRef</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.noalternative.class.note;
-   <para>
-    The concept of database references, and hence this class, has been
-    deprecated in the database.
-   </para>
-  </warning>
-
-<!-- {{{ MongoGridfsCursor intro -->
-  <section xml:id="mongodbref.intro">
-   &reftitle.intro;
-   <para>
-    This class can be used to create lightweight links between objects in 
-    different collections.
-   </para>
-   <para>
-    <emphasis>Motivation</emphasis>: Suppose we need to refer to a document in 
-    another collection. The easiest way is to create a field in the current 
-    document.  For example, if we had a "people" collection and an "addresses"
-    collection, we might want to create a link between each person document and
-    an address document:
-    <example>
-     <title>Linking documents</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$people = $db->people;
-$addresses = $db->addresses;
-
-$myAddress = array("line 1" => "123 Main Street", 
-    "line 2" => null,
-    "city" => "Springfield",
-    "state" => "Vermont",
-    "country" => "USA");
-
-// save the address
-$addresses->insert($myAddress);
-
-// save a person with a reference to the address
-$me = array("name" => "Fred", "address" => $myAddress['_id']);
-$people->insert($me);
-
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <para>
-    Then, later on, we can find the person's address by querying the "addresses"
-    collection with the <classname>MongoId</classname> we saved in the "people"
-    collection.
-   </para>
-   <para>
-    Suppose now that we have a more general case, where we don't know which
-    collection (or even which database) contains the referenced document.  
-    <classname>MongoDBRef</classname> is a good choice for this case, as it is a
-    common format that all of the drivers and the database understand.
-   </para>
-   <para>
-    If each person had a list of things they liked which could come from
-    multiple collections, such as "hobbies", "sports", "books", etc., we could
-    use <classname>MongoDBRef</classname>s to keep track of what "like" went
-    with what collection:
-    <example>
-     <title>Creating MongoDBRef links</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$people = $db->selectCollection("people");
-
-// model trains are in the "hobbies" collection
-$trainRef = MongoDBRef::create("hobbies", $modelTrains['_id']);
-// soccer is in the "sports" collection
-$soccerRef = MongoDBRef::create("sports", $soccer['_id']);
-
-// now we'll know what collections the items in the "likes" array came from when
-// we retrieve this document
-$people->insert(array("name" => "Fred", "likes" => array($trainRef, $soccerRef)));
-
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <para>
-    Database references can be thought of as hyperlinks: they give the unique 
-    address of another document, but they do not load it or automatically follow
-    the link/reference.  
-   </para>
-   <para>
-    A database reference is just a normal associative array, not an instance of
-    <classname>MongoDBRef</classname>, so this class is a little different than 
-    the other data type classes.  This class contains exclusively static methods 
-    for manipulating database references.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodbref.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDBRef</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDBRef</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodbref')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   &reftitle.seealso;
-   <para>
-    MongoDB core docs on <link xlink:href="&url.mongodb.dochub.dbrefs;">databases references</link>.
-   </para>
-  </section>
- </partintro>
-
- &reference.mongo.entities.mongodbref;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodbref/create.xml b/reference/mongo/mongodbref/create.xml
deleted file mode 100644
index 70675d0c42..0000000000
--- a/reference/mongo/mongodbref/create.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodbref.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDBRef::create</refname>
-  <refpurpose>Creates a new database reference</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    The concept of database references, and hence this class, has been
-    deprecated.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>MongoDBRef::create</methodname>
-   <methodparam><type>string</type><parameter>collection</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>id</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If no database is given, the current database is used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>collection</parameter>
-     </term>
-     <listitem>
-      <para>
-       Collection name (without the database name).
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>id</parameter>
-     </term>
-     <listitem>
-      <para>
-       The _id field of the object to which to link.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>database</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database name.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the reference.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDBRef::create</function> example</title>
-   <para>
-    This creates a database reference to a document in the 
-    <literal>addresses</literal> collection.  The 
-    <function>MongoCollection::getName</function> function returns the name of 
-    the collection (not including the database name).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$addresses = $db->addresses;
-$people = $db->people;
-
-// save $address so it has an _id
-$addresses->insert($address);
-
-// create a reference
-$ref = MongoDBRef::create($addresses->getName(), $address['_id']);
-
-// set the field in $person
-$person['address'] = $ref;
-$people->save($person);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoDB::createDBRef</methodname></member>
-    <member><methodname>MongoCollection::createDBRef</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodbref/get.xml b/reference/mongo/mongodbref/get.xml
deleted file mode 100644
index 8e5b084c69..0000000000
--- a/reference/mongo/mongodbref/get.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodbref.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDBRef::get</refname>
-  <refpurpose>Fetches the object pointed to by a reference</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    The concept of database references, and hence this class, has been
-    deprecated.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>MongoDBRef::get</methodname>
-   <methodparam><type>MongoDB</type><parameter>db</parameter></methodparam>
-   <methodparam><type>array</type><parameter>ref</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>db</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database to use.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>ref</parameter>
-     </term>
-     <listitem>
-      <para>
-       Reference to fetch.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the document to which the reference refers or &null; if the document
-   does not exist (the reference is broken).
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoCollection::createDBRef</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// get $person out of the db
-$person = $people->findOne();
-
-// dereference the address
-$address = MongoDBRef::get($people->db, $person['address']);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoDB::getDBRef</methodname></member>
-    <member><methodname>MongoCollection::getDBRef</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodbref/isref.xml b/reference/mongo/mongodbref/isref.xml
deleted file mode 100644
index de82a82bb7..0000000000
--- a/reference/mongo/mongodbref/isref.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodbref.isref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDBRef::isRef</refname>
-  <refpurpose>Checks if an array is a database reference</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    The concept of database references, and hence this class, has been
-    deprecated.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>MongoDBRef::isRef</methodname>
-   <methodparam><type>mixed</type><parameter>ref</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method does not actually follow the reference, so it does not determine if it is
-   broken or not.  It merely checks that <parameter>ref</parameter> is in valid 
-   database reference format (in that it is an object or array with $ref and $id
-   fields).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>ref</parameter>
-     </term>
-     <listitem>
-      <para>
-       Array or object to check.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-    &return.success;
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongodeletebatch.xml b/reference/mongo/mongodeletebatch.xml
deleted file mode 100644
index 0603d348f3..0000000000
--- a/reference/mongo/mongodeletebatch.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongodeletebatch" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoDeleteBatch class</title>
- <titleabbrev>MongoDeleteBatch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDeleteBatch intro -->
-  <section xml:id="mongodeletebatch.intro">
-   &reftitle.intro;
-   <para>
-    Constructs a batch of DELETE operations. See <classname>MongoWriteBatch</classname>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodeletebatch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDeleteBatch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDeleteBatch</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoWriteBatch</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodeletebatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongowritebatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongodeletebatch;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongodeletebatch/construct.xml b/reference/mongo/mongodeletebatch/construct.xml
deleted file mode 100644
index fabddf4e5b..0000000000
--- a/reference/mongo/mongodeletebatch/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodeletebatch.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDeleteBatch::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoDeleteBatch::__construct</methodname>
-   <methodparam><type>MongoCollection</type><parameter>collection</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>write_options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a batch of DELETE operations. See <classname>MongoWriteBatch</classname>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection</parameter></term>
-    &mongo.mongowritebatch.collection.description;
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_options</parameter></term>
-    &mongo.mongowritebatch.writeoptions.description;
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A new MongoDeleteBatch.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoduplicatekeyexception.xml b/reference/mongo/mongoduplicatekeyexception.xml
deleted file mode 100644
index 5d742f2e84..0000000000
--- a/reference/mongo/mongoduplicatekeyexception.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoduplicatekeyexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoDuplicateKeyException class</title>
- <titleabbrev>MongoDuplicateKeyException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDuplicateKeyException intro -->
-  <section xml:id="mongoduplicatekeyexception.intro">
-   &reftitle.intro;
-   <para>
-    Thrown when attempting to insert a document into a collection which already contains the same values for the <link linkend="mongocollection.ensureindex">unique keys</link>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoduplicatekeyexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDuplicateKeyException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDuplicateKeyException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoWriteConcernException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
-
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongowriteconcernexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongoduplicatekeyexception.examples">
-   &reftitle.examples;
-   <example xml:id="mongoduplicatekeyexception.example.catch">
-    <title>Catching MongoDuplicateKeyException</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-
-$c = $mc->selectCollection("test", "test");
-
-$c->insert(array('_id' => 1));
-try {
-    $c->insert(array('_id' => 1));
-} catch (MongoWriteConcernException $e) {
-    echo $e->getMessage(), "\n";
-}
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-localhost:27017: insertDocument :: caused by :: 11000 E11000 duplicate key error index: test.test.$_id_  dup key: { : 1 }
-]]>
-    </screen>
-   </example>
-  </section>
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoexception.xml b/reference/mongo/mongoexception.xml
deleted file mode 100644
index 1ae1c1920c..0000000000
--- a/reference/mongo/mongoexception.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongoexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoException class</title>
- <titleabbrev>MongoException</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ MongoException intro -->
-  <section xml:id="mongoexception.intro">
-   &reftitle.intro;
-   <para>
-    Default Mongo exception.
-   </para>
-
-   <para>
-    This covers a bunch of different error conditions that may eventually be
-    moved to more specific exceptions, but will always extend 
-    <classname>MongoException</classname>.
-   </para>
-
-   <itemizedlist>
-
-    <listitem>
-     <para>
-      <literal>The MongoSomething object has not been correctly initialized by its constructor</literal>
-     </para>
-     <para>
-      Code: 0
-     </para>
-     <para>
-      Probably your Mongo object is not connected to a database server.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>zero-length keys are not allowed, did you use $ with double quotes?</literal>
-     </para>
-     <para>
-      Code: 1
-     </para>
-     <para>
-      You tried to save "" as a key.  You generally should not do this.  "" can 
-      mess up subobject access and is used by MongoDB internally.  However, if 
-      you really want, you can set 
-      <link linkend="ini.mongo.allow-empty-keys">mongo.allow_empty_keys</link> 
-      to true in your php.ini file to override this sanity check.  If you 
-      override this, it is highly recommended that you set error checking to 
-      strict to avoid string interpolation errors.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>'.' not allowed in key: &lt;key&gt;</literal>
-     </para>
-     <para>
-      Code: 2
-     </para>
-     <para>
-      You attempted to write a key with '.' in it, which is prohibited.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>insert too large: &lt;size&gt;, max: &lt;max&gt;</literal>
-     </para>
-     <para>
-      Code: 3
-     </para>
-     <para>
-      You're attempting to send too much data to the database at once: the
-      database will only accept inserts up to a certain size (currently 16 MB).
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>no elements in doc</literal>
-     </para>
-     <para>
-      Code: 4
-     </para>
-     <para>
-      You're attempting to save a document with no fields.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>size of BSON doc is &lt;size&gt; bytes, max &lt;max&gt;MB</literal>
-     </para>
-     <para>
-      Code: 5
-     </para>
-     <para>
-      You're attempting to save a document that is larger than MongoDB can save.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>no documents given</literal>
-     </para>
-     <para>
-      Code: 6
-     </para>
-     <para>
-      You're attempting to batch insert an empty array of documents.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>MongoCollection::group takes an array, object, or MongoCode key</literal>
-     </para>
-     <para>
-      Code: 7
-     </para>
-     <para>
-      Wrong type parameter send to <function>MongoCollection::group</function>.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>field names must be strings</literal>
-     </para>
-     <para>
-      Code: 8
-     </para>
-     <para>
-      You should format field selectors as 
-      <literal>array("field1" =&gt; 1, "field2" =&gt; 1, ..., "fieldN" =&gt; 1)</literal>.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>invalid regex</literal>
-     </para>
-     <para>
-      Code: 9
-     </para>
-     <para>
-      The regex passed to <classname>MongoRegex</classname> is not of the 
-      correct form.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>MongoDBRef::get: $ref field must be a string</literal>
-     </para>
-     <para>
-      Code: 10
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>MongoDBRef::get: $db field must be a string</literal>
-     </para>
-     <para>
-      Code: 11
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>non-utf8 string: &lt;str&gt;</literal>
-     </para>
-     <para>
-      Code: 12
-     </para>
-     <para>
-      This error occurs if you attempt to send a non-utf8 string to the 
-      database.  All strings going into the database should be UTF8. See php.ini
-      options for the transition option of quieting this exception.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>mutex error: &lt;err&gt;</literal>
-     </para>
-     <para>
-      Code: 13
-     </para>
-     <para>
-      The driver uses mutexes for synchronizing requests and responses in 
-      multithreaded environments.  This is a fairly serious error and may not
-      have a stack trace.  It's unusual and should be reported to maintainers
-      with any system information and steps to reproduce that you can provide.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      <literal>index name too long: &lt;len&gt;, max &lt;max&gt; characters</literal>
-     </para>
-     <para>
-      Code: 14
-     </para>
-     <para>
-      Indexes with names longer than 128 characters cannot be created.  If you
-      get this error, you should use 
-      <function>MongoCollection::ensureIndex</function>'s "name" option to 
-      create a shorter name for your index.
-     </para>
-    </listitem>
-
-   </itemizedlist>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongoexception.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoException</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-    
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoexecutiontimeoutexception.xml b/reference/mongo/mongoexecutiontimeoutexception.xml
deleted file mode 100644
index 0f73c9c7ed..0000000000
--- a/reference/mongo/mongoexecutiontimeoutexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoexecutiontimeoutexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoExecutionTimeoutException class</title>
- <titleabbrev>MongoExecutionTimeoutException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoExecutionTimeoutException intro -->
-  <section xml:id="mongoexecutiontimeoutexception.intro">
-   &reftitle.intro;
-   <para>
-    Thrown when a operation times out server side (i.e. in MongoDB).
-   </para>
-   <para>
-    To configure the operation timeout threshold, use
-    <methodname>MongoCursor::maxTimeMS</methodname> or the
-    <literal>"maxTimeMS"</literal> command option.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoexecutiontimeoutexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoExecutionTimeoutException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoExecutionTimeoutException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfs.xml b/reference/mongo/mongogridfs.xml
deleted file mode 100644
index 1ad46ac9d7..0000000000
--- a/reference/mongo/mongogridfs.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongogridfs" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoGridFS class</title>
- <titleabbrev>MongoGridFS</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Mongogridfs intro -->
-  <section xml:id="mongogridfs.intro">
-   &reftitle.intro;
-   <para>
-    Utilities for storing and retrieving files from the database.
-   </para>
-
-   <para>
-    GridFS is a storage specification all supported drivers implement. 
-    Basically, it defines two collections: <literal>files</literal>, for file 
-    metadata, and <literal>chunks</literal>, for file content.  If the file is 
-    large, it will automatically be split into smaller chunks and each chunk 
-    will be saved as a document in the chunks collection.
-   </para>
-
-   <para>
-    Each document in the files collection contains the filename, upload date, 
-    and md5 hash.  It also contains a unique <literal>_id</literal> field, which
-    can be used to query the chunks collection for the file's content.  Each 
-    document in the chunks collection contains a chunk of binary data, a 
-    <literal>files_id</literal> field that matches its file's 
-    <literal>_id</literal>, and the position of this chunk in the overall file.
-   </para>
-
-   <para>
-    For example, the files document is something like:
-    <programlisting role="php">
-<![CDATA[
-<?php
-array("_id" => 123456789, "filename" => "foo.txt", "chunkSize" => 3, "length" => 12);
-?>
-]]>
-    </programlisting>
-    and the chunks documents look like:
-    <programlisting role="php">
-<![CDATA[
-<?php
-array("files_id" => 123456789, "n" => 0, "data" => new MongoBinData("abc"));
-array("files_id" => 123456789, "n" => 1, "data" => new MongoBinData("def"));
-array("files_id" => 123456789, "n" => 2, "data" => new MongoBinData("ghi"));
-array("files_id" => 123456789, "n" => 3, "data" => new MongoBinData("jkl"));
-?>
-]]>
-    </programlisting>
-    Of course, the default chunk size is thousands of bytes, but that makes an unwieldy example.
-   </para>
-  </section>
-
-  <section>
-   <title>Inter-Language Compatibility</title>
-   <para>
-    You should be able to use any files created by MongoGridFS with any other 
-    drivers, and vice versa.  However, some drivers expect that all metadata
-    associated with a file be in a "metadata" field.  If you're going to be 
-    using other languages, it's a good idea to wrap info you might want them to
-    see in a "metadata" field.  For example, instead of:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$grid->storeFile("somefile.txt", array("date" => new MongoDate()));
-
-?>
-]]>
-   </programlisting>
-   <para>
-    use something like:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$grid->storeFile("somefile.txt", array("metadata" => array("date" => new MongoDate())));
-
-?>
-]]>
-   </programlisting>
-  </section>
-
-  <section>
-   <title>The <classname>MongoGridFS</classname> Family</title>
-
-   <para>
-    <classname>MongoGridFS</classname> represents the files and chunks 
-    collections. <classname>MongoGridFS</classname> extends MongoCollection, 
-    and an instance of <classname>MongoGridFS</classname> has access to all of 
-    <classname>MongoCollection</classname> methods, which act on the files
-    collection:
-    <informalexample>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$grid = $db->getGridFS();
-$grid->update(array("filename" => "foo"), $newObj); // update on the files collection
-
-?>
-]]>
-     </programlisting>
-    </informalexample>
-   </para>
-
-   <para>
-    Another example of manipulating metadata:
-    <informalexample>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-// save a file
-$id = $grid->storeFile("game.tgz");
-$game = $grid->findOne();
-
-// add a downloads counter
-$game->file['downloads'] = 0;
-$grid->save($game->file);
-
-// increment the counter
-$grid->update(array("_id" => $id), array('$inc' => array("downloads" => 1)));
-
-?>
-]]>
-     </programlisting>
-    </informalexample>
-   </para>
-
-   <para>
-    You can also access the chunks collection from an instance of 
-    <classname>MongoGridFS</classname>:
-    <informalexample>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-  $chunks = $grid->chunks; // $chunks is a normal MongoCollection
-$chunks->insert(array("x" => 4));
-
-?>
-]]>
-     </programlisting>
-    </informalexample>
-   </para>
-   <para>
-    There are some methods for <classname>MongoGridFS</classname> with the same
-    name as <classname>MongoCollection</classname> methods, that behave 
-    slightly differently. For example, <function>MongoGridFS::remove</function>
-    will remove any objects that match the criteria from the files collection 
-    and their content from the chunks collection.
-   </para>
-
-   <para>
-    To store something new in GridFS, there are a couple options.  If you have
-    a filename, you can say:
-    <informalexample>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$grid->storeFile($filename, array("whatever" => "metadata", "you" => "want"));
-
-?>
-]]>
-     </programlisting>
-    </informalexample>
-   </para>
-
-   <para>
-    If you have a string of bytes that isn't a file, you can also store that
-    using <function>MongoGridFS::storeBytes</function>:
-    <informalexample>
-     <programlisting role="php">
-<![CDATA[
-<?php
-
-$grid->storeBytes($bytes, array("whatever" => "metadata", "you" => "want"));
-
-?>
-]]>
-     </programlisting>
-    </informalexample>
-   </para>
-
-   <para>
-    Querying a <classname>MongoGridFS</classname> collection returns a 
-    <classname>MongoGridFSCursor</classname>, which behaves like a normal 
-    <classname>MongoCursor</classname> except that it returns 
-    <classname>MongoGridFSFiles</classname> instead of associative arrays.
-   </para>
-
-   <para>
-    <classname>MongoGridFSFiles</classname> can be written back to disc using 
-    <function>MongoGridFSFile::write</function> or retrieved in memory using 
-    <function>MongoGridFSFile::getBytes</function>. There is currently no 
-    method that automatically streams chunks, but it would be fairly easy to 
-    write by querying the <literal>$grid->chunks</literal> collection.
-   </para>
-
-   <para>
-    <classname>MongoGridFSFile</classname> objects contain a field file which
-    contains any file metadata.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongogridfs.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoGridFS</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoCollection</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>MongoCollection</type>
-     <varname>chunks</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname>filesName</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname>chunksName</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongogridfs')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   &reftitle.seealso;
-   <simplelist>
-    <member>MongoDB core docs on <link xlink:href="&url.mongodb.docs.gridfs;">GridFS</link></member>
-    <member>LightCube Solutions blog post on <link xlink:href="&url.mongodb.gridfs.fileupload;">saving user uploads</link></member>
-    <member>LightCube Solutions blog post on <link xlink:href="&url.mongodb.gridfs.metadata;">adding metadata to files</link></member>
-   </simplelist>
-  </section>
- </partintro>
-
- &reference.mongo.entities.mongogridfs;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfs/construct.xml b/reference/mongo/mongogridfs/construct.xml
deleted file mode 100644
index aae73b99c2..0000000000
--- a/reference/mongo/mongogridfs/construct.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::__construct</refname>
-  <refpurpose>Creates new file collections</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoGridFS::__construct</methodname>
-   <methodparam><type>MongoDB</type><parameter>db</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>prefix</parameter><initializer>&quot;fs&quot;</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>chunks</parameter><initializer>&quot;fs&quot;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Files as stored across two collections, the first containing file meta information, the
-   second containing chunks of the actual file. By default, fs.files and fs.chunks are the
-   collection names used.
-  </para>
-  <para>
-   Use one argument to specify a prefix other than "fs":
-<![CDATA[
-$fs = new MongoGridFS($db, "myfiles");
-]]>
-   uses myfiles.files and myfiles.chunks collections.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;  
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>db</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>files</parameter>
-     </term>
-     <listitem>
-      <para>
-       Optional collection name prefix.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/delete.xml b/reference/mongo/mongogridfs/delete.xml
deleted file mode 100644
index 823f951169..0000000000
--- a/reference/mongo/mongogridfs/delete.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::delete</refname>
-  <refpurpose>Remove a file and its chunks from the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>array</type></type><methodname>MongoGridFS::delete</methodname>
-   <methodparam><type>mixed</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-
-  <note>
-   <para>
-    <methodname>MongoGridFS::delete</methodname> is a convenience method for
-    calling <methodname>MongoGridFS::remove</methodname> with specific
-    <parameter>criteria</parameter> and default <parameter>options</parameter>
-    parameters.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <para>
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>id</parameter>
-    </term>
-    <listitem>
-     <para>
-      <literal>_id</literal> of the file to remove.
-     </para>
-    </listitem>
-   </varlistentry>   
-  </variablelist>
- </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the removal (with respect to the
-   <literal>files</literal> collection) if a
-   <link linkend="mongo.writeconcerns">write concern</link> is applied.
-   Otherwise, returns &true;.
-  </para>
-  <para>
-   Fields in the status array are described in the documentation for
-   <function>MongoCollection::insert</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/drop.xml b/reference/mongo/mongogridfs/drop.xml
deleted file mode 100644
index 1efc6a25d8..0000000000
--- a/reference/mongo/mongogridfs/drop.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.drop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::drop</refname>
-  <refpurpose>Drops the files and chunks collections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoGridFS::drop</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The database response.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/find.xml b/reference/mongo/mongogridfs/find.xml
deleted file mode 100644
index bf02a15518..0000000000
--- a/reference/mongo/mongogridfs/find.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.find" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::find</refname>
-  <refpurpose>Queries for files</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoGridFSCursor</type><methodname>MongoGridFS::find</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>fields</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       The query.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>fields</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields to return.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A <classname>MongoGridFSCursor</classname>.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/findone.xml b/reference/mongo/mongogridfs/findone.xml
deleted file mode 100644
index be42ab5bc5..0000000000
--- a/reference/mongo/mongogridfs/findone.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.findone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::findOne</refname>
-  <refpurpose>Returns a single file matching the criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoGridFSFile</type><methodname>MongoGridFS::findOne</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>query</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>fields</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       The filename or criteria for which to search.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <classname>MongoGridFSFile</classname> or &null;.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoGridFS::findOne</methodname> example</title>
-   <para>
-    Example demonstrating how to find a single file from the MongoGridFS.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$downloads = $mongo->my_db->getGridFS('downloads');
-
-$downloads->storeFile('filename.tgz');
-
-$download = $downloads->findOne('filename.tgz'); // instance of MongoGridFSFile
-
-print_r($download);
-?>
-]]>
-   </programlisting>
-   <para>
-    See <classname>MongoGridFSFile</classname> for more information about how to work with files.
-   </para>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MongoGridFSFile Object
-(
-    [file] => Array
-        (
-            [_id] => MongoId Object
-                (
-                )
-
-            [filename] => filename.tgz
-            [uploadDate] => MongoDate Object
-                (
-                    [sec] => 1274288014
-                    [usec] => 467000
-                )
-
-            [chunkSize] => 262144
-            [md5] => d41d8cd98f00b204e9800998ecf8427e
-        )
-
-    [gridfs:protected] => MongoGridFS Object
-        (
-            [chunks] => MongoCollection Object
-                (
-                )
-
-            [filesName:protected] => downloads.files
-            [chunksName:protected] => downloads.chunks
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/get.xml b/reference/mongo/mongogridfs/get.xml
deleted file mode 100644
index 0fd5ed3708..0000000000
--- a/reference/mongo/mongogridfs/get.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::get</refname>
-  <refpurpose>Retrieve a file from the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoGridFSFile</type><methodname>MongoGridFS::get</methodname>
-   <methodparam><type>mixed</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <para>
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>id</parameter>
-    </term>
-    <listitem>
-     <para>
-      <literal>_id</literal> of the file to find.
-     </para>
-    </listitem>
-   </varlistentry>   
-  </variablelist>
- </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the file, if found, or &null;.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/put.xml b/reference/mongo/mongogridfs/put.xml
deleted file mode 100644
index bf44306fb0..0000000000
--- a/reference/mongo/mongogridfs/put.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.put" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::put</refname>
-  <refpurpose>Stores a file in the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoGridFS::put</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>metadata</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-
-  <note>
-   <para>
-    <methodname>MongoGridFS::put</methodname> is an alias of <methodname>MongoGridFS::storeFile</methodname>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>filename</parameter>
-     </term>
-     <listitem>
-      <para>
-       Name of the file to store.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>metadata</parameter>
-     </term>
-     <listitem>
-      <para>
-       Other metadata fields to include in the file document.
-      </para>
-      &mongo.gridfs.store.metadata.note;
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the insert operations executed against the
-       <literal>chunks</literal> and <literal>files</literal> collections. See
-       <function>MongoCollection::insert</function> for documentation on these
-       these options.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.gridfs.store.return;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoGridFSException</classname> if there is an error
-   reading <parameter>filename</parameter> or inserting into the
-   <literal>chunks</literal> or <literal>files</literal> collections.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoGridFS::storeBytes</function></member>
-   <member><function>MongoGridFS::storeFile</function></member>
-   <member><function>MongoGridFS::storeUpload</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.docs.gridfs;">GridFS</link></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/remove.xml b/reference/mongo/mongogridfs/remove.xml
deleted file mode 100644
index f3ab83edae..0000000000
--- a/reference/mongo/mongogridfs/remove.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::remove</refname>
-  <refpurpose>Remove files and their chunks from the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>array</type></type><methodname>MongoGridFS::remove</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>criteria</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>criteria</parameter>
-     </term>
-     <listitem>
-      <para>
-       The filename or criteria for which to search.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the remove operations executed against the
-       <literal>chunks</literal> and <literal>files</literal> collections. See
-       <function>MongoCollection::remove</function> for documentation on these
-       options.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the status of the removal (with respect to the
-   <literal>files</literal> collection) if the <literal>"w"</literal> option is
-   set. Otherwise, returns &true;.
-  </para>
-  <para>
-   Fields in the status array are described in the documentation for
-   <function>MongoCollection::insert</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  &mongo.errors.exceptions.writeconcern;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfs/storebytes.xml b/reference/mongo/mongogridfs/storebytes.xml
deleted file mode 100644
index 08d87dc9b1..0000000000
--- a/reference/mongo/mongogridfs/storebytes.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.storebytes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::storeBytes</refname>
-  <refpurpose>Stores a string of bytes in the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoGridFS::storeBytes</methodname>
-   <methodparam><type>string</type><parameter>bytes</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>metadata</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>bytes</parameter>
-     </term>
-     <listitem>
-      <para>
-       String of bytes to store.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>metadata</parameter>
-     </term>
-     <listitem>
-      <para>
-       Other metadata fields to include in the file document.
-      </para>
-      &mongo.gridfs.store.metadata.note;
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the insert operations executed against the
-       <literal>chunks</literal> and <literal>files</literal> collections. See
-       <function>MongoCollection::insert</function> for documentation on these
-       these options.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.gridfs.store.return;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoGridFSException</classname> if there is an error
-   inserting into the <literal>chunks</literal> or <literal>files</literal>
-   collections.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoGridFS::storeBytes</function> with additional metadata</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$gridfs = $m->selectDB('test')->getGridFS();
-
-$bytes = 'abcdefghijklmnopqrstuvwxyz';
-$id = $gridfs->storeBytes($bytes, array('_id' => 'alphabet'));
-$gridfsFile = $gridfs->get($id);
-
-var_dump($gridfsFile->file);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(7) {
-  ["_id"]=>
-  string(8) "alphabet"
-  ["uploadDate"]=>
-  object(MongoDate)#7 (0) {
-  }
-  ["length"]=>
-  int(26)
-  ["chunkSize"]=>
-  int(262144)
-  ["md5"]=>
-  string(32) "c3fcd3d76192e4007dfb496cca67e13b"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoGridFS::put</function></member>
-   <member><function>MongoGridFS::storeFile</function></member>
-   <member><function>MongoGridFS::storeUpload</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.docs.gridfs;">GridFS</link></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfs/storefile.xml b/reference/mongo/mongogridfs/storefile.xml
deleted file mode 100644
index f8c2b99e21..0000000000
--- a/reference/mongo/mongogridfs/storefile.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.storefile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::storeFile</refname>
-  <refpurpose>Stores a file in the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoGridFS::storeFile</methodname>
-   <methodparam><type class="union"><type>string</type><type>resource</type></type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>metadata</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>filename</parameter>
-     </term>
-     <listitem>
-      <para>
-       Name of the file or a readable stream to store.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>metadata</parameter>
-     </term>
-     <listitem>
-      <para>
-       Other metadata fields to include in the file document.
-      </para>
-      &mongo.gridfs.store.metadata.note;
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>options</parameter>
-     </term>
-     <listitem>
-      <para>
-       An array of options for the insert operations executed against the
-       <literal>chunks</literal> and <literal>files</literal> collections. See
-       <function>MongoCollection::insert</function> for documentation on these
-       these options.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.gridfs.store.return;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoGridFSException</classname> if there is an error
-   reading <parameter>filename</parameter> or inserting into the
-   <literal>chunks</literal> or <literal>files</literal> collections.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoGridFS::storeFile</function> with additional metadata</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$gridfs = $m->selectDB('test')->getGridFS();
-
-$id = $gridfs->storeFile('example.txt', array('contentType' => 'plain/text'));
-$gridfsFile = $gridfs->get($id);
-
-var_dump($gridfsFile->file);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(7) {
-  ["_id"]=>
-  object(MongoId)#6 (0) {
-  }
-  ["contentType"]=>
-  string(10) "plain/text"
-  ["filename"]=>
-  string(11) "example.txt"
-  ["uploadDate"]=>
-  object(MongoDate)#7 (0) {
-  }
-  ["length"]=>
-  int(26)
-  ["chunkSize"]=>
-  int(262144)
-  ["md5"]=>
-  string(32) "c3fcd3d76192e4007dfb496cca67e13b"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoGridFS::put</function></member>
-   <member><function>MongoGridFS::storeBytes</function></member>
-   <member><function>MongoGridFS::storeUpload</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.docs.gridfs;">GridFS</link></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfs/storeupload.xml b/reference/mongo/mongogridfs/storeupload.xml
deleted file mode 100644
index ac9c141f35..0000000000
--- a/reference/mongo/mongogridfs/storeupload.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfs.storeupload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFS::storeUpload</refname>
-  <refpurpose>Stores an uploaded file in the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoGridFS::storeUpload</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>metadata</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>name</parameter>
-     </term>
-     <listitem>
-      <para>
-       The name of the uploaded file(s) to store. This should correspond to the
-       file field's <literal>name</literal> attribute in the HTML form.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>metadata</parameter>
-     </term>
-     <listitem>
-      <para>
-       Other metadata fields to include in the file document.
-      </para>
-      &mongo.gridfs.store.metadata.note;
-      <note>
-       <para>
-        The <literal>filename</literal> field will be populated with the
-        client's filename (e.g. <literal>$_FILES['foo']['name']</literal>).
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongo.gridfs.store.return;
-  <note>
-   <para>
-    If <link linkend="features.file-upload.multiple">multiple files are uploaded
-    using the same field name</link>, this method will not return anything;
-    however, the files themselves will still be processed.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>MongoGridFSException</classname> if there is an error
-   reading the uploaded file(s) or inserting into the <literal>chunks</literal>
-   or <literal>files</literal> collections.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.5</entry>
-       <entry>
-        Changed second parameter to an array of metadata. Pre-1.2.5, the
-        second parameter was an optional string overriding the filename.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoGridFS::storeUpload</function> HTML form example</title>
-   <para>
-    Suppose you have the following HTML form:
-   </para>
-   <programlisting role="html">
-<![CDATA[
-<form method="POST" enctype="multipart/form-data">
-    <label for="username">Username:</label>
-    <input type="text" name="username" id="username" />
-
-    <label for="pic">Please upload a profile picture:</label>
-    <input type="file" name="pic" id="pic" />
-
-    <input type="submit" />
-</form>
-]]>
-   </programlisting>
-   <para>
-    If you wanted to store the uploaded image in MongoDB, you could do the
-    following in the script handling the form submission:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient();
-$gridfs = $m->selectDB('test')->getGridFS();
-
-$gridfs->storeUpload('pic', array('username' => $_POST['username']));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoGridFS::put</function></member>
-   <member><function>MongoGridFS::storeBytes</function></member>
-   <member><function>MongoGridFS::storeFile</function></member>
-   <member>MongoDB core docs on <link xlink:href="&url.mongodb.docs.gridfs;">GridFS</link></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfscursor.xml b/reference/mongo/mongogridfscursor.xml
deleted file mode 100644
index 0d042738f6..0000000000
--- a/reference/mongo/mongogridfscursor.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongogridfscursor" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoGridFSCursor class</title>
- <titleabbrev>MongoGridFSCursor</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoGridfsCursor intro -->
-  <section xml:id="mongogridfscursor.intro">
-   &reftitle.intro;
-   <para>
-    Cursor for database file results.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongogridfscursor.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoGridFSCursor</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoCursor</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>MongoGridFS</type>
-     <varname>gridfs</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongogridfscursor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongogridfscursor;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfscursor/construct.xml b/reference/mongo/mongogridfscursor/construct.xml
deleted file mode 100644
index e76df22af6..0000000000
--- a/reference/mongo/mongogridfscursor/construct.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfscursor.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSCursor::__construct</refname>
-  <refpurpose>Create a new cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoGridFSCursor::__construct</methodname>
-   <methodparam><type>MongoGridFS</type><parameter>gridfs</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ns</parameter></methodparam>
-   <methodparam><type>array</type><parameter>query</parameter></methodparam>
-   <methodparam><type>array</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>gridfs</parameter>
-     </term>
-     <listitem>
-      <para>
-       Related GridFS collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>connection</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database connection.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>ns</parameter>
-     </term>
-     <listitem>
-      <para>
-       Full name of database and collection.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>query</parameter>
-     </term>
-     <listitem>
-      <para>
-       Database query.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>fields</parameter>
-     </term>
-     <listitem>
-      <para>
-       Fields to return.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the new cursor.
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfscursor/current.xml b/reference/mongo/mongogridfscursor/current.xml
deleted file mode 100644
index 42a3dfd072..0000000000
--- a/reference/mongo/mongogridfscursor/current.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfscursor.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSCursor::current</refname>
-  <refpurpose>Returns the current file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoGridFSFile</type><methodname>MongoGridFSCursor::current</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   The current file.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfscursor/getnext.xml b/reference/mongo/mongogridfscursor/getnext.xml
deleted file mode 100644
index fb143feca1..0000000000
--- a/reference/mongo/mongogridfscursor/getnext.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfscursor.getnext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSCursor::getNext</refname>
-  <refpurpose>Return the next file to which this cursor points, and advance the cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>MongoGridFSFile</type><methodname>MongoGridFSCursor::getNext</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the next file.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfscursor/key.xml b/reference/mongo/mongogridfscursor/key.xml
deleted file mode 100644
index cd771497e0..0000000000
--- a/reference/mongo/mongogridfscursor/key.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfscursor.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSCursor::key</refname>
-  <refpurpose>Returns the current result&apos;s filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoGridFSCursor::key</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   The current result&apos;s _id as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.3.0</entry>
-       <entry>
-        The document's <literal>_id</literal> is returned as a string value,
-        since the key should be unique. Pre-1.3.0, <literal>filename</literal>
-        was returned.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfsexception.xml b/reference/mongo/mongogridfsexception.xml
deleted file mode 100644
index 5e98736c1c..0000000000
--- a/reference/mongo/mongogridfsexception.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mongogridfsexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoGridFSException class</title>
- <titleabbrev>MongoGridFSException</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ Mongogridfsexception intro -->
-  <section xml:id="mongogridfsexception.intro">
-   &reftitle.intro;
-   <para>
-    Thrown when there are errors reading or writing files
-    to or from the database.
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongogridfsexception.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoGridFSException</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoGridFSException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-    
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongogridfsexception.error-codes">
-  <title>Error codes</title>
-  <para>
-   <table>
-    <title><classname>MongoGridFSException</classname> error codes</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry>Code</entry>
-       <entry>Message</entry>
-       <entry>Reason</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>3</entry>
-       <entry>Could not open file <varname>$filename</varname></entry>
-       <entry>Attempting to store an invalid file, such as directory</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>File <varname>$filename</varname> is too large: <varname>$filesize</varname> bytes</entry>
-       <entry>Maximum filesize in GridFS is 4GB</entry>
-      </row>
-      <row>
-       <entry>5</entry>
-       <entry>could not find filehandle</entry>
-       <entry>Resource doesn't have a filehandle</entry>
-      </row>
-      <row>
-       <entry>6</entry>
-       <entry>no file is associate with this filehandle</entry>
-       <entry>Resource isn't a file resource</entry>
-      </row>
-      <row>
-       <entry>7</entry>
-       <entry>error setting up file: <varname>$filename</varname>s</entry>
-       <entry>Could not open file for reading</entry>
-      </row>
-      <row>
-       <entry>9</entry>
-       <entry>error reading file <varname>$filename</varname>s</entry>
-       <entry>Failed reading file</entry>
-      </row>
-      <row>
-       <entry>10</entry>
-       <entry>error reading filehandle</entry>
-       <entry>Failed reading from a resource</entry>
-      </row>
-      <row>
-       <entry>11</entry>
-       <entry>could not find uploaded file %s</entry>
-       <entry>Filename doesn't seem to be uploaded file</entry>
-      </row>
-      <row>
-       <entry>12</entry>
-       <entry>Couldn't find tmp_name in the $_FILES array. Are you sure the upload worked?</entry>
-       <entry>Uploaded filename probably failed</entry>
-      </row>
-      <row>
-       <entry>13</entry>
-       <entry>tmp_name was not a string or an array</entry>
-       <entry>Invalid filename given</entry>
-      </row>
-      <row>
-       <entry>14</entry>
-       <entry>couldn't find file size</entry>
-       <entry>The <varname>length</varname> property is missing</entry>
-      </row>
-      <row>
-       <entry>15</entry>
-       <entry>Cannot find filename</entry>
-       <entry>No filename provided, and no <varname>filename</varname> property set</entry>
-      </row>
-      <row>
-       <entry>16</entry>
-       <entry>could not open destination file %s</entry>
-       <entry>Destination filename not writable</entry>
-      </row>
-      <row>
-       <entry>17</entry>
-       <entry>error reading chunk of file</entry>
-       <entry>Chunk corruption</entry>
-      </row>
-      <row>
-       <entry>18</entry>
-       <entry>couldn't create a php_stream</entry>
-       <entry>Couldn't create a stream resource</entry>
-      </row>
-      <row>
-       <entry>19</entry>
-       <entry>couldn't find <varname>property</varname></entry>
-       <entry>Chunk corruption</entry>
-      </row>
-      <row>
-       <entry>20</entry>
-       <entry>chunk <varname>number</varname> has wrong size (<varname>size</varname>) when the max is <varname>maxchunksize</varname></entry>
-       <entry>Chunk larger then expected</entry>
-      </row>
-      <row>
-       <entry>21</entry>
-       <entry>chunk has wrong format</entry>
-       <entry>Chunk corruption</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-   </para>
-  </section>
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfsfile.xml b/reference/mongo/mongogridfsfile.xml
deleted file mode 100644
index 76c6671656..0000000000
--- a/reference/mongo/mongogridfsfile.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongogridfsfile" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoGridFSFile class</title>
- <titleabbrev>MongoGridFSFile</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoGridfsFile intro -->
-  <section xml:id="mongogridfsfile.intro">
-   &reftitle.intro;
-   <para>
-    A database file object.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongogridfsfile.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoGridFSFile</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoGridFSFile</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>array</type>
-     <varname>file</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>MongoGridFS</type>
-     <varname>gridfs</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongogridfsfile')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongogridfsfile;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongogridfsfile/construct.xml b/reference/mongo/mongogridfsfile/construct.xml
deleted file mode 100644
index 2aa25ef7ff..0000000000
--- a/reference/mongo/mongogridfsfile/construct.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfsfile.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridfsFile::__construct</refname>
-  <refpurpose>Create a new GridFS file</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoGridfsFile::__construct</methodname>
-   <methodparam><type>MongoGridFS</type><parameter>gridfs</parameter></methodparam>
-   <methodparam><type>array</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;    
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>gridfs</parameter>
-     </term>
-     <listitem>
-      <para>
-       The parent MongoGridFS instance.
-      </para>
-     </listitem>
-    </varlistentry>   
-    <varlistentry>
-     <term>
-      <parameter>file</parameter>
-     </term>
-     <listitem>
-      <para>
-       A file from the database.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new MongoGridFSFile.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfsfile/getbytes.xml b/reference/mongo/mongogridfsfile/getbytes.xml
deleted file mode 100644
index c7d60e7c1c..0000000000
--- a/reference/mongo/mongogridfsfile/getbytes.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfsfile.getbytes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSFile::getBytes</refname>
-  <refpurpose>Returns this file&apos;s contents as a string of bytes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoGridFSFile::getBytes</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Warning: this will load the file into memory.  If the file is bigger than
-   your memory, this will cause problems!
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns a string of the bytes in the file.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoGridFSFile::getBytes</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$images = $db->my_db->getGridFS('images');
-
-$image = $images->findOne('jwage.png');
-
-header('Content-type: image/png;');
-echo $image->getBytes();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfsfile/getfilename.xml b/reference/mongo/mongogridfsfile/getfilename.xml
deleted file mode 100644
index aabb9a7e6a..0000000000
--- a/reference/mongo/mongogridfsfile/getfilename.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfsfile.getfilename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSFile::getFilename</refname>
-  <refpurpose>Returns this file&apos;s filename</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoGridFSFile::getFilename</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns the filename.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfsfile/getresource.xml b/reference/mongo/mongogridfsfile/getresource.xml
deleted file mode 100644
index 03fc84d992..0000000000
--- a/reference/mongo/mongogridfsfile/getresource.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfsfile.getresource" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSFile::getResource</refname>
-  <refpurpose>Returns a resource that can be used to read the stored file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>resource</type><methodname>MongoGridFSFile::getResource</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This method returns a stream resource that can be used with all file
-   functions in PHP that deal with reading files. The contents of the file are
-   pulled out of MongoDB on the fly, so that the whole file does not have to
-   be loaded into memory first.
-  </para>
-  <para>
-   At most two GridFSFile chunks will be loaded in memory.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns a resource that can be used to read the file with
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoGridFSFile::getResource</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Mongo;
-$images = $m->my_db->getGridFS('images');
-
-$image = $images->findOne('mongo.png');
-
-header('Content-type: image/png;');
-$stream = $image->getResource();
-
-while (!feof($stream)) {
-    echo fread($stream, 8192);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfsfile/getsize.xml b/reference/mongo/mongogridfsfile/getsize.xml
deleted file mode 100644
index eeeb93c87a..0000000000
--- a/reference/mongo/mongogridfsfile/getsize.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfsfile.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSFile::getSize</refname>
-  <refpurpose>Returns this file&apos;s size</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoGridFSFile::getSize</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;  
-  <para>
-   Returns this file's size
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongogridfsfile/write.xml b/reference/mongo/mongogridfsfile/write.xml
deleted file mode 100644
index 59a78fff90..0000000000
--- a/reference/mongo/mongogridfsfile/write.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongogridfsfile.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoGridFSFile::write</refname>
-  <refpurpose>Writes this file to the filesystem</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoGridFSFile::write</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>filename</parameter>
-     </term>
-     <listitem>
-      <para>
-       The location to which to write the file.  If none is given,
-       the stored filename will be used.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of bytes written.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoGridFSFile::write</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$images = $db->my_db->getGridFS('images');
-
-$image = $images->findOne('jwage.png');
-$image->write('/path/to/write/jwage.png');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
---> 
diff --git a/reference/mongo/mongoid.xml b/reference/mongo/mongoid.xml
deleted file mode 100644
index f9063e704d..0000000000
--- a/reference/mongo/mongoid.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoid" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoId class</title>
- <titleabbrev>MongoId</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\ObjectId</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoId intro -->
-  <section xml:id="mongoid.intro">
-   &reftitle.intro;
-   <para>
-    A unique identifier created for database objects.  If an object is inserted
-    into the database without an _id field, an _id field will be added to it
-    with a <classname>MongoId</classname> instance as its value.  If the data 
-    has a naturally occuring unique field (e.g. username or timestamp) it is
-    fine to use this as the _id field instead, and it will not be replaced with 
-    a <classname>MongoId</classname>.
-   </para>
-   <para>
-    Instances of the <classname>MongoId</classname> class fulfill the role that 
-    autoincrementing does in a relational database: to provide a unique key if 
-    the data does not naturally have one. Autoincrementing does not work well 
-    with a sharded database, as it is difficult to determine the next number in
-    the sequence. This class fulfills the constraints of quickly generating a
-    value that is unique across shards.
-   </para>
-   <para>
-    Each MongoId is 12 bytes (making its string form 24 hexadecimal characters).
-    The first four bytes are a timestamp, the next three are a hash of the
-    client machine's hostname, the next two are the two least significant bytes
-    of the process id running the script, and the last three bytes are an
-    incrementing value.
-   </para>
-   <para>
-    <classname>MongoId</classname>s are serializable/unserializable.  Their
-    serialized form is similar to their string form:
-    <screen>
-<![CDATA[
-C:7:"MongoId":24:{4af9f23d8ead0e1d32000000}
-]]>
-    </screen>
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoid.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoId</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoId</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="mongoid.props.id">$id</varname>
-     <initializer>&null;</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoid')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   <title>Fields</title>
-   <variablelist>
-    <varlistentry xml:id="mongoid.props.id">
-     <term><varname>$id</varname></term>
-     <listitem>
-      <simpara>
-       This field contains the string representation of this object.
-      </simpara>
-      <note>
-        <simpara>
-          The property name begins with a <literal>$</literal> character. It may
-          be accessed using
-          <link linkend="language.types.string.parsing.complex">complex variable
-          parsed syntax</link> (e.g. <literal>$mongoId->{'$id'}</literal>).
-        </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
-  <section>
-   &reftitle.seealso;
-   <para>
-    MongoDB core docs on <link xlink:href="&url.mongodb.dochub.objectids;">ObjectIds</link>.
-   </para>
-  </section>
- </partintro>
-
- &reference.mongo.entities.mongoid;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/construct.xml b/reference/mongo/mongoid/construct.xml
deleted file mode 100644
index 20119df51b..0000000000
--- a/reference/mongo/mongoid/construct.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::__construct</refname>
-  <refpurpose>Creates a new id</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\ObjectId::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoId::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>MongoId</type></type><parameter>id</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>id</parameter>
-     </term>
-     <listitem>
-      <para>
-       A string (must be 24 hexadecimal characters) or a
-       <classname>MongoId</classname> instance.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new id.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongo 1.4.0</entry>
-      <entry>
-       An exception is thrown when passed invalid string
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoId::__construct</function> example</title>
-   <para>
-    This example shows how to create a new id. This is seldom necessary, as the 
-    driver adds an id to arrays automatically before storing them in the 
-    database.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-  $id1 = new MongoId();
-  echo "$id1\n";
-
-  $id2 = new MongoId();
-  echo "$id2\n";
-
-  ?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-49a7011a05c677b9a916612a
-49a702d5450046d3d515d10d
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Parameter example</title>
-   <para>This example shows how to use a string parameter to initialize a MongoId with a given value.</para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-  $id1 = new MongoId();
-
-  // create a new id from $id1
-  $id2 = new MongoId("$id1");
-
-  // show that $id1 and $id2 have the same hexidecimal value
-  var_dump($id1 == $id2);
-  ?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoId::__toString</methodname></member>
-    <member><methodname>MongoId::isvalid</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/gethostname.xml b/reference/mongo/mongoid/gethostname.xml
deleted file mode 100644
index 9ed00fac61..0000000000
--- a/reference/mongo/mongoid/gethostname.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.gethostname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::getHostname</refname>
-  <refpurpose>Gets the hostname being used for this machine's ids</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>MongoId::getHostname</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This returns the hostname <classname>MongoId</classname> is using to 
-   generate unique ids.  This should be the same value 
-   <function>gethostname</function> returns.
-  </para>
-  <para>
-   It is identical to the function:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-public static function getHostname() {
-    return gethostname();
-}
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the hostname.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/getinc.xml b/reference/mongo/mongoid/getinc.xml
deleted file mode 100644
index e3d2a2472e..0000000000
--- a/reference/mongo/mongoid/getinc.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.getinc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::getInc</refname>
-  <refpurpose>Gets the incremented value to create this id</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoId::getInc</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the incremented value used to create this <classname>MongoId</classname>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/getpid.xml b/reference/mongo/mongoid/getpid.xml
deleted file mode 100644
index 295ccd1010..0000000000
--- a/reference/mongo/mongoid/getpid.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.getpid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::getPID</refname>
-  <refpurpose>Gets the process ID</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoId::getPID</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Extracts the pid from the Mongo ID
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the PID of the <classname>MongoId</classname>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/gettimestamp.xml b/reference/mongo/mongoid/gettimestamp.xml
deleted file mode 100644
index 1c2f55345b..0000000000
--- a/reference/mongo/mongoid/gettimestamp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.gettimestamp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::getTimestamp</refname>
-  <refpurpose>Gets the number of seconds since the epoch that this id was created</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoId::getTimestamp</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This returns the same thing as running <function>time</function> when the id is created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of seconds since the epoch that this id was created.  There are only 
-   four bytes of timestamp stored, so <classname>MongoDate</classname> is a better choice 
-   for storing exact or wide-ranging times.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/isvalid.xml b/reference/mongo/mongoid/isvalid.xml
deleted file mode 100644
index 800831b627..0000000000
--- a/reference/mongo/mongoid/isvalid.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.isvalid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::isValid</refname>
-  <refpurpose>Check if a value is a valid ObjectId</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>MongoId::isValid</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method may be used to check a variable before passing it as an argument
-   to <function>MongoId::__construct</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>value</parameter>
-     </term>
-     <listitem>
-      <para>
-       The value to check for validity.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if <parameter>value</parameter> is a
-   <classname>MongoId</classname> instance or a string consisting of exactly 24
-   hexadecimal characters; otherwise, &false; is returned.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/set-state.xml b/reference/mongo/mongoid/set-state.xml
deleted file mode 100644
index 9aa7adc673..0000000000
--- a/reference/mongo/mongoid/set-state.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.set-state" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::__set_state</refname>
-  <refpurpose>Create a dummy MongoId</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.method.note;
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>MongoId</type><methodname>MongoId::__set_state</methodname>
-   <methodparam><type>array</type><parameter>props</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is only used by PHP internally, it shouldn't need to ever be
-   called by the user.
-  </para>
-  <para>
-   It is identical to the function:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-public static function __set_state($props) {
-    return new MongoId("000000000000000000000000");
-}
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>props</parameter>
-     </term>
-     <listitem>
-      <para>
-       Theoretically, an array of properties used to create the new id.  
-       However, as MongoId instances have no properties, this is not used.
-      </para>
-     </listitem>
-    </varlistentry>   
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A new id with the value "000000000000000000000000".
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoid/tostring.xml b/reference/mongo/mongoid/tostring.xml
deleted file mode 100644
index 8586167c43..0000000000
--- a/reference/mongo/mongoid/tostring.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoid.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoId::__toString</refname>
-  <refpurpose>Returns a hexidecimal representation of this id</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\ObjectId::__toString</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoId::__toString</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This id.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoId::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient();
-$collection = $m->selectDB("foo")->selectCollection("bar");
-
-$collection->insert(array( "x" => "y" ));
-$collection->insert(array( "x" => "y" ));
-
-$cursor = $collection->find();
-$r1 = $cursor->next();
-$r2 = $cursor->next();
-
-echo $r1["_id"] . "\n";
-echo $r2["_id"] . "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-49a7011a05c677b9a916612a
-49a702d5450046d3d515d10d
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoinsertbatch.xml b/reference/mongo/mongoinsertbatch.xml
deleted file mode 100644
index 80f43e4bfa..0000000000
--- a/reference/mongo/mongoinsertbatch.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoinsertbatch" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoInsertBatch class</title>
- <titleabbrev>MongoInsertBatch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoInsertBatch intro -->
-  <section xml:id="mongoinsertbatch.intro">
-   &reftitle.intro;
-   <para>
-    Constructs a batch of INSERT operations. See <classname>MongoWriteBatch</classname>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoinsertbatch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoInsertBatch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoInsertBatch</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoWriteBatch</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoinsertbatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongowritebatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongoinsertbatch;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoinsertbatch/construct.xml b/reference/mongo/mongoinsertbatch/construct.xml
deleted file mode 100644
index 589879c7e7..0000000000
--- a/reference/mongo/mongoinsertbatch/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoinsertbatch.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoInsertBatch::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoInsertBatch::__construct</methodname>
-   <methodparam><type>MongoCollection</type><parameter>collection</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>write_options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a batch of INSERT operations. See <classname>MongoWriteBatch</classname>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection</parameter></term>
-    &mongo.mongowritebatch.collection.description;
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_options</parameter></term>
-    &mongo.mongowritebatch.writeoptions.description;
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A new MongoInsertBatch.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoint32.xml b/reference/mongo/mongoint32.xml
deleted file mode 100644
index 59c48ee2e0..0000000000
--- a/reference/mongo/mongoint32.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoint32" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoInt32 class</title>
- <titleabbrev>MongoInt32</titleabbrev>
-
- <partintro>
-  <warning>
-   &mongo.noalternative.class.note;
-   <para>
-    Instead, the new extension chooses the appropriate database type depending
-    on the integer's value.
-   </para>
-  </warning>
-
-<!-- {{{ MongoInt32 intro -->
-  <section xml:id="mongoint32.intro">
-   &reftitle.intro;
-   <para>
-    The class can be used to save 32-bit integers to the database on a 64-bit 
-    system.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoint32.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoInt32</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoInt32</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="mongoint32.props.value">value</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoint32')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   <title>Fields</title>
-   <variablelist>
-    <varlistentry xml:id="mongoint32.props.value">
-     <term><varname>value</varname></term>
-     <listitem>
-      <simpara>
-       This is the string value of the 32-bit number.  For instance, 123's value
-       would be "123".
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongoint32;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoint32/construct.xml b/reference/mongo/mongoint32/construct.xml
deleted file mode 100644
index 51ae05859d..0000000000
--- a/reference/mongo/mongoint32/construct.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoint32.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoInt32::__construct</refname>
-  <refpurpose>Creates a new 32-bit integer</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    Instead, the new extension chooses the appropriate database type depending
-    on the integer's value.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoInt32::__construct</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new 32-bit number with the given value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>value</parameter>
-     </term>
-     <listitem>
-      <para>
-       A number.
-      </para>
-     </listitem>
-    </varlistentry>     
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new integer.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoint32/tostring.xml b/reference/mongo/mongoint32/tostring.xml
deleted file mode 100644
index 80526e7803..0000000000
--- a/reference/mongo/mongoint32/tostring.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoint32.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoInt32::__toString</refname>
-  <refpurpose>Returns the string representation of this 32-bit integer</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    Instead, the new extension chooses the appropriate database type depending
-    on the integer's value.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoInt32::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the string representation of this integer.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoint64.xml b/reference/mongo/mongoint64.xml
deleted file mode 100644
index 33a1cb38fa..0000000000
--- a/reference/mongo/mongoint64.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoint64" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoInt64 class</title>
- <titleabbrev>MongoInt64</titleabbrev>
-
- <partintro>
-  <warning>
-   &mongo.noalternative.class.note;
-   <para>
-    Instead, the new extension chooses the appropriate database type depending
-    on the integer's value.
-   </para>
-  </warning>
-
-<!-- {{{ MongoInt64 intro -->
-  <section xml:id="mongoint64.intro">
-   &reftitle.intro;
-   <para>
-    The class can be used to save 64-bit integers to the database on a 32-bit 
-    system.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoint64.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoInt64</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoInt64</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="mongoint64.props.value">value</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoint64')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   <title>Fields</title>
-   <variablelist>
-    <varlistentry xml:id="mongoint64.props.value">
-     <term><varname>value</varname></term>
-     <listitem>
-      <simpara>
-       This is the string value of the 64-bit number.  For instance, 123's value
-       would be "123".
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongoint64;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoint64/construct.xml b/reference/mongo/mongoint64/construct.xml
deleted file mode 100644
index ab6b217be2..0000000000
--- a/reference/mongo/mongoint64/construct.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoint64.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoInt64::__construct</refname>
-  <refpurpose>Creates a new 64-bit integer</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    Instead, the new extension chooses the appropriate database type depending
-    on the integer's value.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoInt64::__construct</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new 64-bit number with the given value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>value</parameter>
-     </term>
-     <listitem>
-      <para>
-       A number.
-      </para>
-     </listitem>
-    </varlistentry>     
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new integer.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoint64/tostring.xml b/reference/mongo/mongoint64/tostring.xml
deleted file mode 100644
index 6d9f46a34e..0000000000
--- a/reference/mongo/mongoint64/tostring.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoint64.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoInt64::__toString</refname>
-  <refpurpose>Returns the string representation of this 64-bit integer</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.noalternative.class.note;
-   <para>
-    Instead, the new extension chooses the appropriate database type depending
-    on the integer's value.
-   </para>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoInt64::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the string representation of this integer.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog.xml b/reference/mongo/mongolog.xml
deleted file mode 100644
index f3fca9c7fb..0000000000
--- a/reference/mongo/mongolog.xml
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongolog" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoLog class</title>
- <titleabbrev>MongoLog</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoLog intro -->
-  <section xml:id="mongolog.intro">
-   &reftitle.intro;
-   <para>
-    Logging can be used to get detailed information about what the driver is
-    doing. Logging is disabled by default, but this class allows you to activate
-    specific levels of logging for various parts of the driver. Some examples:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// print every log message possible
-MongoLog::setLevel(MongoLog::ALL); // all log levels
-MongoLog::setModule(MongoLog::ALL); // all parts of the driver
-
-// print significant events about replica set failover
-MongoLog::setLevel(MongoLog::INFO);
-MongoLog::setModule(MongoLog::RS);
-
-// print info- and diagnostic-level events for replica sets and connections
-MongoLog::setLevel(MongoLog::INFO|MongoLog::FINE);
-MongoLog::setModule(MongoLog::RS|MongoLog::CON);
-
-?>
-]]>
-   </programlisting>
-   <note>
-    <para>
-     By default, MongoLog emits all log messages as PHP notices. Depending
-     on the <acronym>SAPI</acronym> you use, messages may be sent to
-     <literal>stderr</literal> (for <acronym>CLI</acronym>) or the web server's
-     error log. If, after configuring MongoLog, log messages are not appearing
-     as expected, ensure that the <constant>E_NOTICE</constant> bit is included
-     in <link linkend="ini.error-reporting">error_reporting</link> and that
-     <link linkend="ini.display-errors">display_errors</link> is on.
-    </para>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongolog.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoLog</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoLog</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.none">MongoLog::NONE</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.all">MongoLog::ALL</varname>
-     <initializer>31</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="levels">level constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.warning">MongoLog::WARNING</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.info">MongoLog::INFO</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.fine">MongoLog::FINE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="levels">module constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.rs">MongoLog::RS</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.pool">MongoLog::POOL</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.con">MongoLog::CON</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.io">MongoLog::IO</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.server">MongoLog::SERVER</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongolog.constants.parse">MongoLog::PARSE</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <modifier>static</modifier>
-     <type>int</type>
-     <varname>callback</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <modifier>static</modifier>
-     <type>int</type>
-     <varname>level</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <modifier>static</modifier>
-     <type>int</type>
-     <varname>module</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongolog')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section>
-   &reftitle.constants;
-   <section xml:id="mongolog.constants.types">
-    <title>MongoLog Constants</title>
-    <para>
-     These constants can be used by both
-     <function>MongoLog::setLevel</function> and
-     <function>MongoLog::setModule</function>.
-    </para>
-
-    <variablelist>
-     <varlistentry xml:id="mongolog.constants.none">
-      <term><constant>MongoLog::NONE</constant></term>
-      <listitem>
-       <simpara>
-        Log nothing.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.all">
-      <term><constant>MongoLog::ALL</constant></term>
-      <listitem>
-       <simpara>
-        Log everything.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-
-   <section xml:id="mongolog.constants.level">
-    <title>MongoLog Level Constants</title>
-    <para>
-     These constants can be used by <function>MongoLog::setLevel</function>.
-    </para>
-    <variablelist>
-     <varlistentry xml:id="mongolog.constants.warning">
-      <term><constant>MongoLog::WARNING</constant></term>
-      <listitem>
-       <simpara>
-        Log events that are somewhat exceptional, but not quite worthy of an
-        actual exception (e.g. recoverable connection errors).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.info">
-      <term><constant>MongoLog::INFO</constant></term>
-      <listitem>
-       <simpara>
-        Log events that may be of interest to administrators, but are not
-        particularly noteworthy (e.g. option parsing, authentication steps).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.fine">
-      <term><constant>MongoLog::FINE</constant></term>
-      <listitem>
-       <simpara>
-        Log most events that the driver performs (e.g. server selection, socket
-        communication). Depending on the module being logged, this can be
-        extremely noisy and is primarily useful for debugging.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-
-   <section xml:id="mongolog.constants.module">
-    <title>MongoLog Module Constants</title>
-    <para>
-     These constants can be used by <function>MongoLog::setModule</function>.
-    </para>
-    <variablelist>
-     <varlistentry xml:id="mongolog.constants.con">
-      <term><constant>MongoLog::CON</constant></term>
-      <listitem>
-       <simpara>
-        Log connection activity. Creating new connections, authentication,
-        pinging, timeouts, etc.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.io">
-      <term><constant>MongoLog::IO</constant></term>
-      <listitem>
-       <simpara>
-        Log traffic to/from the database. Unless your program is trivial, this
-        will create an enormous number of log messages.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.parse">
-      <term><constant>MongoLog::PARSE</constant></term>
-      <listitem>
-       <simpara>
-        Log parsing of the connection string and options when constructing
-        <classname>MongoClient</classname>.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.pool">
-      <term><constant>MongoLog::POOL</constant></term>
-      <listitem>
-       <simpara>
-        Previously used to log connection pool activity. This option is now a
-        deprecated alias of <constant>MongoLog::RS</constant>.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.rs">
-      <term><constant>MongoLog::RS</constant></term>
-      <listitem>
-       <simpara>
-        Log replica set activity. Failovers, read preference selection, etc.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="mongolog.constants.server">
-      <term><constant>MongoLog::SERVER</constant></term>
-      <listitem>
-       <simpara>
-        Previously used to log server status changes. This option is deprecated
-        in favor of <constant>MongoLog::RS</constant>.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>PECL mongo 1.3.0</entry>
-        <entry>
-         Added <constant>MongoLog::CON</constant> and deprecated
-         <constant>MongoLog::POOL</constant> and
-         <constant>MongoLog::SERVER</constant>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongolog;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog/getcallback.xml b/reference/mongo/mongolog/getcallback.xml
deleted file mode 100644
index 2f937691b0..0000000000
--- a/reference/mongo/mongolog/getcallback.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongolog.getcallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoLog::getCallback</refname>
-  <refpurpose>Gets the previously set callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>callable</type><methodname>MongoLog::getCallback</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the callback function.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the callback function, or &false; if not set yet.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <para>
-    This function is only available with PHP 5.3.0 and later.
-   </para>
-  </caution>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog/getlevel.xml b/reference/mongo/mongolog/getlevel.xml
deleted file mode 100644
index 58ff883188..0000000000
--- a/reference/mongo/mongolog/getlevel.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongolog.getlevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoLog::getLevel</refname>
-  <refpurpose>Gets the level(s) currently being logged</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>MongoLog::getLevel</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This function can be used to see which log levels are currently enabled.
-   The returned integer may be compared with the
-   <link linkend="mongolog.constants.level">MongoLog level constants</link>
-   using bitwise operators to check for specific log levels.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-if (MongoLog::getLevel() & MongoLog::FINE) {
-    echo "lots of logs\n";
-}
-
-if (MongoLog::getLevel() ^ MongoLog::NONE) {
-    echo "logging, at least a little\n";
-}
-
-if (MongoLog::getLevel() == MongoLog::ALL) {
-    echo "logging at the highest levels\n";
-}
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the level(s) currently being logged.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog/getmodule.xml b/reference/mongo/mongolog/getmodule.xml
deleted file mode 100644
index 03038091ab..0000000000
--- a/reference/mongo/mongolog/getmodule.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongolog.getmodule" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoLog::getModule</refname>
-  <refpurpose>Gets the module(s) currently being logged</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>MongoLog::getModule</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   This function can be used to see which driver modules are currently being
-   logged. The returned integer may be compared with the
-   <link linkend="mongolog.constants.module">MongoLog module constants</link>
-   using bitwise operators to check if specific modules are being logged.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-if (MongoLog::getModule() & MongoLog::RS) {
-    echo "logging replica sets\n";
-}
-
-if (MongoLog::getModule() ^ MongoLog::NONE) {
-    echo "logging something\n";
-}
-
-if ((MongoLog::getModule() & MongoLog::IO) == 0) {
-    echo "not logging io\n";
-}
-
-?>
-]]>
-  </programlisting>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the module(s) currently being logged.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog/setcallback.xml b/reference/mongo/mongolog/setcallback.xml
deleted file mode 100644
index 62077cfbd6..0000000000
--- a/reference/mongo/mongolog/setcallback.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongolog.setcallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoLog::setCallback</refname>
-  <refpurpose>Sets a callback function to be invoked for events</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>MongoLog::setCallback</methodname>
-   <methodparam><type>callable</type><parameter>log_function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function will set a callback function to be invoked for events in lieu
-   of emitting of PHP notice.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>log_function</parameter></term>
-     <listitem>
-      <para>
-       The callback function to be invoked on events. It should have the following prototype:
-      </para>
-      <para>
-       <methodsynopsis>
-        <methodname><replaceable>log_function</replaceable></methodname>
-        <methodparam><type>int</type><parameter>module</parameter></methodparam>
-        <methodparam><type>int</type><parameter>level</parameter></methodparam>
-        <methodparam><type>string</type><parameter>message</parameter></methodparam>
-       </methodsynopsis>
-       <variablelist>
-        <varlistentry>
-         <term><parameter>module</parameter></term>
-         <listitem>
-          <simpara>
-           One of the <link linkend="mongolog.constants.module">MongoLog
-           module constants</link>.
-          </simpara>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>level</parameter></term>
-         <listitem>
-          <simpara>
-           One of the <link linkend="mongolog.constants.level">MongoLog
-           level constants</link>.
-          </simpara>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>message</parameter></term>
-         <listitem>
-          <simpara>
-           The log message itself.
-          </simpara>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongolog.setcallback.example.basic">
-   <title><methodname>MongoLog::setCallback</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-function module2string($module)
-{
-    switch ($module) {
-        case MongoLog::RS: return "REPLSET";
-        case MongoLog::CON: return "CON";
-        case MongoLog::IO: return "IO";
-        case MongoLog::SERVER: return "SERVER";
-        case MongoLog::PARSE: return "PARSE";
-        default: return "UNKNOWN";
-    }
-}
-
-function level2string($level)
-{
-    switch ($level) {
-        case MongoLog::WARNING: return "WARN";
-        case MongoLog::INFO: return "INFO";
-        case MongoLog::FINE: return "FINE";
-        default: return "UNKNOWN";
-    }
-}
-
-function callback($module, $level, $message)
-{
-    echo date("Y-m-d H:i:s - ");
-    printf("%s (%s): %s\n", module2string($module), level2string($level), $message);
-}
-
-MongoLog::setLevel(MongoLog::ALL);
-MongoLog::setModule(MongoLog::ALL);
-
-// We specify the function name here, but any callable (e.g. anonymous function) will work
-MongoLog::setCallback("callback");
-
-new MongoClient();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-2013-07-09 09:41:42 - PARSE (INFO): Parsing localhost:27017
-2013-07-09 09:41:42 - PARSE (INFO): - Found node: localhost:27017
-2013-07-09 09:41:42 - PARSE (INFO): - Connection type: STANDALONE
-2013-07-09 09:41:42 - CON (INFO): mongo_get_read_write_connection: finding a STANDALONE connection
-2013-07-09 09:41:42 - CON (INFO): connection_create: creating new connection for localhost:27017
-2013-07-09 09:41:42 - CON (INFO): stream_connect: Not establishing SSL for localhost:27017
-2013-07-09 09:41:42 - CON (INFO): get_server_flags: start
-2013-07-09 09:41:42 - CON (FINE): send_packet: read from header: 36
-2013-07-09 09:41:42 - CON (FINE): send_packet: data_size: 95
-2013-07-09 09:41:42 - CON (FINE): get_server_flags: setting maxBsonObjectSize to 16777216
-2013-07-09 09:41:42 - CON (FINE): get_server_flags: setting maxMessageSizeBytes to 48000000
-2013-07-09 09:41:42 - CON (INFO): is_ping: pinging localhost:27017;-;.;1543
-2013-07-09 09:41:42 - CON (FINE): send_packet: read from header: 36
-2013-07-09 09:41:42 - CON (FINE): send_packet: data_size: 17
-2013-07-09 09:41:42 - CON (INFO): is_ping: last pinged at 1373359302; time: 0ms
-2013-07-09 09:41:42 - REPLSET (FINE): finding candidate servers
-2013-07-09 09:41:42 - REPLSET (FINE): - all servers
-2013-07-09 09:41:42 - REPLSET (FINE): filter_connections: adding connections:
-2013-07-09 09:41:42 - REPLSET (FINE): - connection: type: STANDALONE, socket: 42, ping: 0, hash: localhost:27017;-;.;1543
-2013-07-09 09:41:42 - REPLSET (FINE): filter_connections: done
-2013-07-09 09:41:42 - REPLSET (FINE): limiting by seeded/discovered servers
-2013-07-09 09:41:42 - REPLSET (FINE): - connection: type: STANDALONE, socket: 42, ping: 0, hash: localhost:27017;-;.;1543
-2013-07-09 09:41:42 - REPLSET (FINE): limiting by seeded/discovered servers: done
-2013-07-09 09:41:42 - REPLSET (FINE): limiting by credentials
-2013-07-09 09:41:42 - REPLSET (FINE): - connection: type: STANDALONE, socket: 42, ping: 0, hash: localhost:27017;-;.;1543
-2013-07-09 09:41:42 - REPLSET (FINE): limiting by credentials: done
-2013-07-09 09:41:42 - REPLSET (FINE): sorting servers by priority and ping time
-2013-07-09 09:41:42 - REPLSET (FINE): - connection: type: STANDALONE, socket: 42, ping: 0, hash: localhost:27017;-;.;1543
-2013-07-09 09:41:42 - REPLSET (FINE): sorting servers: done
-2013-07-09 09:41:42 - REPLSET (FINE): selecting near servers
-2013-07-09 09:41:42 - REPLSET (FINE): selecting near servers: nearest is 0ms
-2013-07-09 09:41:42 - REPLSET (FINE): - connection: type: STANDALONE, socket: 42, ping: 0, hash: localhost:27017;-;.;1543
-2013-07-09 09:41:42 - REPLSET (FINE): selecting near server: done
-2013-07-09 09:41:42 - REPLSET (INFO): pick server: random element 0
-2013-07-09 09:41:42 - REPLSET (INFO): - connection: type: STANDALONE, socket: 42, ping: 0, hash: localhost:27017;-;.;1543
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <para>
-    This function is only available with PHP 5.3.0 and later.
-   </para>
-  </caution>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog/setlevel.xml b/reference/mongo/mongolog/setlevel.xml
deleted file mode 100644
index b39a305480..0000000000
--- a/reference/mongo/mongolog/setlevel.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongolog.setlevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoLog::setLevel</refname>
-  <refpurpose>Sets the level(s) to be logged</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>MongoLog::setLevel</methodname>
-   <methodparam><type>int</type><parameter>level</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function can be used to control logging verbosity and the types of
-   activities that should be logged. The
-   <link linkend="mongolog.constants.level">MongoLog level constants</link>
-   may be used with bitwise operators to specify multiple levels.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-// first, specify a logging module
-MongoLog::setModule(MongoLog::CON);
-
-// log messages for every level
-MongoLog::setLevel(MongoLog::ALL);
-
-// log warning and info messages only
-MongoLog::setLevel(MongoLog::WARNING|MongoLog::INFO);
-
-// log everything except fine activity
-MongoLog::setLevel(MongoLog::ALL & (~MongoLog::FINE));
-
-?>
-]]>
-  </programlisting>
-  <para>
-   Note that you must also call <function>MongoLog::setModule</function> to
-   specify which modules(s) of the driver should log.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>level</parameter>
-     </term>
-     <listitem>
-      <para>
-       The level(s) you would like to log.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongolog/setmodule.xml b/reference/mongo/mongolog/setmodule.xml
deleted file mode 100644
index 7c687ac5fa..0000000000
--- a/reference/mongo/mongolog/setmodule.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongolog.setmodule" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoLog::setModule</refname>
-  <refpurpose>Sets the module(s) to be logged</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>MongoLog::setModule</methodname>
-   <methodparam><type>int</type><parameter>module</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function can be used to set which driver modules should be logged. The
-   <link linkend="mongolog.constants.module">MongoLog module constants</link>
-   may be used with bitwise operators to specify multiple modules.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-// first, specify a logging level
-MongoLog::setLevel(MongoLog::ALL);
-
-// log replica set activity
-MongoLog::setModule(MongoLog::RS);
-
-// log replica sets and connection activity
-MongoLog::setModule(MongoLog::RS|MongoLog::CON);
-
-// log everything except IO activity
-MongoLog::setModule(MongoLog::ALL & (~MongoLog::IO));
-
-?>
-]]>
-  </programlisting>
-  <para>
-   Note that you must also call <function>MongoLog::setLevel</function> to
-   enable logging.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>module</parameter>
-     </term>
-     <listitem>
-      <para>
-       The module(s) you would like to log.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongomaxkey.xml b/reference/mongo/mongomaxkey.xml
deleted file mode 100644
index 3ec42afbf1..0000000000
--- a/reference/mongo/mongomaxkey.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongomaxkey" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoMaxKey class</title>
- <titleabbrev>MongoMaxKey</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\MaxKey</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoBinData intro -->
-  <section xml:id="mongomaxkey.intro">
-   &reftitle.intro;
-   <para>
-    <classname>MongoMaxKey</classname> is an special type used by the database
-    that compares greater than all other possible BSON values. Thus, if a query
-    is sorted by a given field in ascending order, any document with a 
-    <classname>MongoMaxKey</classname> as its value will be returned last.
-   </para>
-   <para>
-    <classname>MongoMaxKey</classname> has no associated fields, methods, or
-    constants. It is merely the "greatest" value that can be represented in the
-    database.
-   </para>
-   <note>
-    <simpara>
-     <classname>MongoMaxKey</classname> is used internally by MongoDB for
-     indexing and sharding. There is generally no reason to use this class in
-     an application.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongomaxkey.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoMaxKey</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoMaxKey</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongomaxkey.example">
-   <title>Using <classname>MongoMaxKey</classname> as a value</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array("task" => "dishes", "doBy" => new MongoMaxKey));
-$collection->insert(array("task" => "staff meeting", "doBy" => new MongoDate(strtotime("+4 days"))));
-
-$cursor = $collection->find()->sort(array("doBy" => 1));
-
-?>
-]]>
-   </programlisting>
-   <para>
-    The cursor will return the staff meeting document followed by the dishes
-    document. The dishes document will always be returned last, regardless of
-    what else is added to the collection (unless other documents are added with
-    <classname>MongoMaxKey</classname> in their "doBy" field).
-   </para>
-  </section>
-
-  <simplesect role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><classname>MongoMinKey</classname></member>
-   </simplelist>
-  </simplesect>
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongominkey.xml b/reference/mongo/mongominkey.xml
deleted file mode 100644
index eb5dfe4972..0000000000
--- a/reference/mongo/mongominkey.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongominkey" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoMinKey class</title>
- <titleabbrev>MongoMinKey</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\MinKey</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoBinData intro -->
-  <section xml:id="mongominkey.intro">
-   &reftitle.intro;
-   <para>
-    <classname>MongoMinKey</classname> is an special type used by the database
-    that compares less than all other possible BSON values. Thus, if a query is
-    sorted by a given field in ascending order, any document with a 
-    <classname>MongoMinKey</classname> as its value will be returned first.
-   </para>
-   <para>
-    <classname>MongoMinKey</classname> has no associated fields, methods, or
-    constants. It is merely the "smallest" value that can be represented in the
-    database.
-   </para>
-   <note>
-    <simpara>
-     <classname>MongoMinKey</classname> is used internally by MongoDB for
-     indexing and sharding. There is generally no reason to use this class in
-     an application.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongominkey.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoMinKey</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoMinKey</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongominkey.example">
-   <title>Using <classname>MongoMinKey</classname> as a value</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert(array("task" => "lunch", "doBy" => new MongoMinKey));
-$collection->insert(array("task" => "staff meeting", "doBy" => new MongoDate(strtotime("+4 days"))));
-
-$cursor = $collection->find()->sort(array("doBy" => 1));
-
-?>
-]]>
-   </programlisting>
-   <para>
-    The cursor will return the lunch document followed by the staff meeting
-    document. The lunch document will always be returned first, regardless of
-    what else is added to the collection (unless other documents are added with
-    <classname>MongoMinKey</classname> in their "doBy" field).
-   </para>
-  </section>
-
-  <simplesect role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><classname>MongoMaxKey</classname></member>
-   </simplelist>
-  </simplesect>
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongopool.xml b/reference/mongo/mongopool.xml
deleted file mode 100644
index 2c786bfb30..0000000000
--- a/reference/mongo/mongopool.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongopool" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoPool class</title>
- <titleabbrev>MongoPool</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoPool intro -->
-  <section xml:id="mongopool.intro">
-   &reftitle.intro;
-   <warning>
-    <para>
-     The current (1.3.0+) releases of the driver no longer implements pooling.
-     This class and its methods are therefore deprecated and should not be
-     used.
-    </para>
-   </warning>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongopool.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoPool</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoPool</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongopool')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  <section role="changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>PECL mongo 1.3.0</entry>
-        <entry>
-         This functionality has been removed and no longer does anything other
-         than emit deprecation warnings. This class is only kept around for
-         backwards compatibility and will be removed in the near future.
-        </entry>
-       </row>
-       <row>
-        <entry>PECL mongo 1.2.11</entry>
-        <entry>
-        Emits <constant>E_DEPRECATED</constant> when used.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongopool;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongopool/getsize.xml b/reference/mongo/mongopool/getsize.xml
deleted file mode 100644
index e133ab7170..0000000000
--- a/reference/mongo/mongopool/getsize.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongopool.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoPool::getSize</refname>
-  <refpurpose>Get pool size for connection pools</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>MongoPool::getSize</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current pool size.
-  </para>
- </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Changing pool size</title>
-   <para>
-    This returns the default pool size, sets a new pool size, then prints the
-    new pool size and the pool debugging information.  Note that changing the
-    pool size only affects new connection pools, it does not change old ones.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$connection = new Mongo("host1");
-
-// pool size is -1
-echo "pool size is: ".MongoPool::getSize()."\n";
-
-echo "setting pool size to 200\n";
-
-MongoPool::setSize(200);
-
-// pool size is 200
-echo "pool size is: ".MongoPool::getSize()."\n";
-
-$conn2 = new Mongo("host2");
-
-// remaining for host1 is -2
-// remaining for host2 is 199
-var_dump(Mongo::poolDebug());
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>MongoPool::setSize</function></member>
-    <member><function>MongoPool::info</function></member>
-    <member>The <link linkend="mongo.connecting">connection</link> documentation.</member>
-   </simplelist>
-  </para>
- </refsect1><!-- }}} -->
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongopool/info.xml b/reference/mongo/mongopool/info.xml
deleted file mode 100644
index 8146af4bef..0000000000
--- a/reference/mongo/mongopool/info.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongopool.info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoPool::info</refname>
-  <refpurpose>Returns information about all connection pools</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoPool::info</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Returns an array of information about all connection pools.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Each connection pool has an identifier, which starts with the host. For each
-   pool, this function shows the following fields:
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>in use</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of connections currently being used by
-       <classname>Mongo</classname> instances.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>in pool</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of connections currently in the pool (not being used).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>remaining</parameter>
-     </term>
-     <listitem>
-      <para>
-       The number of connections that could be created by this pool. For
-       example, suppose a pool had 5 connections remaining and 3 connections in
-       the pool.  We could create 8 new instances of
-       <classname>MongoClient</classname> before we exhausted this pool
-       (assuming no instances of <classname>MongoClient</classname> went out of
-       scope, returning their connections to the pool).
-      </para>
-      <para>
-       A negative number means that this pool will spawn unlimited connections.
-      </para>
-      <para>
-       Before a pool is created, you can change the max number of connections by
-       calling <function>Mongo::setPoolSize</function>. Once a pool is showing
-       up in the output of this function, its size cannot be changed.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>total</parameter>
-     </term>
-     <listitem>
-      <para>
-       The total number of connections allowed for this pool.  This should be
-       greater than or equal to "in use" + "in pool" (or -1).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>timeout</parameter>
-     </term>
-     <listitem>
-      <para>
-       The socket timeout for connections in this pool. This is how long
-       connections in this pool will attempt to connect to a server before
-       giving up.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>waiting</parameter>
-     </term>
-     <listitem>
-      <para>
-       If you have capped the pool size, workers requesting connections from
-       the pool may block until other workers return their connections. This
-       field shows how many milliseconds workers have blocked for connections to
-       be released.  If this number keeps increasing, you may want to use
-       <function>MongoPool::setSize</function> to add more connections to your
-       pool.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongopool/setsize.xml b/reference/mongo/mongopool/setsize.xml
deleted file mode 100644
index 334e551c5d..0000000000
--- a/reference/mongo/mongopool/setsize.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongopool.setsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoPool::setSize</refname>
-  <refpurpose>Set the size for future connection pools</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>MongoPool::setSize</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets the max number of connections new pools will be able to create.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>size</parameter>
-     </term>
-     <listitem>
-      <para>
-       The max number of connections future pools will be able to create.
-       Negative numbers mean that the pool will spawn an infinite number of
-       connections.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the former value of pool size.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongo 1.2.11</entry>
-       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <para>
-   <example xml:id="mongopool.setpoolsize.example.basic"><!-- {{{ -->
-    <title><function>Mongo::setPoolSize</function> example</title>
-    <para>
-     If you set the pool size to <literal>n</literal> and then create
-     <literal>n</literal> connections, attempting to create an
-     <literal>n+1</literal>st connection will throw a
-     <classname>MongoConnectionException</classname>.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// only allow one connection to a server
-MongoPool::setSize(1);
-
-// creates one connection to localhost:27017
-$m1 = new Mongo();
-
-// attempt to create a second connection to localhost:27017
-// only one connection is allowed, so this will throw an exception
-$m2 = new Mongo();
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Fatal error: Uncaught exception 'MongoConnectionException' with message 'no more connections in pool' in /path/to/php/script.php:10
-Stack trace:
-#0 /path/to/php/script.php(10): Mongo->__construct()
-#1 {main}
-  thrown in /path/to/php/script.php on line 10
-]]>
-    </screen>
-   </example><!-- }}} -->
-  </para>
- </refsect1><!-- }}} -->
-
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>MongoPool::getSize</function></member>
-    <member><function>MongoPool::info</function></member>
-    <member>The <link linkend="mongo.connecting">connection</link> documentation.</member>
-   </simplelist>
-  </para>
- </refsect1><!-- }}} -->
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoprotocolexception.xml b/reference/mongo/mongoprotocolexception.xml
deleted file mode 100644
index b08e84c253..0000000000
--- a/reference/mongo/mongoprotocolexception.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoprotocolexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoProtocolException class</title>
- <titleabbrev>MongoProtocolException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoProtocolException intro -->
-  <section xml:id="mongoprotocolexception.intro">
-   &reftitle.intro;
-   <para>
-    When talking to MongoDB 2.6.0, and later, certain operations (such as writes) may throw MongoProtocolException when the response
-    from the server did not make sense - for example during network failure (we could read the entire response) or data corruption.
-   </para>
-   <para>
-    This exception is also thrown when attempting to talk newer protocols then the server supports, for example using the
-    <classname>MongoWriteBatch</classname> when talking to a MongoDB server prior to 2.6.0.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoprotocolexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoProtocolException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoProtocolException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongoprotocolexception.examples">
-   &reftitle.examples;
-   <example xml:id="mongoprotocolexception.example.catch">
-    <title>Catching MongoProtocolException</title>
-    <para>
-     Running the following example against MongoDB prior to 2.6.0 will throw an MongoProtocolException
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$c = $mc->selectCollection("test", "test");
-
-try {
-    $batch = new MongoInsertBatch($c);
-} catch(MongoProtocolException $e) {
-    echo $e->getMessage();
-}
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-Current primary does not have a Write API
-]]>
-    </screen>
-   </example>
-  </section>
-
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoregex.xml b/reference/mongo/mongoregex.xml
deleted file mode 100644
index adf8dc7fa5..0000000000
--- a/reference/mongo/mongoregex.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoregex" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoRegex class</title>
- <titleabbrev>MongoRegex</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\Regex</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoRegex intro -->
-  <section xml:id="mongoregex.intro">
-   &reftitle.intro;
-   <para>
-    This class can be used to create regular expressions.  Typically, these
-    expressions will be used to query the database and find matching strings.
-    More unusually, they can be saved to the database and retrieved.
-   </para>
-   <para>
-    Regular expressions consist of four parts. First a <literal>/</literal>
-    as starting delimiter, then the pattern, another <literal>/</literal> 
-    and finally a string containing flags.
-   </para>
-   <para>
-    <example>
-     <title>Regular expression pattern</title>
-      <screen>
-<![CDATA[
-/pattern/flags
-]]>
-      </screen>
-    </example>
-   </para>
-   <para>
-    MongoDB recognizes six regular expression flags:
-   </para>
-   <itemizedlist>
-    <listitem>
-     <para>
-      <literal>i</literal>: Case insensitive
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>m</literal>: Multiline
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>x</literal>: Can contain comments
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>l</literal>: locale
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>s</literal>: dotall, "." matches everything, including newlines
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>u</literal>: match unicode
-     </para>
-    </listitem>
-   </itemizedlist>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoregex.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoRegex</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoRegex</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname>regex</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname>flags</varname>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoregex')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongoregex;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoregex/construct.xml b/reference/mongo/mongoregex/construct.xml
deleted file mode 100644
index 885bebb9ae..0000000000
--- a/reference/mongo/mongoregex/construct.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoregex.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoRegex::__construct</refname>
-  <refpurpose>Creates a new regular expression</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\Regex::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoRegex::__construct</methodname>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new regular expression.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>regex</parameter>
-     </term>
-     <listitem>
-      <para>
-       Regular expression string of the form <literal>/expr/flags</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new regular expression.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MongoRegex::__construct</function> example</title>
-    <para>This example uses a regular expression to query for all documents
-    with a username field starting (<literal>^</literal>) with an
-    <literal>l</literal> and a vowel (<literal>[aeiouy]</literal>),
-    case-insensitive (<literal>/i</literal>).</para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$luke_search = new MongoRegex("/^l[aeiouy]/i");
-$cursor = $collection->find(array("username" => $luke_search));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoRegex::__toString</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoregex/tostring.xml b/reference/mongo/mongoregex/tostring.xml
deleted file mode 100644
index 6d004631f1..0000000000
--- a/reference/mongo/mongoregex/tostring.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoregex.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoRegex::__toString</refname>
-  <refpurpose>A string representation of this regular expression</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\Regex::__toString</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoRegex::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a string representation of this regular expression.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This regular expression in the form "/expr/flags".
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MongoRegex::__toString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$r = new MongoRegex( "/[a-fA-F0-9]{16}/g" );
-echo $r->regex . "\n";
-echo $r->flags . "\n";
-echo "$r\n";
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-[a-fA-F0-9]{16}
-g
-/[a-fA-F0-9]{16}/g
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoresultexception.xml b/reference/mongo/mongoresultexception.xml
deleted file mode 100644
index 21ba7acd87..0000000000
--- a/reference/mongo/mongoresultexception.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoresultexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoResultException class</title>
- <titleabbrev>MongoResultException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoResultException intro -->
-  <section xml:id="mongoresultexception.intro">
-   &reftitle.intro;
-   <para>
-    The MongoResultException is thrown by several command helpers (such as
-    <methodname>MongoCollection::findAndModify</methodname>) in the event of
-    failure. The original result document is available through
-    <methodname>MongoResultException::getDocument</methodname>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoresultexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoResultException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoResultException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mongoresultexception.props.document">document</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <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.mongoresultexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ MongoResultException properties -->
-  <section xml:id="mongoresultexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongoresultexception.props.document">
-     <term><varname>document</varname></term>
-     <listitem>
-      <para>The raw result document as an array.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mongo.entities.mongoresultexception;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoresultexception/getdocument.xml b/reference/mongo/mongoresultexception/getdocument.xml
deleted file mode 100644
index 55f80710bf..0000000000
--- a/reference/mongo/mongoresultexception/getdocument.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoresultexception.getdocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoResultException::getDocument</refname>
-  <refpurpose>Retrieve the full result document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoResultException::getDocument</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the full error result document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The full result document as an array, including partial data if available and
-   additional keys.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongoresultexception.getdocument.example.basic">
-   <title><methodname>MongoResultException::getDocument</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$c = $mc->selectCollection("test", "test");
-
-$c->insert(array(
-     "name" => "Next promo",
-     "inprogress" => false,
-     "priority" => 0,
-     "tasks" => array( "select product", "add inventory", "do placement"),
-) );
-
-$c->insert(array(
-     "name" => "Biz report",
-     "inprogress" => false,
-     "priority" => 1,
-     "tasks" => array( "run sales report", "email report" )
-) );
-
-$c->insert(array(
-     "name" => "Biz report",
-     "inprogress" => false,
-     "priority" => 2,
-     "tasks" => array( "run marketing report", "email report" )
-    ),
-    array("w" => true)
-);
-
-try {
-    $retval = $c->findAndModify(
-         array("inprogress" => false, "name" => "Biz report"),
-         array('$set' => array('$set' => array('inprogress' => true, "started" => new MongoDate()))),
-         null,
-         array(
-            "sort" => array("priority" => -1),
-            "new" => true,
-        )
-    );
-} catch(MongoResultException $e) {
-    echo $e->getMessage(), "\n";
-    $res = $e->getDocument();
-    var_dump($res);
-}
-?>
-]]>
-   </programlisting>
-   &examples.outputs.similar;
-   <screen>
-<![CDATA[
-$set is not valid for storage.
-array(3) {
-  ["lastErrorObject"]=>
-  array(5) {
-    ["connectionId"]=>
-    int(6)
-    ["err"]=>
-    string(30) "$set is not valid for storage."
-    ["code"]=>
-    int(52)
-    ["n"]=>
-    int(0)
-    ["ok"]=>
-    float(1)
-  }
-  ["ok"]=>
-  float(0)
-  ["errmsg"]=>
-  string(30) "$set is not valid for storage."
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongotimestamp.xml b/reference/mongo/mongotimestamp.xml
deleted file mode 100644
index 72e92b1aea..0000000000
--- a/reference/mongo/mongotimestamp.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongotimestamp" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoTimestamp class</title>
- <titleabbrev>MongoTimestamp</titleabbrev>
-
- <partintro>
-
-  <warning>
-   &mongo.alternative.class.note;
-   <simplelist role="alternatives">
-    <member><classname>MongoDB\BSON\Timestamp</classname></member>
-   </simplelist>
-  </warning>
-
-<!-- {{{ MongoTimestamp intro -->
-  <section xml:id="mongotimestamp.intro">
-   &reftitle.intro;
-   <para>
-    <classname>MongoTimestamp</classname> is an internal type used by MongoDB
-    for replication and sharding. It consists of a 4-byte timestamp (i.e.
-    seconds since the epoch) and a 4-byte increment. This type is not intended
-    for storing time or date values (e.g. a "createdAt" field on a document).
-   </para>
-   <note>
-    <simpara>
-     Unless you are writing an application that interacts with MongoDB's
-     replication oplog or sharding internals: stop, go directly to
-     <classname>MongoDate</classname>, do not pass go, and do not collect 200
-     dollars. This is not the class you are looking for.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongotimestamp.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoTimestamp</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoTimestamp</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Fields</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>sec</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>inc</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongotimestamp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" /> 
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
- </partintro>
-
- &reference.mongo.entities.mongotimestamp;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongotimestamp/construct.xml b/reference/mongo/mongotimestamp/construct.xml
deleted file mode 100644
index 36c9105c92..0000000000
--- a/reference/mongo/mongotimestamp/construct.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongotimestamp.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoTimestamp::__construct</refname>
-  <refpurpose>Creates a new timestamp</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\Timestamp::__construct</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoTimestamp::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>sec</parameter><initializer>time()</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>inc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new timestamp.  If no parameters are given, the current time is 
-   used and the increment is automatically provided.  The increment is set to 0
-   when the module is loaded and is incremented every time this constructor is 
-   called (without the $inc parameter passed in).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>sec</parameter>
-     </term>
-     <listitem>
-      <para>
-       Number of seconds since the epoch (i.e. 1 Jan 1970 00:00:00.000 UTC).
-      </para>
-     </listitem>
-    </varlistentry>     
-    <varlistentry>
-     <term>
-      <parameter>inc</parameter>
-     </term>
-     <listitem>
-      <para>
-       Increment.
-      </para>
-     </listitem>
-    </varlistentry>     
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns this new timestamp.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>MongoTimestamp::__toString</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongotimestamp/tostring.xml b/reference/mongo/mongotimestamp/tostring.xml
deleted file mode 100644
index b3e8db9e8c..0000000000
--- a/reference/mongo/mongotimestamp/tostring.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongotimestamp.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoTimestamp::__toString</refname>
-  <refpurpose>Returns a string representation of this timestamp</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
-   &mongo.alternative.method.note;
-   <simplelist role="alternatives">
-    <member><methodname>MongoDB\BSON\Timestamp::__toString</methodname></member>
-   </simplelist>
-  </sidebar>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MongoTimestamp::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the "sec" field of this timestamp.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The seconds since epoch represented by this timestamp.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoupdatebatch.xml b/reference/mongo/mongoupdatebatch.xml
deleted file mode 100644
index a550b8dc29..0000000000
--- a/reference/mongo/mongoupdatebatch.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongoupdatebatch" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoUpdateBatch class</title>
- <titleabbrev>MongoUpdateBatch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoUpdateBatch intro -->
-  <section xml:id="mongoupdatebatch.intro">
-   &reftitle.intro;
-   <para>
-    Constructs a batch of UPDATE operations. See <classname>MongoWriteBatch</classname>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongoupdatebatch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoUpdateBatch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoUpdateBatch</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoWriteBatch</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongoupdatebatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongowritebatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongoupdatebatch;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongoupdatebatch/construct.xml b/reference/mongo/mongoupdatebatch/construct.xml
deleted file mode 100644
index dbf8ad930c..0000000000
--- a/reference/mongo/mongoupdatebatch/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongoupdatebatch.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoUpdateBatch::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoUpdateBatch::__construct</methodname>
-   <methodparam><type>MongoCollection</type><parameter>collection</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>write_options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a batch of UPDATE operations. See <classname>MongoWriteBatch</classname>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection</parameter></term>
-    &mongo.mongowritebatch.collection.description;
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_options</parameter></term>
-    &mongo.mongowritebatch.writeoptions.description;
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A new MongoUpdateBatch.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongowritebatch.xml b/reference/mongo/mongowritebatch.xml
deleted file mode 100644
index 01b2b502ef..0000000000
--- a/reference/mongo/mongowritebatch.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongowritebatch" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoWriteBatch class</title>
- <titleabbrev>MongoWriteBatch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoWriteBatch intro -->
-  <section xml:id="mongowritebatch.intro">
-   &reftitle.intro;
-   <para>
-    MongoWriteBatch is the base class for the <classname>MongoInsertBatch</classname>,
-    <classname>MongoUpdateBatch</classname> and <classname>MongoDeleteBatch</classname> classes.
-   </para>
-   <para>
-    MongoWriteBatch allows you to "batch up" multiple operations (of same type) and shipping them all
-    to MongoDB at the same time. This can be especially useful when operating on many documents at the
-    same time to reduce roundtrips.
-   </para>
-   <para>
-    Prior to version 1.5.0 of the driver it was possible to use <methodname>MongoCollection::batchInsert</methodname>,
-    however, as of 1.5.0 that method is now discouraged.
-   </para>
-   <para>
-    Note: This class is only available when talking to MongoDB 2.6.0 (and later) servers. It will throw
-    <classname>MongoProtocolException</classname> if attempting to use it on older MongoDB servers.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongowritebatch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoWriteBatch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoWriteBatch</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongowritebatch.constants.command.insert">MongoWriteBatch::COMMAND_INSERT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongowritebatch.constants.command.update">MongoWriteBatch::COMMAND_UPDATE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongowritebatch.constants.command.delete">MongoWriteBatch::COMMAND_DELETE</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongowritebatch')/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.mongowritebatch')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-   <section xml:id="mongowritebatch.constants">
-    <title>MongoWriteBatch types</title>
-    <variablelist>
-
-     <varlistentry xml:id="mongowritebatch.constants.command.insert">
-      <term><constant>MongoWriteBatch::COMMAND_INSERT</constant></term>
-      <listitem>
-       <para>Create an Insert Write Batch</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="mongowritebatch.constants.command.update">
-      <term><constant>MongoWriteBatch::COMMAND_UPDATE</constant></term>
-      <listitem>
-       <para>Create an Update Write Batch</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="mongowritebatch.constants.command.delete">
-      <term><constant>MongoWriteBatch::COMMAND_DELETE</constant></term>
-      <listitem>
-       <para>Create an Delete Write Batch</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-
-  <section xml:id="mongowritebatch.description">
-   &reftitle.description;
-   <para>
-    When executing a batch by calling
-    <methodname>MongoWriteBatch::execute</methodname>, MongoWriteBatch will send
-    up to <literal>maxWriteBatchSize</literal> (defaults to 1000) documents or
-    <literal>maxBsonObjectSize</literal> (defaults to 16777216 bytes), whichever
-    comes first.
-   </para>
-   <note>
-    <para>
-     Documents will never be partially transferred. When adding documents to the batch, that overflows the limit, a new
-     batch will be created and the document put into the new batch.
-    </para>
-   </note>
-  </section>
-
-  <section xml:id="mongowritebatch.errors">
-   &reftitle.errors;
-   <simplelist>
-    <member><classname>Exception</classname> on parameter parsing failures</member>
-    <member><classname>Exception</classname> on argument validation errors (e.g. missing keys)</member>
-    <member><classname>MongoProtocolException</classname> when talking to MongoDB server older then 2.6.0.</member>
-    <member><classname>MongoProtocolException</classname> on socket errors.</member>
-    <member><classname>MongoWriteConcernException</classname> when a write fails due to <link linkend="mongo.writeconcerns">WriteConcerns</link></member>
-   </simplelist>
-  </section>
-
-  <section xml:id="mongowritebatch.examples">
-   &reftitle.examples;
-   <example xml:id="mongowritebatch.example.basic">
-    <title><classname>MongoWriteBatch</classname> example</title>
-    <para>
-     Adding documents to a Insert batch and then execute it
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-
-$collection = $mc->selectCollection("test", "test");
-
-
-$docs = array();
-$docs[] = array("my" => "demo");
-$docs[] = array("is" => "working");
-$docs[] = array("pretty" => "well");
-
-$batch = new MongoInsertBatch($collection);
-foreach($docs as $document) {
-    $batch->add($document);
-}
-$retval = $batch->execute(array("w" => 1));
-var_dump($retval);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["nInserted"]=>
-  int(3)
-  ["ok"]=>
-  bool(true)
-}
-]]>
-    </screen>
-   </example>
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongowritebatch;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongowritebatch/add.xml b/reference/mongo/mongowritebatch/add.xml
deleted file mode 100644
index d725c988b7..0000000000
--- a/reference/mongo/mongowritebatch/add.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongowritebatch.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoWriteBatch::add</refname>
-  <refpurpose>Adds a write operation to a batch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoWriteBatch::add</methodname>
-   <methodparam><type>array</type><parameter>item</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a write operation to the batch.
-  </para>
-  <para>
-   If <parameter>$item</parameter> causes the batch to exceed the
-   <literal>maxWriteBatchSize</literal> or <literal>maxBsonObjectSize</literal>
-   limits, the driver will internally split the batches into multiple write
-   commands upon calling <methodname>MongoWriteBatch::execute</methodname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>item</parameter></term>
-    <listitem>
-     <para>
-      An array that describes a write operation. The structure of this value
-      depends on the batch's operation type.
-      <informaltable>
-       <thead>
-        <row>
-         <entry>Batch type</entry>
-         <entry>Argument expectation</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><constant>MongoWriteBatch::COMMAND_INSERT</constant></entry>
-         <entry>
-          <simpara>The document to add.</simpara>
-         </entry>
-        </row>
-        <row>
-         <entry><constant>MongoWriteBatch::COMMAND_UPDATE</constant></entry>
-         <entry>
-          <para>Raw update operation.</para>
-          <para>Required keys are <literal>"q"</literal> and <literal>"u"</literal>, which correspond to the <link linkend="mongocollection.update.criteria"><parameter>$criteria</parameter></link> and <link linkend="mongocollection.update.new_object"><parameter>$new_object</parameter></link> parameters of <function>MongoCollection::update</function>, respectively.</para>
-          <para>Optional keys are <literal>"multi"</literal> and <literal>"upsert"</literal>, which correspond to the <link linkend="mongocollection.update.multiple"><literal>"multiple"</literal></link> and <link linkend="mongocollection.update.upsert"><literal>"upsert"</literal></link> options for <function>MongoCollection::update</function>, respectively. If unspecified, both options default to &false;.</para>
-         </entry>
-        </row>
-        <row>
-         <entry><constant>MongoWriteBatch::COMMAND_DELETE</constant></entry>
-         <entry>
-          <para>Raw delete operation.</para>
-          <para>Required keys are: <literal>"q"</literal> and <literal>"limit"</literal>, which correspond to the <link linkend="mongocollection.remove.criteria"><parameter>$criteria</parameter></link> parameter and <link linkend="mongocollection.remove.justone"><literal>"justOne"</literal></link> option of <function>MongoCollection::remove</function>, respectively.</para>
-          <para>The <literal>"limit"</literal> option is an <type>int</type>; however, MongoDB only supports <literal>0</literal> (i.e. remove all matching documents) and <literal>1</literal> (i.e. remove at most one matching document) at this time.</para>
-         </entry>
-        </row>
-       </tbody>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success and throws an exception on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member><classname>Exception</classname> on parameter parsing failures</member>
-   <member><classname>Exception</classname> on argument validation errors (e.g. missing keys)</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongowritebatch.add.example.insert">
-   <title><methodname>MongoWriteBatch::add</methodname> example</title>
-   <para>
-    Batching up multiple insert operations
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$collection = $mc->selectCollection("test", "test");
-
-
-$docs = array();
-$docs[] = array("my" => "demo");
-$docs[] = array("is" => "working");
-$docs[] = array("pretty" => "well");
-
-$batch = new MongoInsertBatch($collection);
-foreach($docs as $document) {
-    $batch->add($document);
-}
-$batch->execute(array("w" => 1));
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example xml:id="mongowritebatch.add.example.update">
-   <title><methodname>MongoWriteBatch::add</methodname> example</title>
-   <para>
-    Batching up multiple update operations
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$collection = $mc->selectCollection("test", "test");
-
-
-$item1 = array(
-    "q" => array("my" => "demo"),
-    "u" => array('$set' => array("try" => 1)),
-    "multi"  => false, /* default value */
-    "upsert" => false, /* default value */
-);
-$item2 = array(
-    "q" => array("is" => "working"),
-    "u" => array('$set' => array("try" => 2)),
-    "multi" => true,
-);
-$item3 = array(
-    "q" => array("created" => "new-document"),
-    "u" => array('$set' => array("try" => 3)),
-    "upsert" => true,
-);
-
-$batch = new MongoUpdateBatch($collection);
-$batch->add($item1);
-$batch->add($item2);
-$batch->add($item3);
-$batch->execute(array("w" => 1));
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example xml:id="mongowritebatch.add.example.delete">
-   <title><methodname>MongoWriteBatch::add</methodname> example</title>
-   <para>
-    Batching up multiple delete operations
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$collection = $mc->selectCollection("test", "test");
-
-
-$item1 = array(
-    "q" => array("my" => "demo"),
-    "limit" => 1,
-);
-$item2 = array(
-    "q" => array("try" => 3),
-    "limit" => 1,
-);
-
-
-$batch = new MongoDeleteBatch($collection);
-$batch->add($item1);
-$batch->add($item2);
-$batch->execute(array("w" => 1));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongowritebatch/construct.xml b/reference/mongo/mongowritebatch/construct.xml
deleted file mode 100644
index bfbe1bf877..0000000000
--- a/reference/mongo/mongowritebatch/construct.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongowritebatch.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoWriteBatch::__construct</refname>
-  <refpurpose>Creates a new batch of write operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>protected</modifier> <methodname>MongoWriteBatch::__construct</methodname>
-   <methodparam><type>MongoCollection</type><parameter>collection</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>batch_type</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>write_options</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructs a new MongoWriteBatch.
-  </para>
-  <note>
-   <para>
-    This is a protected constructor. Please use one of the classes inheriting <classname>MongoWriteBatch</classname>.
-   </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection</parameter></term>
-    &mongo.mongowritebatch.collection.description;
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>batch_type</parameter></term>
-    <listitem>
-     <para>
-      One of:
-      <simplelist>
-       <member><literal>0</literal> - make an MongoWriteBatch::COMMAND_INSERT batch</member>
-       <member><literal>1</literal> - make an MongoWriteBatch::COMMAND_UPDATE batch</member>
-       <member><literal>2</literal> - make a  MongoWriteBatch::COMMAND_DELETE batch</member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="mongowritebatch.construct.write_options">
-    <term><parameter>write_options</parameter></term>
-    &mongo.mongowritebatch.writeoptions.description;
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A new MongoWriteBatch of type <parameter>batch_type</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoInsertBatch</classname></member>
-   <member><classname>MongoUpdateBatch</classname></member>
-   <member><classname>MongoDeleteBatch</classname></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongowritebatch/execute.xml b/reference/mongo/mongowritebatch/execute.xml
deleted file mode 100644
index 1437117728..0000000000
--- a/reference/mongo/mongowritebatch/execute.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongowritebatch.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoWriteBatch::execute</refname>
-  <refpurpose>Executes a batch of write operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoWriteBatch::execute</methodname>
-   <methodparam><type>array</type><parameter>write_options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Executes the batch of write operations.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>write_options</parameter></term>
-    <listitem>
-     <para>
-      See <link linkend="mongowritebatch.construct.write_options">MongoWriteBatch::__construct</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing statistical information for the full batch.
-   If the batch had to be split into multiple batches, the return value will aggregate
-   the values from individual batches and return only the totals.
-  </para>
-  <para>
-   If the batch was empty, an array containing only the 'ok' field is returned (as &true;) although
-   nothing will be shipped over the wire (<acronym>NOOP</acronym>).
-  </para>
-  <para>
-   <informaltable>
-    <thead>
-     <row>
-      <entry>Array key</entry>
-      <entry>Value meaning</entry>
-      <entry>Returned for batch type</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>nInserted</entry>
-      <entry>Number of inserted documents</entry>
-      <entry>MongoWriteBatch::COMMAND_INSERT batch</entry>
-     </row>
-     <row>
-      <entry>nMatched</entry>
-      <entry>Number of documents matching the query criteria</entry>
-      <entry>MongoWriteBatch::COMMAND_UPDATE batch</entry>
-     </row>
-     <row>
-      <entry>nModified</entry>
-      <entry>Number of documents actually needed to be modied</entry>
-      <entry>MongoWriteBatch::COMMAND_UPDATE batch</entry>
-     </row>
-     <row>
-      <entry>nUpserted</entry>
-      <entry>Number of upserted documents</entry>
-      <entry>MongoWriteBatch::COMMAND_UPDATE batch</entry>
-     </row>
-     <row>
-      <entry>nRemoved</entry>
-      <entry>Number of documents removed</entry>
-      <entry>MongoWriteBatch::COMMAND_DELETE batch</entry>
-     </row>
-     <row>
-      <entry>ok</entry>
-      <entry>Command success indicator</entry>
-      <entry>All</entry>
-     </row>
-    </tbody>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   A <classname>MongoWriteConcernException</classname> exception is thrown on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="mongowritebatch.execute.example.insert">
-   <title><methodname>MongoWriteBatch::add</methodname> example</title>
-   <para>
-    Batching up multiple insert operations
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$collection = $mc->selectCollection("test", "test");
-
-
-$docs = array();
-$docs[] = array("my" => "demo");
-$docs[] = array("is" => "working");
-$docs[] = array("pretty" => "well");
-
-$batch = new MongoInsertBatch($collection);
-foreach($docs as $document) {
-    $batch->add($document);
-}
-$retval = $batch->execute(array("w" => 1));
-var_dump($retval);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["nInserted"]=>
-  int(3)
-  ["ok"]=>
-  bool(true)
-}
-]]>
-    </screen>
-  </example>
-
-  <example xml:id="mongowritebatch.execute.example.update">
-   <title><methodname>MongoWriteBatch::add</methodname> example</title>
-   <para>
-    Batching up multiple update operations
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$collection = $mc->selectCollection("test", "test");
-
-
-$item1 = array(
-    "q" => array("my" => "demo"),
-    "u" => array('$set' => array("try" => 1)),
-    "multi"  => false, /* default value */
-    "upsert" => false, /* default value */
-);
-$item2 = array(
-    "q" => array("is" => "working"),
-    "u" => array('$set' => array("try" => 2)),
-    "multi" => true,
-);
-$item3 = array(
-    "q" => array("created" => "new-document"),
-    "u" => array('$set' => array("try" => 3)),
-    "upsert" => true,
-);
-
-$batch = new MongoUpdateBatch($collection);
-$batch->add($item1);
-$batch->add($item2);
-$batch->add($item3);
-$retval = $batch->execute(array("w" => 1));
-var_dump($retval);
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  ["nMatched"]=>
-  int(18)
-  ["nModified"]=>
-  int(2)
-  ["nUpserted"]=>
-  int(0)
-  ["ok"]=>
-  bool(true)
-}
-]]>
-    </screen>
-  </example>
-
-  <example xml:id="mongowritebatch.execute.example.delete">
-   <title><methodname>MongoWriteBatch::add</methodname> example</title>
-   <para>
-    Batching up multiple delete operations
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mc = new MongoClient("localhost");
-$collection = $mc->selectCollection("test", "test");
-
-
-$item1 = array(
-    "q" => array("my" => "demo"),
-    "limit" => 1,
-);
-$item2 = array(
-    "q" => array("try" => 3),
-    "limit" => 1,
-);
-
-
-$batch = new MongoDeleteBatch($collection);
-$batch->add($item1);
-$batch->add($item2);
-$retval = $batch->execute(array("w" => 1));
-var_dump($retval);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["nRemoved"]=>
-  int(1)
-  ["ok"]=>
-  bool(true)
-}
-]]>
-    </screen>
-  </example>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/mongowriteconcernexception.xml b/reference/mongo/mongowriteconcernexception.xml
deleted file mode 100644
index 21fc3ffff5..0000000000
--- a/reference/mongo/mongowriteconcernexception.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mongowriteconcernexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoWriteConcernException class</title>
- <titleabbrev>MongoWriteConcernException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoWriteConcernException intro -->
-  <section xml:id="mongowriteconcernexception.intro">
-   &reftitle.intro;
-   <para>
-    MongoWriteConcernException is thrown when a write fails. See <xref linkend="mongo.writeconcerns" /> for how to set failure thresholds.
-   </para>
-   <para>
-    Prior to MongoDB 2.6.0, the <link xlink:href="&url.mongodb.docs.command;getLastError">getLastError</link> command would determine whether a write failed.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongowriteconcernexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoWriteConcernException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoWriteConcernException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoCursorException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <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.mongowriteconcernexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongocursorexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongo.entities.mongowriteconcernexception;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/queries.xml b/reference/mongo/queries.xml
deleted file mode 100644
index 3777b41cc5..0000000000
--- a/reference/mongo/queries.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="mongo.queries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Querying</title>
-
- <simplesect xml:id="mongo.queries.secondaries">
-  <title>Distributing queries to secondaries</title>
-
-  <para>
-   All queries (reads and writes) are only sent to the primary member of a
-   replica set by default. This is however easily configurable by using the
-   <link linkend="mongo.readpreferences">Read Preferences</link> which allow
-   you to set some generic read preferences (such as allowing secondary reads
-   of the nearest server), and also provide ways to specifically target a
-   server in a specific country, datacenter, or even hardware, by the use of
-   <link linkend="mongo.readpreferences.tagsets">replica set tag sets</link>.
-  </para>
-  <para>
-   Read preferences can be configured at every level of the driver:
-   <simplelist>
-    <member>As a query parameter or option to <methodname>MongoClient::__construct</methodname></member>
-    <member>Specifically by calling <methodname>MongoClient::setReadPreference</methodname></member>
-    <member>At the database level with <methodname>MongoDB::setReadPreference</methodname></member>
-    <member>At the collection level with <methodname>MongoCollection::setReadPreference</methodname></member>
-    <member>At the cursor level with <methodname>MongoCursor::setReadPreference</methodname> or <methodname>MongoCommandCursor::setReadPreference</methodname></member>
-   </simplelist>
-   Each class inherits its read preference setting from the "parent" context.
-  </para>
-  <example xml:id="mongo.queries.secondaries.inheritence-example">
-   <title>Inheriting read preferences from the database level down to the cursor</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$db->setReadPreference(MongoClient::RP_SECONDARY_PREFERRED);
-$c = $db->myCollection;
-
-$cursor = $c->find();
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   In this example, the query will be executed against a secondary. The
-   collection inherits <constant>MongoClient::RP_SECONDARY_PREFERRED</constant>
-   from the database and the cursor inherits it from the collection.
-  </para>
- </simplesect>
-
-  <simplesect xml:id="mongo.queries.choosing.secondary">
-   <title>How secondaries are chosen</title>
-
-   <para>
-    Each instance of <classname>MongoClient</classname> chooses its own
-    secondary using the available secondary with the lowest ping time. So, if we
-    had a PHP client in Europe and one in Australia and we had one secondary in
-    each of these data centers, we could do:
-   </para>
-   <example xml:id="mongo.queries.choosing.secondary-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array("replicaSet" => "setName", "readPreference" => MongoClient::RP_SECONDARY_PREFERRED);
-
-// on the Australian client
-$m = new MongoClient("mongodb://primary,australianhost.secondary,europeanhost.secondary", $options);
-$cursor = $m->foo->bar->find();
-$cursor->getNext();
-echo "Reading from: ", $cursor->info()["server"], "\n";
-
-// on the European client
-$m = new MongoClient("mongodb://primary,australianhost.secondary,europeanhost.secondary", $options);
-$cursor = $m->foo->bar->find();
-$cursor->getNext();
-echo "Reading from: ", $cursor->info()["server"], "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Reading from: australianHost
-Reading from: europeanHost
-]]>
-    </screen>
-    <para>
-     Note that we have to do a query before a secondary is chosen: secondaries
-     are chosen lazily by the driver, and for each query separately.
-    </para>
-   </example>
-
-   <para>
-    You can see what the driver thinks is the current status of the set
-    members by running <methodname>MongoClient::getHosts</methodname> or
-    <methodname>MongoClient::getConnections</methodname>.
-   </para>
-
-   <para>
-    If no secondary is readable, the driver will send reads to the
-    primary as we specified
-    <constant>MongoClient::RP_SECONDARY_PREFERRED</constant> which will
-    fallback to execute a query on a primary if no secondaries are available.
-    A server is considered readable if its state is 2 (SECONDARY) and its
-    health is 1.  You can check this with
-    <methodname>MongoClient::getHosts</methodname> and
-    <methodname>MongoClient::getConnections</methodname>.
-   </para>
-
-  </simplesect>
-  <simplesect xml:id="mongo.queries.notes">
-   <title>Random notes</title>
-
-   <para>
-    Writes are always sent to the primary—and by default all reads are sent
-    to the primary too.
-   </para>
-<!--
-   <para>
-    The following database commands can be sent to secondaries when using the
-    apropriate Read Preference:
-    <simplelist>
-     <member><methodname>MongoCollection::group</methodname></member>
-     <member><methodname>MongoCollection::aggregate</methodname></member>
-     <member><methodname>MongoCollection::distinct</methodname></member>
-     <member><methodname>MongoCursor::count</methodname></member>
-     <member>collStats</member>
-     <member>dbStats</member>
-     <member>geoNear</member>
-     <member>geoSearch</member>
-     <member>geoWalk</member>
-     <member>inline mapreduce</member>
-    </simplelist>
-    All other commands are always sent to the primary.
-   </para>
--->
-  </simplesect>
-
- <simplesect xml:id="mongo.queries.querying">
-  <title>Querying by _id</title>
-  <para>
-   Every object inserted is automatically assigned a unique
-   <literal>_id</literal> field, which is often a useful field to use in
-   queries. This works similarly to "get last insert ID" functionality, except
-   that the <literal>_id</literal> is chosen by the <emphasis>client</emphasis>.
-  </para>
-  <para>
-   Suppose that we wish to find the document we just inserted.  Inserting adds
-   an <literal>_id</literal> field to the document, so we can query by that:
-
-   <example xml:id="mongo.queries.querying-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$person = array("name" => "joe");
-
-$people->insert($person);
-
-// now $joe has an _id field
-$joe = $people->findOne(array("_id" => $person['_id']));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Unless the user has specified otherwise, the <literal>_id</literal> field is a
-   <classname>MongoId</classname>.  The most common mistake is attempting to use
-   a string to match a <classname>MongoId</classname>.  Keep in mind that these
-   are two different datatypes, and will not match each other in the same way
-   that the string "array()" is not the same as an empty array.  For example:
-
-   <example xml:id="mongo.queries.querying.wrong">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$person = array("name" => "joe");
-
-$people->insert($person);
-
-// convert the _id to a string
-$pid = $person['_id'] . "";
-
-// FAILS - $pid is a string, not a MongoId
-$joe = $people->findOne(array("_id" => $pid));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </simplesect>
-
- <simplesect xml:id="mongo.queries.arrays">
-  <title>Arrays</title>
-
-  <para>
-   Arrays are special in a couple ways.  First, there are two types that
-   MongoDB uses: "normal" arrays and associative arrays.  Associative arrays can
-   have any mix of key types and values.  "Normal" arrays are defined as arrays
-   with ascending numeric indexes starting at 0 and increasing by one for each
-   element.  These are, typically, just your usual PHP array.
-  </para>
-
-  <para>
-   For instance, if you want to save a list of awards in a document, you could
-   say:
-  </para>
-
-  <example xml:id="mongo.queries.arrays-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->save(array("awards" => array("gold", "silver", "bronze")));
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   Queries can reach into arrays to search for elements.  Suppose that we wish
-   to find all documents with an array element of a given value. For example,
-   documents with a "gold" award, such as:
-  </para>
-
-  <screen>
-<![CDATA[
-{ "_id" : ObjectId("4b06c282edb87a281e09dad9"), "awards" : ["gold", "silver", "bronze"]}
-]]>
-  </screen>
-
-  <para>
-   This can be done with a simple query, ignoring the fact that "awards" is an
-   array:
-  </para>
-
-   <example xml:id="mongo.queries.arrays-example-2">
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-  $cursor = $collection->find(array("awards" => "gold"));
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   Suppose we are querying for a more complex object, if each element of the
-   array were an object itself, such as:
-  </para>
-
-  <screen>
-<![CDATA[
-{
-     "_id" : ObjectId("4b06c282edb87a281e09dad9"),
-     "awards" :
-     [
-        {
-            "first place" : "gold"
-        },
-        {
-            "second place" : "silver"
-        },
-        {
-            "third place" :  "bronze"
-        }
-     ]
-}
-]]>
-  </screen>
-
-  <para>
-   Still ignoring that this is an array, we can use dot notation to query the
-   subobject:
-  </para>
-
-   <example xml:id="mongo.queries.querying-arrays-nested">
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find(array("awards.first place" => "gold"));
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   Notice that it doesn't matter that there is a space in the field name
-   (although it may be best not to use spaces, just to make things more
-   readable).
-  </para>
-
-  <para>
-   You can also use an array to query for a number of possible values.  For
-   instance, if we were looking for documents "gold" or "copper", we could do:
-  </para>
-
-  <example xml:id="mongo.queries.querying-arrays-in">
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$cursor = $collection->find(array("awards" => array('$in' => array("gold", "copper"))));
-
-?>
-]]>
-   </programlisting>
-  </example>
- </simplesect>
-
- <simplesect role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-<!--
-     <row>
-      <entry>1.3.1</entry>
-      <entry>
-       Several database commands can now be executed on secondaries.
-      </entry>
-     </row>
--->
-     <row>
-      <entry>1.3.0</entry>
-      <entry>
-       Introduced the <link linkend="mongo.readpreferences">Read
-       Preferences</link> framework to allow more fine grained control over
-       secondary reads.
-      </entry>
-     </row>
-     <row>
-      <entry>1.3.0</entry>
-      <entry>
-       Deprecated <literal>slaveOkay</literal> usage, the alternative is <link
-       linkend="mongo.readpreferences">Read Preferences</link>.
-      </entry>
-     </row>
-     <row>
-      <entry>1.1.0</entry>
-      <entry>
-       Introduced the possiblity of routing reads to secondaries of replica set
-       members using <methodname>Mongo::setSlaveOkay</methodname>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </simplesect>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/readpreferences.xml b/reference/mongo/readpreferences.xml
deleted file mode 100644
index 0213ba186c..0000000000
--- a/reference/mongo/readpreferences.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.readpreferences" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Read Preferences</title>
- <para>
-  MongoDB 2.2 and version 1.3.0 of the driver add support for 
-  <link xlink:href="&url.mongodb.docs.readpreferences;">read preferences</link>,
-  which allow control over how queries are directed to mongod instances in a
-  replica set environment. Read preferences may be specified on either a
-  per-connection, per-database, or per-collection basis. Preferences defined
-  at a higher level
-  will be inherited by default (e.g. <classname>MongoCollection</classname> will
-  inherit read preferences defined on the corresponding
-  <classname>MongoDB</classname> instance).
- </para>
- <para>
-  Read preferences are specified with a combination of modes and tag sets. Modes
-  determine how mongod instances are prioritized, while
-  <link xlink:href="&url.mongodb.docs.tagsets;">tag sets</link> specify criteria
-  for eligible mongod instances. Mongod instances are only eligible if they
-  are within a 15ms difference in ping time from the nearest mongod instance.
- </para>
- <simplesect xml:id="mongo.readpreferences.modes">
-  <title>Read Preference Modes</title>
-  <warning>
-   <para>
-    All read preference modes except <literal>MongoClient::RP_PRIMARY</literal>
-    may return stale data as secondaries replicate operations from the primary
-    with some delay. Ensure that your application can tolerate stale data if you
-    choose to use a mode other than <literal>MongoClient::RP_PRIMARY</literal>.
-   </para>
-  </warning>
-  <itemizedlist>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_PRIMARY</literal>
-    </para>
-    <para>
-     All read operations use only the current replica set primary. This is the
-     default. If the primary is unavailable, read operations will produce an
-     exception.
-    </para>
-    <para>
-     This mode is incompatible with use of tag sets. Specifying a tag set with
-     <literal>MongoClient::RP_PRIMARY</literal> will result in an exception.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_PRIMARY_PREFERRED</literal>
-    </para>
-    <para>
-     In most situations, operations read from the primary member of the set.
-     However, if the primary is unavailable, as is the case during failover
-     situations, operations read from secondary members.
-    </para>
-    <para>
-     When the read preference includes a tag set, the client reads first from
-     the primary, if available, and then from secondaries that match the
-     specified tags. If no secondaries have matching tags, the read operation
-     will produce an exception.
-    </para>
-    <warning>
-     <para>
-      Version 2.2 of mongos added full support for read preferences. When
-      connecting to older mongos instances,
-      <literal>MongoClient::RP_PRIMARY_PREFERRED</literal> will send queries to
-      secondaries.
-     </para>
-    </warning>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_SECONDARY</literal>
-    </para>
-    <para>
-     Operations read only from the secondary members of the set. If no
-     secondaries are available, read operations will produce an exception.
-    </para>
-    <para>
-     Most sets have at least one secondary, but there are situations where
-     there may be no available secondary. For example, a set with a primary, a
-     secondary, and an arbiter may not have any secondaries if a member is in
-     recovering state or unavailable.
-    </para>
-    <para>
-     When the read preference includes a tag set, the client attempts to find
-     secondary members that match the specified tag set and directs reads to a
-     random secondary from among the nearest group. If no secondaries have
-     matching tags, the read operation will produce an exception.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_SECONDARY_PREFERRED</literal>
-    </para>
-    <para>
-     In most situations, operations read from secondary members, but in
-     situations where the set consists of a single primary with no other
-     members, the read operation will use the set's primary.
-    </para>
-    <para>
-     When the read preference includes a tag set, the client attempts to find a
-     secondary member that matches the specified tag set and directs reads to a
-     random secondary from among the nearest group. If no secondaries have
-     matching tags, the read operation will produce an exception.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_NEAREST</literal>
-    </para>
-    <para>
-     The driver reads from a <emphasis>random</emphasis> member of the set
-     that has a ping time that is less than 15ms slower than the member with
-     the lowest ping time. Reads in the
-     <literal>MongoClient::RP_NEAREST</literal> mode do not consider the
-     member's type and may read from both primaries and secondaries.
-    </para>
-    <para>
-     Set this mode to minimize the effect of network latency on read operations
-     without preference for current or stale data.
-    </para>
-    <para>
-     If you specify a tag set, the client attempts to find a member
-     that matches the specified tag set and directs reads to a random node
-     from among the nearest group.
-    </para>
-    <note>
-     <para>
-      All operations read from the nearest member of the replica set that
-      matches the specified read preference mode. The
-      <literal>MongoClient::RP_NEAREST</literal> mode prefers low latency reads
-      over a member's primary or secondary status.
-     </para>
-    </note>
-   </listitem>
-  </itemizedlist>
- </simplesect>
- <simplesect xml:id="mongo.readpreferences.tagsets">
-  <title>Tag Sets</title>
-  <para>
-   <link xlink:href="&url.mongodb.docs.tagsets;">Tag sets</link> allow you to
-   specify criteria so that your application can target read operations to
-   specific members, based on custom parameters. Tag sets make it possible to
-   ensure that read operations target members in a particular data center or
-   target mongod instances designated for a particular class of operations, such
-   as reporting or analytics.
-  </para>
-  <para>
-   You can specify tag sets with the following read preference modes:
-  </para>
-  <itemizedlist>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_PRIMARY_PREFERRED</literal>
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_SECONDARY</literal>
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_SECONDARY_PREFERRED</literal>
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>MongoClient::RP_NEAREST</literal>
-    </para>
-   </listitem>
-  </itemizedlist>
-  <para>
-   You cannot specify tag sets with the
-   <literal>MongoClient::RP_PRIMARY</literal> read preference mode. Tags apply
-   only when selecting a secondary member of a set, except for the when in the
-   nearest mode.
-  </para>
- </simplesect>
- <simplesect xml:id="mongo.readpreference.usage">
-  <title>Specifying Read Preferences</title>
-  <para>
-   Read preferences may be specified in either the connection URI provided to
-   <function>MongoClient::__construct</function>, which uses a query string
-   syntax, or via setter methods on the core classes, which use an array syntax
-   for tag sets.
-  </para>
-  <para>
-   When specifying read preference modes in a query string, the tag sets for
-   the <literal>readPreferenceTags</literal> value should be a comma-delimited
-   sequence of colon-delimited key/value pairs.
-  </para>
-  <note>
-   <para>
-    Each tag set defined in the query string will use the
-    <literal>readPreferenceTags</literal> name. Unlike how PHP might handle URL
-    query strings, successive values for <literal>readPreferenceTags</literal>
-    will not overwrite each other. The driver will collect tag sets in the order
-    they appear in the query string.
-   </para>
-  </note>
-  <warning>
-   <para>
-    If the driver cannot find a matching tag set the read will fail!  It is
-    your responsibility of providing suitable fallback, such as an empty
-    <literal>readPreferenceTags</literal> value to fallback to "no tag set
-    preference".
-   </para>
-  </warning>
-  <para>
-   <example>
-    <title>Connection URI read preferences with query string syntax</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Prefer the nearest server with no tag preference
-$uri  = 'mongodb://rs1.example.com,rs2.example.com/';
-$uri .= '?readPreference=nearest';
-$m = new MongoClient($uri, array('replicaSet' => 'rs'));
-
-// Pick the nearest server in the "east" data center
-$uri  = 'mongodb://rs1.example.com,rs2.example.com/';
-$uri .= '?readPreference=nearest';
-$uri .= '&readPreferenceTags=dc:east';
-$m = new MongoClient($uri, array('replicaSet' => 'rs'));
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$uri  = 'mongodb://rs1.example.com,rs2.example.com/';
-$uri .= '?readPreference=nearest';
-$uri .= '&readPreferenceTags=dc:east,use:reporting';
-$uri .= '&readPreferenceTags=dc:west';
-$m = new MongoClient($uri, array('replicaSet' => 'rs'));
-
-// Prefer the nearest server in the "east" data center, then a server in the
-// "west" data center, and finally fall back to no tag set preference
-$uri  = 'mongodb://rs1.example.com,rs2.example.com/';
-$uri .= '?readPreference=nearest';
-$uri .= '&readPreferenceTags=dc:east';
-$uri .= '&readPreferenceTags=dc:west';
-$uri .= '&readPreferenceTags=';
-$m = new MongoClient($uri, array('replicaSet' => 'rs'));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Setting read preferences with array syntax for tag sets</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$m = new MongoClient('mongodb://rs1.example.com,rs2.example.com', array(
-    'replicaSet' => 'rs',
-));
-
-// Prefer the nearest server with no tag preference
-$m->setReadPreference(MongoClient::RP_NEAREST, array());
-
-// Pick the nearest server in the "east" data center
-$m->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east'),
-));
-
-// Prefer the nearest server in the "east" data center also used for reporting,
-// but fall back to a server in the "west" data center
-$m->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east', 'use' => 'reporting'),
-    array('dc' => 'west'),
-));
-
-// Prefer the nearest server in the "east" data center, then a server in the
-// "west" data center, and finally fall back to no tag set preference
-$m->setReadPreference(MongoClient::RP_NEAREST, array(
-    array('dc' => 'east'),
-    array('dc' => 'west'),
-    array(),
-));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </simplesect>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/reference.xml b/reference/mongo/reference.xml
deleted file mode 100644
index 23a48bfb4f..0000000000
--- a/reference/mongo/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mongo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mongo &Functions;</title>
-
- &reference.mongo.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/security.xml b/reference/mongo/security.xml
deleted file mode 100644
index 7f453dc45a..0000000000
--- a/reference/mongo/security.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.security" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Security</title>
-
- <section>
-  <title>Request Injection Attacks</title>
-  <para>
-   If you are passing <literal>$_GET</literal> (or <literal>$_POST</literal>)
-   parameters to your queries, make sure that they are cast to strings first.
-   Users can insert associative arrays in GET and POST requests, which could
-   then become unwanted $-queries.
-  </para>
-
-  <para>
-   A fairly innocuous example: suppose you are looking up a user's information
-   with the request <emphasis>http://www.example.com?username=bob</emphasis>.
-   Your application does the query
-   <literal>$collection->find(array("username" => $_GET['username']))</literal>.
-  </para>
-
-  <para>
-   Someone could subvert this by getting
-   <emphasis>http://www.example.com?username[$ne]=foo</emphasis>, which PHP
-   will magically turn into an associative array, turning your query into
-   <literal>$collection->find(array("username" => array('$ne' => "foo")))</literal>,
-   which will return all users not named "foo" (all of your users, probably).
-  </para>
-
-  <para>
-   This is a fairly easy attack to defend against: make sure $_GET and $_POST
-   parameters are the type you expect before you send them to the database
-   (cast them to strings, in this case).
-  </para>
-
-  <para>
-   Note that this type of attack can be used with any databases interation that
-   locates a document, including updates, upserts, find-and-modifies, and
-   removes.
-  </para>
-
-  <para>
-   Thanks to <link xlink:href="&url.mongodb.injection;">Phil</link> for pointing this out.
-  </para>
-
-  <para>
-   See <link xlink:href="&url.mongodb.dochub.security;">the main documentation</link>
-   for more information about SQL-injection-like issues with MongoDB.
-  </para>
- </section>
-
- <section>
-  <title>Script Injection Attacks</title>
-  <para>
-   If you are using JavaScript, make sure that any variables that cross the PHP-
-   to-JavaScript boundry are passed in the <literal>scope</literal> field of
-   <classname>MongoCode</classname>, not interpolated into the JavaScript
-   string. This can come up when using <function>MongoDB::execute</function>,
-   <literal>$where</literal> clauses, MapReduces, group-bys, and any other time
-   you may pass JavaScript into the database.
-  </para>
-  <note>
-   <para>
-    MapReduce ignore the <literal>scope</literal> field of
-    <classname>MongoCode</classname>, but there is a <literal>scope</literal>
-    option on the command that can be used instead.
-   </para>
-  </note>
-  <para>
-   For example, suppose we have some JavaScript to greet a user in the database
-   logs.  We could do:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-// don't do this!
-
-$username = $_POST['username'];
-$db->execute("print('Hello, $username!');");
-
-?>
-]]>
-  </programlisting>
-  <para>
-   However, what if a malicious user passes in some JavaScript?
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-// don't do this!
-
-// $username is set to "'); db.users.drop(); print('"
-$db->execute("print('Hello, $username!');");
-
-?>
-]]>
-  </programlisting>
-  <para>
-   Now MongoDB executes the JavaScript string
-   <literal>"print('Hello, '); db.users.drop(); print('!');"</literal>.
-   This attack is easy to avoid: use <literal>scope</literal> to pass
-   variables from PHP to JavaScript:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$scope = array("user" => $username);
-$db->execute(new MongoCode("print('Hello, '+user+'!');", $scope));
-
-?>
-]]>
-  </programlisting>
-  <para>
-   This adds a variable <literal>user</literal> to the JavaScript scope. Now if
-   someone tries to send malicious code, MongoDB will harmlessly print
-   <literal>Hello, '); db.dropDatabase(); print('!</literal>.
-  </para>
-
-  <para>
-   Using <literal>scope</literal> helps prevent malicious input from being
-   executed by the database.  However, you must make sure that your code does
-   not turn around and execute the input anyway! For example, never use the
-   JavaScript <literal>eval</literal> function on user input:
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-// don't do this!
-
-// $jsShellInput is "db.users.drop();"
-$scope = array("input" => $jsShellInput);
-$db->execute(new MongoCode("eval(input);", $scope));
-
-?>
-]]>
-  </programlisting>
-  <para>
-   Always use <literal>scope</literal> and never allow the database to execute
-   user input as code.
-  </para>
- </section>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/setup.xml b/reference/mongo/setup.xml
deleted file mode 100644
index 25d3c5bb05..0000000000
--- a/reference/mongo/setup.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- &reftitle.setup;
-
- <warning>
-  &mongo.deprecated.note;
- </warning>
-
- <!-- {{{ Requirements -->
- <section xml:id="mongo.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.mongo.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.mongo.ini;
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/sqltomongo.xml b/reference/mongo/sqltomongo.xml
deleted file mode 100644
index 1e89dfd86d..0000000000
--- a/reference/mongo/sqltomongo.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="mongo.sqltomongo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>SQL to Mongo Mapping Chart</title>
- <para>
-  This is a PHP-specific version of the
-  <link xlink:href="&url.mongodb.dochub.sqltomongo;">SQL to Mongo</link>
-  mapping chart in the main docs.
- </para>
- <para>
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>SQL Statement</entry>
-      <entry>Mongo Query Language Statement</entry>
-     </row>
-    </thead>
-
-    <tbody>
-     <row>
-      <entry>
-       <literal>CREATE TABLE USERS (a Number, b Number)</literal>
-      </entry>
-      <entry>
-       Implicit or use <function>MongoDB::createCollection</function>.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>INSERT INTO USERS VALUES(1,1)</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->insert(array("a" => 1, "b" => 1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT a,b FROM users</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array(), array("a" => 1, "b" => 1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE age=33</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => 33));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT a,b FROM users WHERE age=33</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => 33), array("a" => 1, "b" => 1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT a,b FROM users WHERE age=33 ORDER BY name</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => 33), array("a" => 1, "b" => 1))->sort(array("name" => 1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE age>33</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => array('$gt' => 33)));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE age&lt;33</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => array('$lt' => 33)));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE name LIKE "%Joe%"</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("name" => new MongoRegex("/Joe/")));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE name LIKE "Joe%"</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("name" => new MongoRegex("/^Joe/")));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE age>33 AND age&lt;=40</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => array('$gt' => 33, '$lte' => 40)));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users ORDER BY name DESC</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find()->sort(array("name" => -1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>CREATE INDEX myindexname ON users(name)</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->ensureIndex(array("name" => 1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>CREATE INDEX myindexname ON users(name,ts DESC)</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->ensureIndex(array("name" => 1, "ts" => -1));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE a=1 and b='q'</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("a" => 1, "b" => "q"));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users LIMIT 20, 10</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find()->limit(10)->skip(20);</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users WHERE a=1 or b=2</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array('$or' => array(array("a" => 1), array("b" => 2))));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT * FROM users LIMIT 1</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find()->limit(1);</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>EXPLAIN SELECT * FROM users WHERE z=3</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("z" => 3))->explain()</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT DISTINCT last_name FROM users</literal>
-      </entry>
-      <entry>
-       <literal>$db->command(array("distinct" => "users", "key" => "last_name"));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT COUNT(*y) FROM users</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->count();</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT COUNT(*y) FROM users where AGE > 30</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => array('$gt' => 30)))->count();</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>SELECT COUNT(AGE) from users</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->find(array("age" => array('$exists' => true)))->count();</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>UPDATE users SET a=1 WHERE b='q'</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->update(array("b" => "q"), array('$set' => array("a" => 1)));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>UPDATE users SET a=a+2 WHERE b='q'</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->update(array("b" => "q"), array('$inc' => array("a" => 2)));</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>DELETE FROM users WHERE z="abc"</literal>
-      </entry>
-      <entry>
-       <literal>$db->users->remove(array("z" => "abc"));</literal>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </para>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/testing.xml b/reference/mongo/testing.xml
deleted file mode 100644
index 135f8b4133..0000000000
--- a/reference/mongo/testing.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.testing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Running the Driver's Tests</title>
-
- <para>
-  The PECL package does not come with the tests, but they are available at 
-  <link xlink:href="&url.mongodb.github;">Github</link>.
- </para>
-
- <section>
-  <title>.phpt Tests</title>
-  <para>
-   .phpt tests are the standard way of testing PHP extensions. After compiling
-   the MongoDB driver with "make" you can then issue "make test" to run the
-   tests. These tests require MongoDB to be working, and hence, you need to
-   configure the test suite itself.
-  </para>
-  <para>
-   There is more information on running the tests in the contributing
-   guidelines on 
-   <link xlink:href="https://github.com/mongodb/mongo-php-driver/blob/master/CONTRIBUTING.md#running-the-tests">GitHub</link>.
-  </para>
- </section>
-
- <section>
-  <title>Reporting Errors</title>
-  <para>
-   Please report any failures or errors in the 
-   <link xlink:href="&url.mongodb.jira;">bugtracker</link>.  There may be skipped 
-   tests, these are normal and can be ignored.
-  </para>
-  <para>
-   New tests are always welcome!  Please feel free to contribute new tests of any
-   type testing any functionality.
-  </para>
- </section>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/trouble.xml b/reference/mongo/trouble.xml
deleted file mode 100644
index 948e3d22c9..0000000000
--- a/reference/mongo/trouble.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.trouble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Troubleshooting</title>
-
- <para>
-  If you're having trouble, there are lots of resources you can turn to.
- </para>
-
- <itemizedlist>
-  <listitem>
-   <para>IRC</para>
-   <para>
-    The official MongoDB IRC room is irc.freenode.net/#mongodb.  This is the
-    fastest way to get help.
-   </para>
-  </listitem>
-  <listitem>
-   <para>Mailing List</para>
-   <para>
-    <link xlink:href="&url.mongodb.mailinglist;">MongoDB's mailing list</link>
-    is a good (and usually very fast) way to get answers to questions. 
-   </para>
-  </listitem>
-  <listitem>
-   <para>Bug Tracker</para>
-   <para>
-    Found a bug?  Want a feature?  Have a question?  File it in the 
-    <link xlink:href="&url.mongodb.jira;">PHP driver's bug tracker</link>.
-   </para>
-  </listitem>
- </itemizedlist>
-
- <para>
-  You can make the driver log all kinds of error messages as
-  <constant>E_NOTICE</constant> level PHP error messages. Have a look at 
-  the <classname>MongoLog</classname> for an example.
- </para>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/tutorial.xml b/reference/mongo/tutorial.xml
deleted file mode 100644
index d0ceb20edd..0000000000
--- a/reference/mongo/tutorial.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.tutorial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Tutorial</title>
- <warning>
-  &mongo.deprecated.note;
- </warning>
- <para>
-  This is the official MongoDB driver for PHP.
- </para>
- <para>Here's a quick code sample that connects, inserts documents, queries for
-  documents, iterates through query results, and disconnects from MongoDB.
-  There are more details on each step in the tutorial below.
- </para>
- <example xml:id="mongo.tutorial.basics">
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-// connect
-$m = new MongoClient();
-
-// select a database
-$db = $m->comedy;
-
-// select a collection (analogous to a relational database's table)
-$collection = $db->cartoons;
-
-// add a record
-$document = array( "title" => "Calvin and Hobbes", "author" => "Bill Watterson" );
-$collection->insert($document);
-
-// add another record, with a different "shape"
-$document = array( "title" => "XKCD", "online" => true );
-$collection->insert($document);
-
-// find everything in the collection
-$cursor = $collection->find();
-
-// iterate through the results
-foreach ($cursor as $document) {
-    echo $document["title"] . "\n";
-}
-
-?>
-]]>
-  </programlisting>
-  &example.outputs;
-  <screen>
-<![CDATA[
-Calvin and Hobbes
-XKCD
-]]>
-  </screen>
- </example>
-
-
- <section xml:id="mongo.tutorial.connecting">
-  <title>Making a Connection</title>
-  <para>
-   To connect to the database server, use one of the following:
-  </para>
-
-  <example xml:id="mongo.tutorial.connecting-example">
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient(); // connects to localhost:27017
-$connection = new MongoClient( "mongodb://example.com" ); // connect to a remote host (default port: 27017)
-$connection = new MongoClient( "mongodb://example.com:65432" ); // connect to a remote host at a given port
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   You do not have to explicitly disconnect from the database. The driver uses
-   persistent connections and will re-use already established connections.
-  </para>
-  <section xml:id="mongo.tutorial.connecting.seealso">
-   <title>See Also</title>
-   <para>
-    The chapter on <link linkend="mongo.connecting">connecting</link>
-    covers different types of connections.
-   </para>
-   <para>
-    The API documentation on the <classname>MongoClient</classname> class and
-    <function>MongoClient::__construct</function> give a comprehensive look at
-    all possible options with a number of examples.
-   </para>
-  </section>
- </section>
-
-  <section xml:id="mongo.tutorial.selectdb">
-   <title>Getting a Database</title>
-   <para>
-    To select a database, use:
-   </para>
-   <example xml:id="mongo.tutorial.selectdb-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$db = $connection->dbname;
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    The database does not need to be created in advance, you can create new
-    databases by selecting them.
-   </para>
-   <para>
-    Be careful of typos! You can inadvertently create a new database, which can
-    cause confusing errors (here <literal>name</literal> is misspelled as
-    <literal>anme</literal> in the second selection:
-
-    <example xml:id="mongo.tutorial.selectdb.typo">
-     <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-
-$db = $connection->mybiglongdbname;
-// do some stuff
-
-$db = $connection->mybiglongdbanme;
-// now connected to a different database!
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-   <section xml:id="mongo.tutorial.selectdb.seealso">
-    <title>See Also</title>
-    <para>
-     The API documentation on the <classname>MongoDB</classname> class contains
-     more information about database objects.
-    </para>
-   </section>
-  </section>
-
-  <section xml:id="mongo.tutorial.collection">
-   <title>Getting A Collection</title>
-   <para>
-    Getting a collection has the same syntax as getting a database:
-   </para>
-   <example xml:id="mongo.tutorial.collection-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$db = $connection->baz;
-
-// select a collection:
-$collection = $db->foobar;
-
-// or, directly selecting a database and collection:
-$collection = $connection->baz->foobar;
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    A collection is analogous to a table (if you are familiar with relational
-    databases).
-   </para>
-   <section xml:id="mongo.tutorial.collection.seealso">
-    <title>See Also</title>
-    <para>
-     The API documentation on the <classname>MongoCollection</classname> class
-     contains more information about collection objects.
-    </para>
-   </section>
-  </section>
-
-  <section xml:id="mongo.tutorial.insert">
-   <title>Inserting a Document</title>
-   <para>
-    Associative arrays are the basic object that can be saved to a collection in
-    the database. A somewhat random "document" might be:
-   </para>
-   <example xml:id="mongo.tutorial.insert-data-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$doc = array(
-    "name" => "MongoDB",
-    "type" => "database",
-    "count" => 1,
-    "info" => (object)array( "x" => 203, "y" => 102),
-    "versions" => array("0.9.7", "0.9.8", "0.9.9")
-);
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    Note that you can have nested arrays and objects. The driver will always
-    store an associative array as an object in the database. A
-    numerically indexed array is stored as an array in case the keys start at
-    0 and are not interrupted, and as an object if the array keys don't start
-    at 0 or have gaps (ie: <literal>0, 1, 4, 5</literal>).
-   </para>
-   <para>
-    To insert this document, use <function>MongoCollection::insert</function>:
-   </para>
-   <example xml:id="mongo.tutorial.insert-example-2">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$collection->insert( $doc );
-?>
-]]>
-    </programlisting>
-   </example>
-   <section xml:id="mongo.tutorial.insert.seealso">
-    <title>See Also</title>
-    <para>
-     The API documentation on <function>MongoCollection::insert</function>
-     contains more information about inserting data.
-    </para>
-   </section>
-  </section>
-
-  <section xml:id="mongo.tutorial.findone">
-   <title>
-    Finding Documents using <function>MongoCollection::findOne</function>
-   </title>
-   <para>
-    To show that the document we inserted in the previous step is stored in
-    the database, we can do a simple
-    <function>MongoCollection::findOne</function> operation to get a single
-    document from the collection. This method is useful when there is only one
-    document matching the query or you are only interested in one result.
-   </para>
-   <example xml:id="mongo.tutorial.findone-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$document = $collection->findOne();
-var_dump( $document );
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(6) {
-  ["_id"]=>
-  object(MongoId)#8 (1) {
-    ["$id"]=>
-    string(24) "4e2995576803fab768000000"
-  }
-  ["name"]=>
-  string(7) "MongoDB"
-  ["type"]=>
-  string(8) "database"
-  ["count"]=>
-  int(1)
-  ["info"]=>
-  array(2) {
-    ["x"]=>
-    int(203)
-    ["y"]=>
-    int(102)
-  }
-  ["versions"]=>
-  array(3) {
-    [0]=>
-    string(5) "0.9.7"
-    [1]=>
-    string(5) "0.9.8"
-    [2]=>
-    string(5) "0.9.9"
-  }
-}
-]]>
-    </screen>
-   </example>
-   <para>
-    Note that there is an <literal>_id</literal> field that has been added
-    automatically to your document. <literal>_id</literal> is the "primary key"
-    field.  If your document does not specify one, the driver will add one
-    automatically.
-   </para>
-   <para>
-    If you specify your own <literal>_id</literal> field, it must be unique to
-    the collection.  See the example here:
-   </para>
-   <example xml:id="mongo.tutorial.findone-example-2">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$db = $connection->database;
-
-$db->foo->insert(array("_id" => 1));
-// this will throw an exception
-$db->foo->insert(array("_id" => 1));
-
-// this is fine, as it is a different collection
-$db->bar->insert(array("_id" => 1));
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    By default the driver will ensure the server has acknowledged the write
-    before returning. You can optionally turn this behaviour off by passing
-    <literal>array("w" => 0)</literal> as the second argument. This means that
-    the driver should not wait for the database to acknowledge the write and
-    would not throw the duplicate <literal>_id</literal> exception.
-   </para>
-   <section xml:id="mongo.tutorial.findone.seealso">
-    <title>See Also</title>
-    <para>
-     <function>MongoCollection::findOne</function> for more information about
-     finding data.
-    </para>
-    <para>
-     <classname>MongoId</classname> goes into more detail on unique ids.
-    </para>
-    <para>
-     The <link linkend="mongo.writes">writes</link> section covers
-     writes in more depth, and the <xref linkend="mongo.writeconcerns" />
-     chapter goes into details of the various Write Concern options.
-    </para>
-   </section>
-  </section>
-
-  <section xml:id="mongo.tutorial.insert.multiple">
-   <title>Adding Multiple Documents</title>
-   <para>
-    In order to do more interesting things with queries, let's add multiple
-    simple documents to the collection. These documents will just be of the form
-    <literal>array( "i" => <replaceable>value</replaceable> );</literal> and we
-    can do this fairly efficiently in a loop:
-   </para>
-   <example xml:id="mongo.tutorial.insert.multiple-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-for ( $i = 0; $i < 100; $i++ )
-{
-    $collection->insert( array( 'i' => $i, "field{$i}" => $i * 2 ) );
-}
-?>
-]]>
-    </programlisting>
-   </example>
-
-   <para>
-    Notice that we can insert arrays with different keys into the same
-    collection. This aspect is what we mean when we say that MongoDB is
-    "schema-free". In the example above each document has an
-    <literal>i</literal> field, but also a field name in the form of
-    <literal>field</literal> + <literal>$i</literal>.
-   </para>
-  </section>
-
-  <section xml:id="mongo.tutorial.counting">
-   <title>Counting Documents in A Collection</title>
-   <para>
-    Now that we've inserted 101 documents (the 100 we did in the loop, plus the
-    first one), we can check to see if we have them all using the
-    <function>MongoCollection::count</function> method.
-    <example xml:id="mongo.tutorial.counting-example">
-     <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-echo $collection->count();
-?>
-]]>
-     </programlisting>
-    </example>
-    and it should print 101.
-   </para>
-  </section>
-
-  <section xml:id="mongo.tutorial.cursor">
-   <title>Using a Cursor to Get All of the Documents</title>
-   <para>
-    In order to get all the documents in the collection, we will use
-    <function>MongoCollection::find</function>. The find() method returns a
-    <classname>MongoCursor</classname> object which allows us to iterate over the
-    set of documents that matched our query. So to query all of the documents and
-    print them out:
-
-    <example xml:id="mongo.tutorial.cursor-example">
-     <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$cursor = $collection->find();
-foreach ( $cursor as $id => $value )
-{
-    echo "$id: ";
-    var_dump( $value );
-}
-?>
-]]>
-     </programlisting>
-    </example>
-
-    and that should print all 101 documents in the collection.
-    <literal>$id</literal> is the <literal>_id</literal> field of a document
-    (cast to a string) and <literal>$value</literal> is the document itself.
-   </para>
-   <section xml:id="mongo.tutorial.cursor.seealso">
-    <title>See Also</title>
-    <para>
-     The API documentation on <function>MongoCollection::find</function>
-     contains more information about finding data.
-    </para>
-   </section>
-  </section>
-
-  <section xml:id="mongo.tutorial.criteria">
-   <title>Setting Criteria for a Query</title>
-   <para>
-    We can create a query to pass to the
-    <function>MongoCollection::find</function> method to get a subset of the
-    documents in our collection. For example, if we wanted to find the document
-    for which the value of the <literal>"i"</literal> field is
-    <literal>71</literal>, we would do the following:
-   </para>
-   <example xml:id="mongo.tutorial.criteria-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$query = array( 'i' => 71 );
-$cursor = $collection->find( $query );
-
-while ( $cursor->hasNext() )
-{
-    var_dump( $cursor->getNext() );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["_id"]=>
-  object(MongoId)#6 (0) {
-  }
-  ["i"]=>
-  int(71)
-  ["_ns"]=>
-  "testCollection"
-}
-]]>
-    </screen>
-   </example>
-  </section>
-
-  <section xml:id="mongo.tutorial.multi.query">
-   <title>Getting A Set of Documents With a Query</title>
-   <para>
-    We can use the query to get a set of documents from our collection. For
-    example, if we wanted to get all documents where <literal>"i"</literal>
-    &gt; <literal>50</literal>, we could write:
-   </para>
-   <example xml:id="mongo.tutorial.multi.query-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$query = array( "i" => array( '$gt' => 50 ) ); //note the single quotes around '$gt'
-$cursor = $collection->find( $query );
-
-while ( $cursor->hasNext() )
-{
-    var_dump( $cursor->getNext() );
-}
-?>
-]]>
-    </programlisting>
-    <para>
-     which should print the documents where <literal>"i"</literal> &gt;
-     <literal>50</literal>. We could also get a range, say
-     <literal>20 &lt; i &lt;= 30</literal>:
-    </para>
-    <screen>
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$query = array( 'i' => array( '$gt' => 20, "\$lte" => 30 ) );
-$cursor = $collection->find( $query );
-
-while ( $cursor->hasNext() )
-{
-    var_dump( $cursor->getNext() );
-}
-?>
-]]>
-    </screen>
-   </example>
-   <para>
-    Remember to always escape the $-symbol or use single quotes.  Otherwise PHP
-    will interpret it to be the variable <varname>$gt</varname>.
-   </para>
-  </section>
-
-  <section xml:id="mongo.tutorial.indexes">
-   <title>Creating An Index</title>
-   <para>
-    MongoDB supports indexes, and they are very easy to add on a collection. To
-    create an index, you specify the field name and direction: ascending (1) or
-    descending (-1). The following creates an ascending index on the "i" field:
-   </para>
-   <example xml:id="mongo.tutorial.indexes-example">
-    <programlisting role="php">
-<![CDATA[
-<?php
-$connection = new MongoClient();
-$collection = $connection->database->collectionName;
-
-$collection->ensureIndex( array( "i" => 1 ) );  // create index on "i"
-$collection->ensureIndex( array( "i" => -1, "j" => 1 ) );  // index on "i" descending, "j" ascending
-?>
-]]>
-    </programlisting>
-   </example>
-   <para>
-    Indexing is critical for good read performance as your data grows.  If you
-    are not familiar with indexing, check out the
-    <function>MongoCollection::ensureIndex</function> documentation and the core
-    <link xlink:href="&url.mongodb.dochub.indexes;">MongoDB indexing documentation</link>.
-   </para>
-  </section>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/types.xml b/reference/mongo/types.xml
deleted file mode 100644
index ffc191da08..0000000000
--- a/reference/mongo/types.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<part xml:id="mongo.types" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <title>Types</title>
-
- <partintro>
-  <section>
-   <para>
-    MongoDB allows programmers to save and query for data expressed in all of the
-    basic PHP types, compound types (arrays, associative arrays, and objects), and
-    a half-dozen classes provided by the MongoDB PHP driver (for regular
-    expressions, dates, and other specialized applications).
-   </para>
-  </section>
-
-  <section>
-   <title>Booleans and &null;</title>
-   <para>
-    &true;, &false;, and &null; can be used as-is.
-   </para>
-  </section>
-
-  <section>
-   <title>Numbers</title>
-   <para>
-    Numbers are distinct from strings in MongoDB: "123" does not match 123.
-    Thus, if you want to make sure numbers are sorted and matched correctly, you
-    must make sure that they are actually saved as numbers.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$doc = array("a" => 123, "b" => "123");
-$collection->insert($doc);
-
-$doc->find(array("a" => 123));   // matches
-$doc->find(array("a" => "123")); // doesn't match
-$doc->find(array("a" => 123.0)); // matches
-$doc->find(array("b" => 123));   // doesn't match
-$doc->find(array("b" => "123")); // matches
-
-?>
-]]>
-   </programlisting>
-   <para>
-    As noted above, floating point numbers do compare with/match integer numbers
-    as one would expect.
-   </para>
-   <section>
-    <title>Large Numbers</title>
-    <para>
-     By default, on a 32-bit system, numbers are sent to the database as 32-bit
-     integers. On a 64-bit system, they are sent as 64-bit integers.  For
-     backwards compatibility, all systems deserialize 64-bit integers as floating
-     point numbers.  Floating point numbers are not exact.  If you need exact
-     values, you must tweak your
-     <link linkend="mongo.configuration">php.ini settings</link>.
-    </para>
-    <para>
-     On a 32-bit system, if <literal>mongo.long_as_object</literal> is set,
-     64-bit integers will be returns as <classname>MongoInt64</classname>
-     objects.  The integer will be stored in the <literal>value</literal> field
-     with perfect precision (as a string). You can also use
-     <classname>MongoInt64</classname> to save 64-bit integers on 32-bit
-     machines.
-    </para>
-    <para>
-     On 64-bit systems, you can either set <literal>mongo.long_as_object</literal>
-     or set <literal>mongo.native_long</literal>.
-     <literal>mongo.native_long</literal> will return 64-bit integers and
-     "normal" PHP integers.  You can use <classname>MongoInt32</classname> to
-     save 32-bit integers on 64-bit machines.
-    </para>
-    <para>
-     You should set the <literal>mongo.long_as_object</literal> and
-     <literal>mongo.native_long</literal> behavior that you plan to use, even if
-     it is the default behavior (to protect against future changes to the
-     defaults).
-    </para>
-    <para>
-     See also: <link linkend="mongo.configuration">php.ini Options</link>,
-     <classname>MongoInt32</classname>, <classname>MongoInt64</classname>.
-    </para>
-   </section>
-  </section>
-
-  <section>
-   <title>Strings</title>
-   <para>
-    Strings must be UTF-8. Non-UTF-8 strings must either be converted to UTF-8
-    before being sent to the database or saved as binary data.
-   </para>
-   <para>
-    Regular expressions can be used to match strings, and are expressed using the
-    <classname>MongoRegex</classname> class.
-   </para>
-  </section>
-
-  <section>
-   <title>Binary Data</title>
-   <para>
-    Non-UTF-8 strings, images, and any other binary data should be sent to the
-    database using the <classname>MongoBinData</classname> type.
-   </para>
-  </section>
-
-  <section>
-   <title>Dates</title>
-   <para>
-    Dates can be created using the <classname>MongoDate</classname> class.  They
-    are stored as milliseconds since the epoch.
-   </para>
-   <para>
-    <classname>MongoTimestamp</classname> is not for saving dates or timestamps,
-    it is used internally by MongoDB.  Unless you are creating a tool that
-    interacts with the internals of replication or sharding, you should use
-    <classname>MongoDate</classname>, <emphasis>not</emphasis>
-    <classname>MongoTimestamp</classname>.
-   </para>
-  </section>
-
-  <section>
-   <title>Unique Ids</title>
-   <para>
-    The driver will automatically create an <literal>_id</literal> field before
-    inserting a document (unless one is specified by the user).  This field is an
-    instance of <classname>MongoId</classname> (called "ObjectId" in most other
-    languages).
-   </para>
-   <para>
-    These ids are 12 bytes long and composed of:
-    <itemizedlist>
-     <listitem>
-      <para>4 bytes of timestamp</para>
-      <para>
-       No two records can have the same id if they were inserted at different
-       times.
-      </para>
-     </listitem>
-     <listitem>
-      <para>3 bytes machine id</para>
-      <para>
-       No two records can have the same id if they were inserted on different
-       machines
-      </para>
-     </listitem>
-     <listitem>
-      <para>2 bytes thread id</para>
-      <para>
-       No two records can have the same id if they were inserted by different
-       threads running on the same machine.
-      </para>
-     </listitem>
-     <listitem>
-      <para>3 bytes incrementing value</para>
-      <para>
-       Each time an id is created, a global counter is incremented and used
-       as the increment value of the next id.
-      </para>
-     </listitem>
-    </itemizedlist>
-    Thus, no two records can have the same id unless a single process on a
-    single machine managed to insert 256^3 (over 16 million) documents in
-    one second, overflowing the increment field.
-   </para>
-  </section>
-
-  <section>
-   <title>JavaScript</title>
-   <para>
-    MongoDB comes with a JavaScript engine, so you can embed JavaScript in
-    queries (using a $where clause), send it directly to the database to be
-    executed, and use it to perform aggregations.
-   </para>
-   <para>
-    For security, use <classname>MongoCode</classname>'s <literal>scope</literal>
-    field to use PHP variables in JavaScript.  Code that does not require
-    external values can either use <classname>MongoCode</classname> or just be
-    a string.  See the
-    <link linkend="mongo.security">section on security</link> for more
-    information about sending JavaScript to the database.
-   </para>
-  </section>
-
-  <section>
-   <title>Arrays and Objects</title>
-
-   <para>
-    Arrays and objects can also be saved to the database.  An array with ascending
-    numeric keys will be saved as a an array, anything else will be saved as an
-    object.
-   </para>
-
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// $scores will be saved as an array
-$scores = array(98, 100, 73, 85);
-$collection->insert(array("scores" => $scores));
-
-// $scores will be saved as an object
-$scores = array("quiz1" => 98, "midterm" => 100, "quiz2" => 73, "final" => 85);
-$collection->insert(array("scores" => $scores));
-
-?>
-]]>
-   </programlisting>
-
-   <para>
-    If you query for these objects using the database shell, they will look like:
-    <programlisting role="shell">
-<![CDATA[
-> db.students.find()
-{ "_id" : ObjectId("4b06beada9ad6390dab17c43"), "scores" : [ 98, 100, 73, 85 ] }
-{ "_id" : ObjectId("4b06bebea9ad6390dab17c44"), "scores" : { "quiz1" : 98, "midterm" : 100, "quiz2" : 73, "final" : 85 } }
-]]>
-    </programlisting>
-   </para>
-
-   <para>
-    The database can also save arbitrary PHP objects (although they will be
-    returned as associative arrays).  The fields are used for the key/value
-    pairs.  For example, a blog post might look like:
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-  // the blog post class
-  class Post {
-
-  var $author;
-  var $content;
-  var $comments = array();
-  var $date;
-
-  public function __construct($author, $content) {
-  $this->author = $author;
-$this->content = $content;
-    $this->date = new MongoDate();
-  }
-
-  public function setTitle($title) {
-    $this->title = $title;
-  }
-}
-
-// create a simple blog post and insert it into the database
-$post1 = new Post("Adam", "This is a blog post");
-
-$blog->insert($post1);
-
-
-// there is nothing restricting the type of the "author" field, so we can make
-// it a nested object
-$author = array("name" => "Fred", "karma" => 42);
-$post2 = new Post($author, "This is another blog post.");
-
-// we create an extra field by setting the title
-$post2->setTitle("Second Post");
-
-$blog->insert($post2);
-
-?>
-]]>
-    </programlisting>
-   </para>
-
-   <para>
-    From the database shell, this will look something like:
-    <programlisting role="shell">
-<![CDATA[
-> db.blog.find()
-{ "_id" : ObjectId("4b06c263edb87a281e09dad8"), "author" : "Adam", "content" : "This is a blog post", "comments" : [ ], "date" : "Fri Nov 20 2009 11:22:59 GMT-0500 (EST)" }
-{ "_id" : ObjectId("4b06c282edb87a281e09dad9"), "author" : { "name" : "Fred", "karma" : 42 }, "content" : "This is a blog post", "comments" : [ ], "date" : "Fri Nov 20 2009 11:23:30 GMT-0500 (EST)", "title" : "Second Post" }
-]]>
-    </programlisting>
-   </para>
-
-   <para>
-    The driver will not detect reference loops in arrays and objects.  For
-    example, this will give a fatal error:
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$collection->insert($GLOBALS);
-
-?>
-]]>
-    </programlisting>
-    <programlisting role="txt">
-<![CDATA[
-Fatal error: Nesting level too deep - recursive dependency?
-]]>
-    </programlisting>
-    If you need to insert documents that may have recursive dependency, you have
-    to check for it yourself before passing it to the driver.
-   </para>
-  </section>
- </partintro>
- &reference.mongo.mongoid;
- &reference.mongo.mongocode;
- &reference.mongo.mongodate;
- &reference.mongo.mongoregex;
- &reference.mongo.mongobindata;
- &reference.mongo.mongoint32;
- &reference.mongo.mongoint64;
- &reference.mongo.mongodbref;
- &reference.mongo.mongominkey;
- &reference.mongo.mongomaxkey;
- &reference.mongo.mongotimestamp;
-
-</part>
diff --git a/reference/mongo/updates.xml b/reference/mongo/updates.xml
deleted file mode 100644
index 1d4bc2eb94..0000000000
--- a/reference/mongo/updates.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.updates" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Updates</title>
-
- <para>
-  Updates can be one of the most complicated operation available with 
-  MongoDB.  They combine a query with an action, modifying documents that match
-  the criteria.  They are also extremely powerful, allowing you to change 
-  documents quickly and replace them altogether.  They are done in-place (when 
-  possible) with little overhead. 
- </para>
-
- <section>
-  <title>Modifying vs. replacing documents</title>
-
-  <para>
-   There are two types of updates you can use: modifying updates and replacing
-   updates.  Modifying updates contain $-operators and change fields in a 
-   document: they might increment counters, push new elements onto an array, 
-   or change the type of a field.
-  </para>
-
-  <para>
-   For example, a modifying update could add a new field to a document.
-   <programlisting role="php">
-<![CDATA[
-<?php
-/** suppose documents look like:
- * {"username" : "...", "password" : "...", "email" : "..."}
- */
-$coll->update(array("username" => "joe"), array('$set' => array("twitter" => "@joe4153")));
-
-/** now the document will look like:
- * {"username" : "joe", "password" : "...", "email" : "...", "twitter" : "@joe4153"}
- */
-?>
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   Replacing updates replace the entire matching document with a new document.
-   They are generally not as efficient as using $-modifiers, but can be very
-   usefully for complex operations or updates that can't be expressed in terms
-   of $-operators.
-  </para>
-
-  <para>
-   For example, a replacing update can completely change the structure of a
-   document.
-   <programlisting role="php">
-<![CDATA[
-<?php
-/** suppose documents look like:
- * {"username" : "...", "password" : "...", "email" : "..."}
- */
-$coll->update(array("username" => "joe"), array("userId" => 12345, "info" => array(
-    "name" => "joe", "twitter" => "@joe4153", "email" => "..."), "likes" => array()));
-
-/** now the document will look like:
- * {
- *     "userId" : 12345, 
- *     "info" : {
- *         "name" : "joe", 
- *         "twitter" : "@joe4153", 
- *         "email" : "..."
- *     },
- *     "likes" : []
- * }
- */
-?>
-]]>
-   </programlisting>
-  </para>
-
- </section>
-
- <section>
-  <title>Updating Nested Objects</title>
-
-  <para>
-   Suppose we wish to change the name of a comment's author in this document:
-
-   <programlisting role="javascript">
-<![CDATA[
-{ 
-    "_id" : ObjectId("4b06c282edb87a281e09dad9"), 
-    "content" : "this is a blog post.",
-    "comments" : 
-    [
-        {
-            "author" : "Mike",
-            "comment" : "I think that blah blah blah...",
-        },
-        {
-            "author" : "John",
-            "comment" : "I disagree."
-        }
-    ]
-}
-]]>
-   </programlisting>
-
-   In order to change an inner field, we use $set (so that all of the other 
-   fields are not removed!) with the index of comment to change:
-
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$blog->update($criteria, array('$set' => array("comments.1" => array("author" => "Jim"))));
-
-?>
-]]>
-   </programlisting>
-  </para>
- </section>
-
- <section>
-  <title>The Positional Operator</title>
-  <para>
-   The positional operator <literal>$</literal> is useful for updating objects 
-   that are in arrays.  In the example above, for instance, suppose that we did
-   not know the index of the comment that we needed to change, merely that we
-   needed to change "John" to "Jim".  We can use <literal>$</literal> to do so.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$blog->update(
-    array("comments.author" => "John"), 
-    array('$set' => array('comments.$.author' => "Jim")));
-
-?>
-]]>
-  </programlisting>
- </section>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/versions.xml b/reference/mongo/versions.xml
deleted file mode 100644
index bc89f67668..0000000000
--- a/reference/mongo/versions.xml
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions>
- <function name='bson_encode' from='PECL mongo &gt;=1.0.1'/>
- <function name='bson_decode' from='PECL mongo &gt;=1.0.1'/>
- <!-- Methods -->
- <!-- {{{ MongoClient -->
- <function name='mongoclient' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::__construct' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::__toString' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::__get' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::close' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::connect' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::dropDB' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::getconnections' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::gethosts' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::getreadpreference' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::getwriteconcern' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongoclient::killcursor' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongoclient::listDBs' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::selectCollection' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::selectDB' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::setreadpreference' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoclient::setwriteconcern' from='PECL mongo &gt;=1.5.0'/>
- <!-- }}} -->
-
- <!-- {{{ Mongo -->
- <function name='mongo' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongo::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongo::connectUtil' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongo::setslaveokay' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongo::getslaveokay' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongo::getslave' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongo::switchslave' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongo::getpoolsize' from='PECL mongo &gt;=1.2.0'/>
- <function name='mongo::pooldebug' from='PECL mongo &gt;=1.2.0'/>
- <function name='mongo::setpoolsize' from='PECL mongo &gt;=1.2.0'/>
- <!-- }}} -->
- <!-- {{{ MongoDB -->
- <function name='mongodb' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::__get' from='PECL mongo &gt;=1.0.2'/>
- <function name='mongodb::__tostring' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::authenticate' from='PECL mongo &gt;=1.0.1'/>
- <function name='mongodb::command' from='PECL mongo &gt;=0.9.2'/>
- <function name='mongodb::createcollection' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::createdbref' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::drop' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::dropcollection' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::execute' from='PECL mongo &gt;=0.9.3'/>
- <function name='mongodb::forceerror' from='PECL mongo &gt;=0.9.5'/>
- <function name='mongodb::getcollectionnames' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongodb::getcollectioninfo' from='PECL mongo &gt;=1.6.0'/>
- <function name='mongodb::getdbref' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::getgridfs' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::getname' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::getprofilinglevel' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::getreadpreference' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongodb::getslaveokay' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongodb::getwriteconcern' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongodb::lasterror' from='PECL mongo &gt;=0.9.5'/>
- <function name='mongodb::listcollections' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::preverror' from='PECL mongo &gt;=0.9.5'/>
- <function name='mongodb::repair' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::reseterror' from='PECL mongo &gt;=0.9.5'/>
- <function name='mongodb::selectcollection' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::setprofilinglevel' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodb::setreadpreference' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongodb::setslaveokay' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongodb::setwriteconcern' from='PECL mongo &gt;=1.5.0'/>
- <!-- }}} -->
- <!-- {{{ MongoCollection -->
- <function name='mongocollection' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::__get' from='PECL mongo &gt;=1.0.2'/>
- <function name='mongocollection::__tostring' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::aggregate' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongocollection::aggregatecursor' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocollection::batchinsert' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::count' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::createdbref' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::createindex' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocollection::deleteindex' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::deleteindexes' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::distinct' from='PECL mongo &gt;=1.2.11'/>
- <function name='mongocollection::drop' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::ensureindex' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::find' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::findAndModify' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongocollection::findone' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::getdbref' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::getindexinfo' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::getname' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::getreadpreference' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongocollection::getslaveokay' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongocollection::getwriteconcern' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocollection::group' from='PECL mongo &gt;=0.9.2'/>
- <function name='mongocollection::insert' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::parallelcollectionscan' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocollection::remove' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::save' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::setreadpreference' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongocollection::setslaveokay' from='PECL mongo &gt;=1.1.0'/>
- <function name='mongocollection::setwriteconcern' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocollection::toindexstring' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::update' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocollection::validate' from='PECL mongo &gt;=0.9.0'/>
- <!-- }}} -->
- <!-- {{{ MongoCursor -->
- <function name='mongocursor' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::addoption' from='PECL mongo &gt;=1.0.4'/>
- <function name='mongocursor::awaitdata' from='PECL mongo &gt;=1.2.11'/>
- <function name='mongocursor::batchSize' from='PECL mongo &gt;=1.0.11'/>
- <function name='mongocursor::count' from='PECL mongo &gt;=0.9.2'/>
- <function name='mongocursor::current' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::dead' from='PECL mongo &gt;=0.9.6'/>
- <function name='mongocursor::doquery' from='PECL mongo &gt;=0.9.0 &lt;1.6.0'/>
- <function name='mongocursor::explain' from='PECL mongo &gt;=0.9.2'/>
- <function name='mongocursor::fields' from='PECL mongo &gt;=1.0.6'/>
- <function name='mongocursor::getnext' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::getreadpreference' from='PECL mongo &gt;=1.3.3'/>
- <function name='mongocursor::hasnext' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::hint' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::immortal' from='PECL mongo &gt;=1.0.1'/>
- <function name='mongocursor::info' from='PECL mongo &gt;=1.0.5'/>
- <function name='mongocursor::key' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::limit' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::maxtimems' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocursor::next' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::partial' from='PECL mongo &gt;=1.2.0'/>
- <function name='mongocursor::reset' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::rewind' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::setflag' from='PECL mongo &gt;=1.2.11'/>
- <function name='mongocursor::setreadpreference' from='PECL mongo &gt;=1.3.3'/>
- <function name='mongocursor::skip' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::slaveokay' from='PECL mongo &gt;=0.9.4'/>
- <function name='mongocursor::snapshot' from='PECL mongo &gt;=0.9.4'/>
- <function name='mongocursor::sort' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongocursor::tailable' from='PECL mongo &gt;=0.9.4'/>
- <function name='mongocursor::timeout' from='PECL mongo &gt;=1.0.3'/>
- <function name='mongocursor::valid' from='PECL mongo &gt;=0.9.0'/>
- <!-- }}} -->
- <!-- {{{ MongoCursorInterface -->
- <function name='mongocursorinterface' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocursorinterface::batchSize' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocursorinterface::dead' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocursorinterface::getreadpreference' from='PECL mongo &gt;=1.6.0'/>
- <function name='mongocursorinterface::info' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocursorinterface::setreadpreference' from='PECL mongo &gt;=1.6.0'/>
- <function name='mongocursorinterface::timeout' from='PECL mongo &gt;=1.5.0'/>
- <!-- }}} -->
- <!-- {{{ MongoCommandCursor -->
- <function name='mongocommandcursor' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::__construct' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::batchsize' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::createfromdocument' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::current' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::dead' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::getreadpreference' from='PECL mongo &gt;=1.6.0'/>
- <function name='mongocommandcursor::info' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::key' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::next' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::rewind' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongocommandcursor::setreadpreference' from='PECL mongo &gt;=1.6.0'/>
- <function name='mongocommandcursor::timeout' from='PECL mongo &gt;=1.6.0'/>
- <function name='mongocommandcursor::valid' from='PECL mongo &gt;=1.5.0'/>
- <!-- }}} -->
- <!-- {{{ MongoGridFS -->
- <function name='mongogridfs' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::delete' from='PECL mongo &gt;=1.0.8'/>
- <function name='mongogridfs::drop' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::find' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::findone' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::get' from='PECL mongo &gt;=1.0.8'/>
- <function name='mongogridfs::put' from='PECL mongo &gt;=1.0.8'/>
- <function name='mongogridfs::remove' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::storebytes' from='PECL mongo &gt;=0.9.2'/>
- <function name='mongogridfs::storefile' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfs::storeupload' from='PECL mongo &gt;=0.9.0'/>
- <!-- }}} -->
- <!-- {{{ MongoGridFSFile -->
- <function name='mongogridfsfile' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfsfile::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfsfile::getbytes' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfsfile::getfilename' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfsfile::getresource' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongogridfsfile::getsize' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfsfile::write' from='PECL mongo &gt;=0.9.0'/>
- <!-- }}} -->
- <!-- {{{ MongoGridFSCursor -->
- <function name='mongogridfscursor' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfscursor::__construct' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfscursor::current' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfscursor::getnext' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongogridfscursor::key' from='PECL mongo &gt;=0.9.0'/>
- <!-- }}} -->
-
- <!-- {{{ MongoLog -->
- <function name='mongolog' from='PECL mongo &gt;=1.2.3'/>
- <function name='mongolog::getcallback' from='PECL mongo &gt;= 1.3.0'/>
- <function name='mongolog::getlevel' from='PECL mongo &gt;= 1.2.3'/>
- <function name='mongolog::getmodule' from='PECL mongo &gt;= 1.2.3'/>
- <function name='mongolog::setcallback' from='PECL mongo &gt;= 1.3.0'/>
- <function name='mongolog::setlevel' from='PECL mongo &gt;= 1.2.3'/>
- <function name='mongolog::setmodule' from='PECL mongo &gt;= 1.2.3'/>
- <!-- }}} -->
-
-
- <!-- {{{ MongoId -->
- <function name='mongoid' from='PECL mongo &gt;=0.8.0'/>
- <function name='mongoid::__construct' from='PECL mongo &gt;= 0.8.0'/>
- <function name='mongoid::__set_state' from='PECL mongo &gt;= 1.0.8'/>
- <function name='mongoid::__tostring' from='PECL mongo &gt;= 0.8.0'/>
- <function name='mongoid::getHostname' from='PECL mongo &gt;= 1.0.8'/>
- <function name='mongoid::getInc' from='PECL mongo &gt;= 1.0.11'/>
- <function name='mongoid::getPID' from='PECL mongo &gt;= 1.0.11'/>
- <function name='mongoid::getTimestamp' from='PECL mongo &gt;= 1.0.1'/>
- <function name='mongoid::isValid' from='PECL mongo &gt;= 1.5.0'/>
- <!-- }}} -->
- <!-- {{{ MongoRegex -->
- <function name='mongoregex' from='PECL mongo &gt;=0.8.1'/>
- <function name='mongoregex::__construct' from='PECL mongo &gt;= 0.8.1'/>
- <function name='mongoregex::__tostring' from='PECL mongo &gt;= 0.8.1'/>
- <!-- }}} -->
- <!-- {{{ MongoDate -->
- <function name='mongodate' from='PECL mongo &gt;=0.8.1'/>
- <function name='mongodate::__construct' from='PECL mongo &gt;= 0.8.1'/>
- <function name='mongodate::__tostring' from='PECL mongo &gt;= 0.8.1'/>
- <function name='mongodate::todatetime' from='PECL mongo &gt;= 1.6.0'/>
- <!-- }}} -->
- <!-- {{{ MongoBinData -->
- <function name='mongodbbindata' from='PECL mongo &gt;=0.8.1'/>
- <function name='mongobindata::__construct' from='PECL mongo &gt;= 0.8.1'/>
- <function name='mongobindata::__tostring' from='PECL mongo &gt;= 0.8.1'/>
- <!-- }}} -->
- <!-- {{{ MongoCode -->
- <function name='mongocode' from='PECL mongo &gt;=0.8.3'/>
- <function name='mongocode::__construct' from='PECL mongo &gt;= 0.8.3'/>
- <function name='mongocode::__tostring' from='PECL mongo &gt;= 0.8.3'/>
- <!-- }}} -->
- <!-- {{{ MongoTimestamp -->
- <function name='mongotimestamp' from='PECL mongo &gt;=1.0.1'/>
- <function name='mongotimestamp::__construct' from='PECL mongo &gt;= 1.0.1'/>
- <function name='mongotimestamp::__tostring' from='PECL mongo &gt;= 1.0.1'/>
- <!-- }}} -->
- <!-- {{{ MongoDBRef -->
- <function name='mongodbref' from='PECL mongo &gt;=0.9.0'/>
- <function name='mongodbref::create' from='PECL mongo &gt;= 0.9.0'/>
- <function name='mongodbref::get' from='PECL mongo &gt;= 0.9.0'/>
- <function name='mongodbref::isref' from='PECL mongo &gt;= 0.9.0'/>
- <!-- }}} -->
- <!-- {{{ MongoInt32 -->
- <function name='mongoint32' from='PECL mongo &gt;=1.0.9'/>
- <function name='mongoint32::__construct' from='PECL mongo &gt;= 1.0.9'/>
- <function name='mongoint32::__tostring' from='PECL mongo &gt;= 1.0.9'/>
- <!-- }}} -->
- <!-- {{{ MongoInt64 -->
- <function name='mongoint64' from='PECL mongo &gt;=1.0.9'/>
- <function name='mongoint64::__construct' from='PECL mongo &gt;= 1.0.9'/>
- <function name='mongoint64::__tostring' from='PECL mongo &gt;= 1.0.9'/>
- <!-- }}} -->
-
- <function name='mongominkey' from='PECL mongo &gt;= 1.0.2'/>
- <function name='mongomaxkey' from='PECL mongo &gt;= 1.0.2'/>
- <function name='mongobindata' from='PECL mongo &gt;= 0.8.1'/>
- <function name='mongopool' from='PECL mongo &gt;= 1.2.3'/>
- <function name='mongopool::getsize' from='PECL mongo &gt;= 1.2.3'/>
- <function name='mongopool::info' from='PECL mongo &gt;= 1.2.3'/>
- <function name='mongopool::setsize' from='PECL mongo &gt;= 1.2.3'/>
-
-
- <!-- {{{ MongoExceptions -->
- <function name='mongoexception' from='PECL mongo &gt;= 1.0.0'/>
- <function name='mongoresultexception' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongoresultexception::getdocument' from='PECL mongo &gt;=1.3.0'/>
- <function name='mongocursorexception' from='PECL mongo &gt;= 1.0.0'/>
- <function name='mongocursortimeoutexception' from='PECL mongo &gt;= 1.0.0'/>
- <function name='mongoconnectionexception' from='PECL mongo &gt;= 1.0.0'/>
- <function name='mongogridfsexception' from='PECL mongo &gt;= 1.0.0'/>
- <function name='mongocursorexception-gethost' from='PECL mongo &gt;= 1.0.0'/>
- <function name='mongoduplicatekeyexception' from='PECL mongo &gt;= 1.5.0'/>
- <function name='mongoduplicatekeyexception' from='PECL mongo &gt;= 1.5.0'/>
- <function name='mongoprotocolexception' from='PECL mongo &gt;= 1.5.0'/>
- <function name='mongoexecutiontimeoutexception' from='PECL mongo &gt;= 1.5.0'/>
-
- <function name='mongowriteconcernexception' from='PECL mongo &gt;= 1.5.0'/>
- <function name='mongowriteconcernexception::getDocument' from='PECL mongo &gt;= 1.5.0'/>
- <!-- }}} -->
-
-
- <!-- {{{ MongoBatch -->
- <function name='mongowritebatch' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongowritebatch::__construct' from='PECL mongo &gt;= 1.5.0'/>
- <function name='mongowritebatch::add' from='PECL mongo &gt;= 1.5.0'/>
- <function name='mongowritebatch::execute' from='PECL mongo &gt;= 1.5.0'/>
- 
- <function name='mongoinsertbatch' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongoinsertbatch::__construct' from='PECL mongo &gt;= 1.5.0'/>
- 
- <function name='mongoupdatebatch' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongoupdatebatch::__construct' from='PECL mongo &gt;= 1.5.0'/>
- 
- <function name='mongodeletebatch' from='PECL mongo &gt;=1.5.0'/>
- <function name='mongodeletebatch::__construct' from='PECL mongo &gt;= 1.5.0'/>
- <!-- }}} -->
-
- <!-- {{{ Context callback meta functions -->
- <function name='log_cmd_delete' from='PECL mongo &gt;= 1.5.0'/>
- <function name='log_cmd_insert' from='PECL mongo &gt;= 1.5.0'/>
- <function name='log_cmd_update' from='PECL mongo &gt;= 1.5.0'/>
- <function name='log_getmore' from='PECL mongo &gt;= 1.5.0'/>
- <function name='log_killcursor' from='PECL mongo &gt;= 1.5.0'/>
- <function name='log_reply' from='PECL mongo &gt;= 1.5.0'/>
- <function name='log_write_batch' from='PECL mongo &gt;= 1.5.0'/>
- <!-- }}} -->
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongo/writeconcerns.xml b/reference/mongo/writeconcerns.xml
deleted file mode 100644
index 81507f32ae..0000000000
--- a/reference/mongo/writeconcerns.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.writeconcerns" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Write Concerns</title>
-
- <para>
-  MongoDB provides several different ways of selecting how durable a write to
-  the database should be. These ways are called <literal>Write
-  Concerns</literal> and span everything from completely ignoring all errors,
-  to specifically targetting which servers are required to confirm the write
-  before returning the operation.
- </para>
- <para>
-  When a write (such as with <methodname>MongoCollection::insert</methodname>,
-  <methodname>MongoCollection::update</methodname>, and
-  <methodname>MongoCollection::remove</methodname>) is given a Write Concern
-  option (<literal>"w"</literal>) the driver will send the query to MongoDB
-  and piggy back a <literal>getLastError</literal> command
-  (<acronym>GLE</acronym>) with the Write Concern option at the same time.
-  The server only returns when the Write Concern condition is verified to be
-  fulfilled, or the query times out (controlled with the
-  <literal>"wtimeout"</literal> option, <literal>10000</literal> milliseconds
-  is the default).
- </para>
-
- <warning>
-  <para>
-   Even though a <literal>getLastError</literal> command times out the data
-   will most likely have been written to the primary server and will be
-   replicated to all the secondaries once they have caught up.
-  </para>
-  <para>
-   The typical reasons for a timeout to happen is if you specify a Write
-   Concern which requires confirmation from more servers then you currently
-   have available.
-  </para>
- </warning>
-
- <para>
-  When using acknowledged writes and the replica set has failed over, the driver
-  will automatically disconnect from the primary, throw an exception, and
-  attempt to find a new primary on the next operation (your application must
-  decide whether or not to retry the operation on the new primary).
- </para>
- <para>
-  When using unacknowledged writes (w=0) and the replica set has failed over,
-  there will be no way for the driver to know about the change so it will
-  continue and silently fail to write.
- </para>
- <para>
-  The default Write Concern for the <classname>MongoClient</classname> is
-  <literal>1</literal>: acknowledge write operations.
- </para>
-
-
- <para>
-  <table xml:id="mongo.writeconcerns.options">
-   <title>Available Write Concerns</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Write Concern</entry>
-      <entry>Meaning</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-<!--
-     <row>
-      <entry>w=-1</entry>
-      <entry>Errors ignored</entry>
-      <entry>No errors, including network errors, will be checked at all</entry>
-     </row>
--->
-     <row>
-      <entry>w=0</entry>
-      <entry>Unacknowledged</entry>
-      <entry>A write will not be followed up with a <acronym>GLE</acronym> call, and therefore not checked ("fire and forget")</entry>
-     </row>
-     <row>
-      <entry>w=1</entry>
-      <entry>Acknowledged</entry>
-      <entry>The write will be acknowledged by the server (the primary on replica set configuration)</entry>
-     </row>
-     <row>
-      <entry>w=N</entry>
-      <entry>Replica Set Acknowledged</entry>
-      <entry>The write will be acknowledged by the primary server, and
-      replicated to <literal>N-1</literal> secondaries.</entry>
-     </row>
-     <row>
-      <entry>w=majority</entry>
-      <entry>Majority Acknowledged</entry>
-      <entry>The write will be acknowledged by the majority of the replica set (including the primary). This is a special reserved string.</entry>
-     </row>
-     <row>
-      <entry>w=&lt;tag set&gt;</entry>
-      <entry>Replica Set Tag Set Acknowledged</entry>
-      <entry>The write will be acknowledged by members of the entire tag set</entry>
-     </row>
-     <row>
-      <entry>j=true</entry>
-      <entry>Journaled</entry>
-      <entry>The write will be acknowledged by primary and the journal flushed to disk</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
- 
- <simplesect xml:id="mongo.writeconcerns.setting">
-  <title>Using WriteConcerns</title>
-  <para>
-   Each of the methods that causes writes
-   (<methodname>MongoCollection::insert</methodname>,
-   <methodname>MongoCollection::update</methodname>, 
-   <methodname>MongoCollection::remove</methodname>, and
-   <methodname>MongoCollection::batchInsert</methodname>) allow an optional
-   argument to send a set of options to the MongoDB server. With this option
-   array you can set the WriteConcern as the following example illustrates:
-  </para>
-  <example>
-   <title>Passing a WriteConcern to a write operation</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Setting w=0 for insert:
-$collection->insert($someDoc, array("w" => 0));
-
-// Setting w=majority for update:
-$collection->update($someDoc, $someUpdates, array("w" => "majority"));
-
-// Setting w=5 and j=true for remove:
-$collection->update($someDoc, array("w" => 5, "j" => true));
-
-// Setting w="AllDCs" for batchInsert:
-$collection->update(array($someDoc1, $someDoc2), array("w" => "AllDCs"));
-?>
-]]>
-   </programlisting>
-  </example>
-  <para>
-   Besides setting WriteConcerns per operation as an option argument, it is
-   also possible to set a default WriteConcern in different ways.
-  </para>
-  <para>
-   The first way is through the <link
-   linkend="mongo.mongoclient.construct.parameters">connection
-   string</link>. The connection string accepts the
-   <literal>journal</literal>, <literal>w</literal>, and
-   <literal>wTimeoutMS</literal> options:
-  </para>
-  <example>
-   <title>Connection string WriteConcerns</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb://localhost/?journal=true&w=majority&wTimeoutMS=20000");
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <para>
-   Since driver version 1.5 it is also possible to call
-   <methodname>MongoDB::setWriteConcern</methodname> and
-   <methodname>MongoCollection::setWriteConcern</methodname> to set a default
-   WriteConcern for all operations created from that specific
-   <classname>MongoDB</classname> or <classname>MongoCollection</classname>
-   object:
-  </para>
-  <example>
-   <title>MongoDB::setWriteConcern and MongoCollection::setWriteConcern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoClient("mongodb://localhost/");
-$d = $m->demoDb;
-$c = $d->demoCollection;
-
-// Set w=3 on the database object with a timeout of 25000ms
-$d->setWriteConcern(3, 25000);
-
-// Set w=majority on the collection object without changing the timeout
-$c->setWriteConcern("majority");
-?>
-]]>
-   </programlisting>
-  </example>
- </simplesect>
-
- <simplesect xml:id="mongo.writeconcerns.unacknowledged">
-  <title>Unacknowledged Writes</title>
-  <para>
-   By not requiring the server to acknowledge writes the writes can be performed
-   extremely quickly, but you don't know whether or not they actually succeeded.
-   Writes can fail for a number of reasons: if there are network problems, if a 
-   database server goes down, or if the write was simply invalid (e.g., writing 
-   to a system collection; or duplicate key errors).
-  </para>
-  <para>
-   While developing, you should always use acknowledged writes (to protect against 
-   inadvertent mistakes, such as syntax errors, invalid operators, duplicate key errors and so on).  In 
-   production, unacknowledged writes can be used for "unimportant" data.  Unimportant
-   data varies on application, but it's generally automatically (instead of user
-   generated) data, such as click tracking or GPS locations, where you can get
-   thousands of records per second.
-  </para>
-  <para>
-   It is strongly recommended that you do an acknowledged write at the end of
-   series of unacknowledged writes. Doing so will not incur in a too large
-   performance penalty, but still allow you to catch any errors that may have
-   occurred.
-  </para>
-  <example xml:id="mongo.writeconcerns.unacknowledged-example">
-   <title>Unacknowledged WriteConcern, followed with Acknowledged Write</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$collection->insert($someDoc, array("w" => 0));
-$collection->update($criteria, $newObj, array("w" => 0));
-$collection->insert($somethingElse, array("w" => 0));
-try {
-    $collection->remove($something, array("w" => 1));
-} catch(MongoCursorException $e) {
-    /* Handle the exception.. */
-    /* Here we should issue find() queries on the IDs generated for
-    $somethingElse and $someDoc to verify they got written to the database and
-    attempt to figureout where in the chain something happened. */
-}
-?>
-]]>
-   </programlisting>
-   <para>
-    If the last write throws an exception, you know that there's a problem
-    with your database.
-   </para>
-  </example>
- </simplesect>
-
- <simplesect xml:id="mongo.writeconcerns.acknowledged">
-  <title>Acknowledged Writes</title>
-  <para>
-   These type of write operations will make sure that the database has
-   accepted the write operation before returning success. If the write failed,
-   it will throw a <classname>MongoCursorException</classname> with an
-   explanation of the failure. The <classname>MongoClient</classname> default
-   behaviour is to acknowledge the write (w=1).
-  </para>
-  <para>
-   It is possible to specify how many members of an replica set have to
-   acknowledge the write (i.e. have it replicated) before the write is deemed
-   acknowledged and the operation returns.
-   <example xml:id="mongo.writeconcerns.acknowledged-example">
-    <title>Acknowledged Writes</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Force acknowledgement from the primary only
-$collection->insert($doc, array("w" => 1));
-
-// Force acknowledgement from the primary, and one other member of the
-// replica set
-$collection->insert($doc, array("w" => 2));
-
-// Force acknowledgement from the primary, and six other members of the
-// replica set (you probably never should do this):
-$collection->insert($doc, array("w" => 7));
-?>
-]]>
-    </programlisting>
-    <para>
-     Keep in mind to select your Write Concern carefully. If you have a
-     replica set with 5 members, and you select Write Concern of
-     <literal>4</literal> you will risk the write blocking forever when one
-     member of the replica set goes down for maintenance or a temporary network
-     outage happens.
-    </para>
-   </example>
-  </para>
-  <warning>
-   <para>
-    Passing in a string value for Write Concern has a specific meaning
-    (Replica Set Tag Set Acknowledged). Please be careful of
-    <emphasis>NOT</emphasis> using string values for numbers (i.e.
-    <literal>array("w" => "1")</literal>) as it will be treated as a tag set
-    name.
-   </para>
-  </warning>
- </simplesect>
-
- <simplesect xml:id="mongo.writeconcerns.majority.acknowledged">
-  <title>Majority Acknowledged Writes</title>
-  <para>
-   Using the special <literal>majority</literal> Write Concern option is the
-   recommended way for writes that are required to survive the apocalypse, as
-   it will ensure the majority of your replica set will have the write and will
-   therefore be guaranteed to survive all usual suspect outage scenarios.
-  </para>
-  <example xml:id="mongo.writeconcerns.majority.acknowledged-example">
-   <title>Majority Acknowledged Write</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$collection->insert($someDoc, array("w" => "majority"));
-?>
-]]>
-   </programlisting>
-  </example>
- </simplesect>
-
- <!-- FIXME
- <simplesect xml:id="mongo.writeconcerns.tagset">
-  <title>ReplicaSet TagSet Acknowledged</title>
- </simplesect>
- -->
-
- <simplesect xml:id="mongo.writeconcerns.journal">
-  <title>Journaled Writes</title>
-  <para>
-   When connecting to a replica set the default Write Concern is only to have
-   the primary server acknowledge the write. There is however a 100ms window
-   until the write gets journaled and flushed to disk. It is possible to force
-   the write to be journaled before acknowledging the write by setting the
-   <literal>j</literal> option:
-   <example xml:id="mongo.writeconcerns.journalled">
-    <title>Acknowledged and Journaled Write</title>
-    <para>Forcing journal flush</para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array(
-    "w" => 1,
-    "j" => true,
-);
-try {
-    $collection->insert($document, $options);
-} catch(MongoCursorException $e) {
-    /* handle the exception */
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </simplesect>
-
- <simplesect role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <link xlink:href="&url.mongodb.docs;applications/replication/#replica-set-write-concern">MongoDB WriteConcern docs</link>
-   </member>
-  </simplelist>
- </simplesect>
-
- <simplesect role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>1.3.0</entry>
-      <entry>
-       <classname>MongoClient</classname> was introduced and defaults to
-       <link linkend="mongo.writeconcerns.acknowledged">acknowledged</link> writes.
-       The deprecated <classname>Mongo</classname> defaults to unacknowledged
-       writes.
-      </entry>
-     </row>
-     <row>
-      <entry>1.3.0</entry>
-      <entry>
-       The <literal>"safe"</literal> write option has been deprecated and is
-       not available with the new <classname>MongoClient</classname> class.
-       Use the <literal>"w"</literal> option instead.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </simplesect>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongo/writes.xml b/reference/mongo/writes.xml
deleted file mode 100644
index e17bb12fb6..0000000000
--- a/reference/mongo/writes.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongo.writes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Writes</title>
- <section>
-  <title>Updating Nested Objects</title>
-
-  <para>
-   Suppose we wish to change the name of a comment's author in this document:
-
-   <programlisting role="javascript">
-<![CDATA[
-{ 
-    "_id" : ObjectId("4b06c282edb87a281e09dad9"), 
-    "content" : "this is a blog post.",
-    "comments" : 
-    [
-        {
-            "author" : "Mike",
-            "comment" : "I think that blah blah blah...",
-        },
-        {
-            "author" : "John",
-            "comment" : "I disagree."
-        }
-    ]
-}
-]]>
-   </programlisting>
-
-   In order to change an inner field, we use $set (so that all of the other 
-   fields are not removed!) with the index of comment to change:
-
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$blog->update($criteria, array('$set' => array("comments.1" => array("author" => "Jim"))));
-
-?>
-]]>
-   </programlisting>
-  </para>
- </section>
-
- <section>
-  <title>The Positional Operator</title>
-  <para>
-   The positional operator <literal>$</literal> is useful for updating objects 
-   that are in arrays.  In the example above, for instance, suppose that we did
-   not know the index of the comment that we needed to change, merely that we
-   needed to change "John" to "Jim".  We can use <literal>$</literal> to do so.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$blog->update(
-    array('comments.author' => 'John'), 
-    array('$set' => array('comments.$.author' => 'Jim')));
-
-?>
-]]>
-  </programlisting>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/mongodb/architecture.xml b/reference/mongodb/architecture.xml
index 5d70ca3909..6034cd8a2a 100644
--- a/reference/mongodb/architecture.xml
+++ b/reference/mongodb/architecture.xml
@@ -13,8 +13,8 @@
    This section explains how all the different parts of the driver fit
    together. From the different language runtimes, through the extension and
    to the PHP libraries on top. This new architecture has replaced the old
-   <link linkend="book.mongo">mongo</link> extension. We refer to the new one
-   as the <emphasis>mongodb</emphasis> extension.
+   <code>mongo</code> extension. We refer to the new one
+   as the <code>mongodb</code> extension.
   </para>
 
   <para>
@@ -197,7 +197,7 @@ foreach ($managers as $manager) {
     <literal>127.0.0.1</literal> and one connection to each of
     <literal>rs1.example.com</literal> and <literal>rs2.example.com</literal>.
     If the driver discovers additional members of the replica set after issuing
-    <literal>isMaster</literal> commands, it will open additional connections to
+    <literal>hello</literal> commands, it will open additional connections to
     those servers as well.
    </para>
 
@@ -205,7 +205,7 @@ foreach ($managers as $manager) {
     If the same worker executes the script again in a second request, the three
     clients will be re-used and no new connections should be made. Depending on
     how long ago the previous request was served, the driver may need to issue
-    additional <literal>isMaster</literal> commands to update its view of the
+    additional <literal>hello</literal> commands to update its view of the
     topologies.
    </para>
   </section>
@@ -267,8 +267,9 @@ foreach ($managers as $manager) {
     <title>Arrays</title>
 
     <para>
-     If an array is a <emphasis>packed array</emphasis> — i.e. the keys start
-     at 0 and are sequential without gaps: <emphasis>BSON array</emphasis>. 
+     If an array is a <emphasis>packed array</emphasis> — i.e. empty array or
+     the keys start at 0 and are sequential without gaps: <emphasis>BSON
+     array</emphasis>.
     </para>
 
     <para>
@@ -513,16 +514,15 @@ class UpperClass implements MongoDB\BSON\Persistable {
    <title>Deserialization from BSON</title>
 
    <para>
-    The legacy <link linkend="book.mongo">mongo</link> extension deserialized
+    The legacy <code>mongo</code> extension deserialized
     both BSON documents and arrays as PHP arrays. While PHP arrays are
     convenient to work with, this behavior was problematic because different
     BSON types could deserialize to the same PHP value (e.g.
-     <literal>{"0": "foo"}</literal> and <literal>["foo"]</literal>) and make it
+    <literal>{"0": "foo"}</literal> and <literal>["foo"]</literal>) and make it
     impossible to infer the original BSON type. By default, the current driver
     addresses this concern by ensuring that BSON arrays and documents are
     converted to PHP arrays and objects, respectively.
    </para>
-
    <para>
     For compound types, there are three data types:
    </para>
diff --git a/reference/mongodb/configure.xml b/reference/mongodb/configure.xml
index b7ecc2ae99..34289717ff 100644
--- a/reference/mongodb/configure.xml
+++ b/reference/mongodb/configure.xml
@@ -24,7 +24,7 @@ $ sudo pecl install mongodb
 
   <para>
    If your system has multiple version of PHP installed (e.g. macOS default,
-   Homebrew, <link xlink:href="&url.xampp;">XAMPP</link>), note that that each
+   Homebrew, <link xlink:href="&url.xampp;">XAMPP</link>), note that each
    version of PHP has its own <link linkend="install.pecl">pecl</link>
    command and &php.ini; file.
   </para>
diff --git a/reference/mongodb/functions/driver/monitoring/addsubscriber.xml b/reference/mongodb/functions/driver/monitoring/addsubscriber.xml
index de0fcc8a5b..242e3ca3a0 100644
--- a/reference/mongodb/functions/driver/monitoring/addsubscriber.xml
+++ b/reference/mongodb/functions/driver/monitoring/addsubscriber.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.mongodb.driver.monitoring.addsubscriber" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\Driver\Monitoring\addSubscriber</refname>
-  <refpurpose>Registers a new monitoring event subscriber</refpurpose>
+  <refpurpose>Registers a monitoring event subscriber globally</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,12 +14,15 @@
    <methodparam><type>MongoDB\Driver\Monitoring\Subscriber</type><parameter>subscriber</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Registers a new monitoring event subscriber with the driver. Registered
-   subscribers will be notified of monitoring events through specific methods.
+   Registers a monitoring event subscriber globally. The subscriber will be
+   notified of all events in the driver for any Manager.
   </para>
   <note>
    <simpara>
-    If the object is already registered, this function is a no-op.
+    If <parameter>subscriber</parameter> is already registered globally, this
+    function is a no-op. If <parameter>subscriber</parameter> is also registered
+    with one or more Managers, it will still only be notified once of each event
+    for each Manager.
    </simpara>
   </note>
  </refsect1>
@@ -31,7 +34,7 @@
     <term><parameter>subscriber</parameter> (<type>MongoDB\Driver\Monitoring\Subscriber</type>)</term>
     <listitem>
      <para>
-      A monitoring event subscriber object to register.
+      A monitoring event subscriber to register globally.
      </para>
     </listitem>
    </varlistentry>
@@ -55,9 +58,10 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
+   <member><function>MongoDB\Driver\Monitoring\removeSubscriber</function></member>
    <member><interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename></member>
    <member><interfacename>MongoDB\Driver\Monitoring\CommandSubscriber</interfacename></member>
-   <member><function>MongoDB\Driver\Monitoring\removeSubscriber</function></member>
+   <member><function>MongoDB\Driver\Manager::addSubscriber</function></member>
    <member><xref linkend="mongodb.tutorial.apm" /></member>
   </simplelist>
  </refsect1>
diff --git a/reference/mongodb/functions/driver/monitoring/removesubscriber.xml b/reference/mongodb/functions/driver/monitoring/removesubscriber.xml
index 2d7063688b..a26c8b07ed 100644
--- a/reference/mongodb/functions/driver/monitoring/removesubscriber.xml
+++ b/reference/mongodb/functions/driver/monitoring/removesubscriber.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.mongodb.driver.monitoring.removesubscriber" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\Driver\Monitoring\removeSubscriber</refname>
-  <refpurpose>Unregisters an existing monitoring event subscriber</refpurpose>
+  <refpurpose>Unregisters a monitoring event subscriber globally</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,12 +14,12 @@
    <methodparam><type>MongoDB\Driver\Monitoring\Subscriber</type><parameter>subscriber</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Unregisters an existing monitoring event subscriber from the driver.
-   Unregistered subscribers will no longer be notified of monitoring events.
+   Unregisters a monitoring event subscriber globally.
   </para>
   <note>
    <simpara>
-    If the object is not registered, this function is a no-op.
+    If <parameter>subscriber</parameter> is not already registered globally,
+    this function is a no-op.
    </simpara>
   </note>
  </refsect1>
@@ -31,7 +31,7 @@
     <term><parameter>subscriber</parameter> (<type>MongoDB\Driver\Monitoring\Subscriber</type>)</term>
     <listitem>
      <para>
-      A monitoring event subscriber object to unregister.
+      A monitoring event subscriber to unregister globally.
      </para>
     </listitem>
    </varlistentry>
@@ -55,9 +55,10 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
+   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
    <member><interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename></member>
    <member><interfacename>MongoDB\Driver\Monitoring\CommandSubscriber</interfacename></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
+   <member><function>MongoDB\Driver\Manager::removeSubscriber</function></member>
    <member><xref linkend="mongodb.tutorial.apm" /></member>
   </simplelist>
  </refsect1>
diff --git a/reference/mongodb/mongodb.xml b/reference/mongodb/mongodb.xml
index 5797721b40..6f42d9d8a3 100644
--- a/reference/mongodb/mongodb.xml
+++ b/reference/mongodb/mongodb.xml
@@ -11,6 +11,7 @@
   &reference.mongodb.mongodb.driver.bulkwrite;
   &reference.mongodb.mongodb.driver.session;
   &reference.mongodb.mongodb.driver.clientencryption;
+  &reference.mongodb.mongodb.driver.serverapi;
 
   &reference.mongodb.mongodb.driver.writeconcern;
   &reference.mongodb.mongodb.driver.readpreference;
diff --git a/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml b/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
index 43cac245f7..f36af3d1c6 100644
--- a/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
+++ b/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
@@ -26,8 +26,10 @@
     <term><parameter>kmsProvider</parameter></term>
     <listitem>
      <para>
-      The KMS provider (<literal>"local"</literal> or <literal>"aws"</literal>) that
-      will be used to encrypt the new encryption key.
+      The KMS provider (e.g. <literal>"local"</literal>,
+      <literal>"aws"</literal>, <literal>"azure"</literal>,
+      <literal>"gcp"</literal>) that will be used to encrypt the new encryption
+      key.
      </para>
     </listitem>
    </varlistentry>
@@ -53,8 +55,12 @@
           <entry>
            <para>
             The masterKey identifies a KMS-specific key used to encrypt the new
-            data key. If the kmsProvider is <literal>aws</literal> it is
-            required and has the following fields:
+            data key. This option is required unless
+            <parameter>kmsProvider</parameter> is <literal>"local"</literal>.
+           </para>
+           <para>
+            If <parameter>kmsProvider</parameter> is <literal>"aws"</literal>,
+            this option is required and has the following fields:
             <table>
              <title>AWS masterKey options</title>
              <tgroup cols="3">
@@ -85,6 +91,87 @@
              </tgroup>
             </table>
            </para>
+           <para>
+            If <parameter>kmsProvider</parameter> is <literal>"azure"</literal>,
+            this option is required and has the following fields:
+            <table>
+             <title>Azure masterKey options</title>
+             <tgroup cols="3">
+              <thead>
+               <row>
+                <entry>Option</entry>
+                <entry>Type</entry>
+                <entry>Description</entry>
+               </row>
+              </thead>
+              <tbody>
+               <row>
+                <entry>keyVaultEndpoint</entry>
+                <entry>string</entry>
+                <entry>Required. Host with optional port (e.g. "example.vault.azure.net").</entry>
+               </row>
+               <row>
+                <entry>keyName</entry>
+                <entry>string</entry>
+                <entry>Required.</entry>
+               </row>
+               <row>
+                <entry>keyVersion</entry>
+                <entry>string</entry>
+                <entry>Optional. A specific version of the named key. Defaults to using the key's primary version.</entry>
+               </row>
+              </tbody>
+             </tgroup>
+            </table>
+           </para>
+           <para>
+            If <parameter>kmsProvider</parameter> is <literal>"gcp"</literal>,
+            this option is required and has the following fields:
+            <table>
+             <title>GCP masterKey options</title>
+             <tgroup cols="3">
+              <thead>
+               <row>
+                <entry>Option</entry>
+                <entry>Type</entry>
+                <entry>Description</entry>
+               </row>
+              </thead>
+              <tbody>
+               <row>
+                <entry>projectId</entry>
+                <entry>string</entry>
+                <entry>Required.</entry>
+               </row>
+               <row>
+                <entry>location</entry>
+                <entry>string</entry>
+                <entry>Required.</entry>
+               </row>
+               <row>
+                <entry>keyRing</entry>
+                <entry>string</entry>
+                <entry>Required.</entry>
+               </row>
+               <row>
+                <entry>keyName</entry>
+                <entry>string</entry>
+                <entry>Required.</entry>
+               </row>
+               <row>
+                <entry>keyVersion</entry>
+                <entry>string</entry>
+                <entry>Optional. A specific version of the named key. Defaults to using the key's primary version.</entry>
+               </row>
+               <row>
+                <entry>endpoint</entry>
+                <entry>string</entry>
+                <entry>Optional. Host with optional port. Defaults to "cloudkms.googleapis.com".</entry>
+               </row>
+              </tbody>
+             </tgroup>
+            </table>
+           </para>
           </entry>
          </row>
          <row>
@@ -123,6 +210,31 @@
    <member>Throws <classname>MongoDB\Driver\Exception\EncryptionException</classname> if an error occurs while creating the data key</member>
   </simplelist>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>PECL mongodb 1.10.0</entry>
+       <entry>
+        Azure and GCP are now supported as KMS providers for client-side
+        encryption.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
  
 </refentry>
 
diff --git a/reference/mongodb/mongodb/driver/cursor/getserver.xml b/reference/mongodb/mongodb/driver/cursor/getserver.xml
index 543aee4477..7d417c6f03 100644
--- a/reference/mongodb/mongodb/driver/cursor/getserver.xml
+++ b/reference/mongodb/mongodb/driver/cursor/getserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="mongodb-driver-cursor.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -83,9 +83,9 @@ object(MongoDB\Driver\Server)#5 (10) {
   bool(false)
   ["is_passive"]=>
   bool(false)
-  ["last_is_master"]=>
+  ["last_hello_response"]=>
   array(8) {
-    ["ismaster"]=>
+    ["isWritablePrimary"]=>
     bool(true)
     ["maxBsonObjectSize"]=>
     int(16777216)
diff --git a/reference/mongodb/mongodb/driver/manager.xml b/reference/mongodb/mongodb/driver/manager.xml
index 5b0de41eef..4c3ffb3724 100644
--- a/reference/mongodb/mongodb/driver/manager.xml
+++ b/reference/mongodb/mongodb/driver/manager.xml
@@ -64,53 +64,24 @@
      This can be useful to debug how the driver views your MongoDB setup, and 
      which options are used.
     </para>
-   <programlisting role="php">
+    <programlisting role="php">
 <![CDATA[
 <?php
 
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
+$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
 var_dump($manager);
 
 ?>
 ]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
+    </programlisting>
+    &example.outputs.similar;
+    <screen>
 <![CDATA[
-object(MongoDB\Driver\Manager)#1 (3) {
-  ["request_id"]=>
-  int(1714636915)
+object(MongoDB\Driver\Manager)#1 (2) {
   ["uri"]=>
-  string(25) "mongodb://localhost:27017"
+  string(26) "mongodb://127.0.0.1:27017/"
   ["cluster"]=>
-  array(13) {
-    ["mode"]=>
-    string(6) "direct"
-    ["state"]=>
-    string(4) "born"
-    ["request_id"]=>
-    int(0)
-    ["sockettimeoutms"]=>
-    int(300000)
-    ["last_reconnect"]=>
-    int(0)
-    ["uri"]=>
-    string(25) "mongodb://localhost:27017"
-    ["requires_auth"]=>
-    int(0)
-    ["nodes"]=>
-    array(...)
-    ["max_bson_size"]=>
-    int(16777216)
-    ["max_msg_size"]=>
-    int(50331648)
-    ["sec_latency_ms"]=>
-    int(15)
-    ["peers"]=>
-    array(0) {
-    }
-    ["replSet"]=>
-    NULL
+  array(0) {
   }
 }
 ]]>
diff --git a/reference/mongodb/mongodb/driver/manager/addsubscriber.xml b/reference/mongodb/mongodb/driver/manager/addsubscriber.xml
new file mode 100644
index 0000000000..b05b5fda57
--- /dev/null
+++ b/reference/mongodb/mongodb/driver/manager/addsubscriber.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ --> 
+
+<refentry xml:id="mongodb-driver-manager.addsubscriber" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\Driver\Manager::addSubscriber</refname>
+  <refpurpose>Registers a monitoring event subscriber with this Manager</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Manager::addSubscriber</methodname>
+   <methodparam><type>MongoDB\Driver\Monitoring\Subscriber</type><parameter>subscriber</parameter></methodparam>
+  </methodsynopsis>
+  <para>
+   Registers a monitoring event subscriber with this Manager. The subscriber
+   will be notified of all events for this Manager.
+  </para>
+  <note>
+   <simpara>
+    If <parameter>subscriber</parameter> is already registered with this
+    Manager, this function is a no-op. If <parameter>subscriber</parameter> is
+    also registered globally, it will still only be notified once of each event
+    for this Manager.
+   </simpara>
+  </note>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>subscriber</parameter> (<type>MongoDB\Driver\Monitoring\Subscriber</type>)</term>
+    <listitem>
+     <para>
+      A monitoring event subscriber to register with this Manager.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><function>MongoDB\Driver\Manager::removeSubscriber</function></member>
+   <member><interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename></member>
+   <member><interfacename>MongoDB\Driver\Monitoring\CommandSubscriber</interfacename></member>
+   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
+   <member><xref linkend="mongodb.tutorial.apm" /></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/mongodb/driver/manager/construct.xml b/reference/mongodb/mongodb/driver/manager/construct.xml
index a705f10c33..75bdfbbe5b 100644
--- a/reference/mongodb/mongodb/driver/manager/construct.xml
+++ b/reference/mongodb/mongodb/driver/manager/construct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="mongodb-driver-manager.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -434,27 +434,13 @@ mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][
            </para>
           </entry>
          </row>
-         <row>
-          <entry>slaveOk</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <para>
-            Specifies <literal>"secondaryPreferred"</literal> for the read
-            preference mode if &true;. For details, see
-            <classname>MongoDB\Driver\ReadPreference</classname>.
-           </para>
-           <para>
-            This option is deprecated and should not be used.
-           </para>
-          </entry>
-         </row>
          <row>
           <entry>socketCheckIntervalMS</entry>
           <entry><type>int</type></entry>
           <entry>
            <para>
             If a socket has not been used recently, the driver must check it via
-            an <literal>isMaster</literal> command before using it for any
+            a <literal>hello</literal> command before using it for any
             operation. Defaults to 5,000 milliseconds.
            </para>
           </entry>
@@ -768,7 +754,7 @@ mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][
              are not bypassed will result in error. To bypass automatic
              encryption for all operations, set <literal>bypassAutoEncryption=true</literal>
              in <literal>autoEncryption</literal>. For more information on
-             whitelisted operations, see the
+             allowed operations, see the
              <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#libmongocrypt-auto-encryption-whitelist">Client-Side Encryption Specification</link>.
             </simpara>
            </note>
@@ -856,6 +842,23 @@ mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][
           <entry><type>string</type></entry>
           <entry>Path to a certificate revocation list file.</entry>
          </row>
+         <row>
+          <entry>disableClientPersistence</entry>
+          <entry><type>bool</type></entry>
+          <entry>
+           <para>
+            If &true;, this Manager will use a new libmongoc client, which will
+            not be persisted or shared with other Manager objects. When this
+            Manager object is freed, its client will be destroyed and any
+            connections will be closed. Defaults to &false;.
+           </para>
+           <note>
+            <simpara>
+             Disabling client persistence is not generally recommended.
+            </simpara>
+           </note>
+          </entry>
+         </row>
          <row>
           <entry>driver</entry>
           <entry><type>array</type></entry>
@@ -904,6 +907,16 @@ mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][
            </para>
           </entry>
          </row>
+         <row>
+          <entry>serverApi</entry>
+          <entry><classname>MongoDB\Driver\ServerApi</classname></entry>
+          <entry>
+           <para>
+            This option is used to declare a server API version for the manager.
+            If omitted, no API version is declared.
+           </para>
+          </entry>
+         </row>
          <row>
           <entry>weak_cert_validation</entry>
           <entry><type>bool</type></entry>
@@ -946,6 +959,23 @@ mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>PECL mongodb 1.10.0</entry>
+       <entry>
+        <para>
+         Added the <literal>"disableClientPersistence"</literal> driver option.
+        </para>
+        <para>
+         Azure and GCP are now supported as KMS providers for client-side
+         encryption and may be configured in the
+         <literal>"kmsProviders"</literal> field of the
+         <literal>"autoEncryption"</literal> driver option. Base64-encoded
+         strings are now accepted as an alternative to
+         <classname>MongoDB\BSON\Binary</classname> for options within
+         <literal>"kmsProviders"</literal>.
+        </para>
+       </entry>
+      </row>
       <row>
        <entry>PECL mongodb 1.8.0</entry>
        <entry>
diff --git a/reference/mongodb/mongodb/driver/manager/createclientencryption.xml b/reference/mongodb/mongodb/driver/manager/createclientencryption.xml
index 9f1f4fbc45..4032cd3da9 100644
--- a/reference/mongodb/mongodb/driver/manager/createclientencryption.xml
+++ b/reference/mongodb/mongodb/driver/manager/createclientencryption.xml
@@ -63,6 +63,34 @@
   </simplelist>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>PECL mongodb 1.10.0</entry>
+       <entry>
+        Azure and GCP are now supported as KMS providers for client-side
+        encryption and may be configured in the
+        <literal>"kmsProviders"</literal> option. Base64-encoded strings are now
+        accepted as an alternative to <classname>MongoDB\BSON\Binary</classname>
+        for options within <literal>"kmsProviders"</literal>.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/mongodb/mongodb/driver/manager/getservers.xml b/reference/mongodb/mongodb/driver/manager/getservers.xml
index b5c78285af..9259dc9cb1 100644
--- a/reference/mongodb/mongodb/driver/manager/getservers.xml
+++ b/reference/mongodb/mongodb/driver/manager/getservers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="mongodb-driver-manager.getservers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -93,9 +93,9 @@ array(1) {
     bool(false)
     ["is_passive"]=>
     bool(false)
-    ["last_is_master"]=>
+    ["last_hello_response"]=>
     array(8) {
-      ["ismaster"]=>
+      ["isWritablePrimary"]=>
       bool(true)
       ["maxBsonObjectSize"]=>
       int(16777216)
diff --git a/reference/mongodb/mongodb/driver/manager/removesubscriber.xml b/reference/mongodb/mongodb/driver/manager/removesubscriber.xml
new file mode 100644
index 0000000000..c3bd4ef249
--- /dev/null
+++ b/reference/mongodb/mongodb/driver/manager/removesubscriber.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ --> 
+
+<refentry xml:id="mongodb-driver-manager.removesubscriber" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\Driver\Manager::removeSubscriber</refname>
+  <refpurpose>Unregisters a monitoring event subscriber with this Manager</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Manager::removeSubscriber</methodname>
+   <methodparam><type>MongoDB\Driver\Monitoring\Subscriber</type><parameter>subscriber</parameter></methodparam>
+  </methodsynopsis>
+  <para>
+   Unregisters a monitoring event subscriber with this Manager.
+  </para>
+  <note>
+   <simpara>
+    If <parameter>subscriber</parameter> is not already registered with this
+    Manager, this function is a no-op.
+   </simpara>
+  </note>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>subscriber</parameter> (<type>MongoDB\Driver\Monitoring\Subscriber</type>)</term>
+    <listitem>
+     <para>
+      A monitoring event subscriber to unregister with this Manager.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><function>MongoDB\Driver\Manager::addSubscriber</function></member>
+   <member><interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename></member>
+   <member><interfacename>MongoDB\Driver\Monitoring\CommandSubscriber</interfacename></member>
+   <member><function>MongoDB\Driver\Monitoring\removeSubscriber</function></member>
+   <member><xref linkend="mongodb.tutorial.apm" /></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/mongodb/driver/query/construct.xml b/reference/mongodb/mongodb/driver/query/construct.xml
index e1f111c778..8b289c3d58 100644
--- a/reference/mongodb/mongodb/driver/query/construct.xml
+++ b/reference/mongodb/mongodb/driver/query/construct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="mongodb-driver-query.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -368,11 +368,6 @@
           <entry><type>int</type></entry>
           <entry>Number of documents to skip. Defaults to 0.</entry>
          </row>
-         <row>
-          <entry>slaveOk</entry>
-          <entry><type>bool</type></entry>
-          <entry>Allow query of replica set secondaries</entry>
-         </row>
          <row>
           <entry>snapshot</entry>
           <entry><type>bool</type></entry>
@@ -483,9 +478,10 @@
          <literal>"allowPartialResults"</literal> is not specified.
         </para>
         <para>
-         Removed the <literal>"slaveOk"</literal> option, which is obsolete.
-         For queries using the legacy wire protocol OP_QUERY, the driver will
-         set the <literal>slaveOk</literal> bit as needed in accordance with the
+         Removed the legacy <literal>"secondaryOk"</literal> option, which is
+         obsolete. For queries using the legacy wire protocol OP_QUERY, the
+         driver will set the <literal>secondaryOk</literal> bit as needed in
+         accordance with the
          <link xlink:href="&url.mongodb.serverselection;">Server Selection Specification</link>.
         </para>
        </entry>
diff --git a/reference/mongodb/mongodb/driver/server/getinfo.xml b/reference/mongodb/mongodb/driver/server/getinfo.xml
index 750b48b2c8..4c73d799c1 100644
--- a/reference/mongodb/mongodb/driver/server/getinfo.xml
+++ b/reference/mongodb/mongodb/driver/server/getinfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="mongodb-driver-server.getinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -60,7 +60,7 @@ var_dump($server->getInfo());
    <screen>
 <![CDATA[
 array(8) {
-  ["ismaster"]=>
+  ["isWritablePrimary"]=>
   bool(true)
   ["maxBsonObjectSize"]=>
   int(16777216)
diff --git a/reference/mongodb/mongodb/driver/server/getlatency.xml b/reference/mongodb/mongodb/driver/server/getlatency.xml
index a5c4cc145a..e7cf53788e 100644
--- a/reference/mongodb/mongodb/driver/server/getlatency.xml
+++ b/reference/mongodb/mongodb/driver/server/getlatency.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision$ -->
 
 <refentry xml:id="mongodb-driver-server.getlatency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -16,7 +16,7 @@
   <para>
    Returns the latency of this server (i.e. the client&apos;s measured
    <link xlink:href="&url.mongodb.sdam;#round-trip-time">round trip time</link>
-   of an <literal>ismaster</literal> command).
+   of a <literal>hello</literal> command).
   </para>
  </refsect1>
 
diff --git a/reference/mongodb/mongodb/driver/serverapi.xml b/reference/mongodb/mongodb/driver/serverapi.xml
new file mode 100644
index 0000000000..2888e796af
--- /dev/null
+++ b/reference/mongodb/mongodb/driver/serverapi.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<phpdoc:classref xml:id="class.mongodb-driver-serverapi" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <title>The MongoDB\Driver\ServerApi class</title>
+ <titleabbrev>MongoDB\Driver\ServerApi</titleabbrev>
+
+ <partintro>
+
+<!-- {{{ MongoDB\Driver\ServerApi intro -->
+  <section xml:id="mongodb-driver-serverapi.intro">
+   &reftitle.intro;
+   <para>
+
+   </para>
+  </section>
+<!-- }}} -->
+
+  <section xml:id="mongodb-driver-serverapi.synopsis">
+   &reftitle.classsynopsis;
+
+<!-- {{{ Synopsis -->
+   <classsynopsis>
+    <ooclass><classname>MongoDB\Driver\ServerApi</classname></ooclass>
+
+<!-- {{{ Class synopsis -->
+    <classsynopsisinfo>
+     <modifier>final</modifier>
+     <ooclass>
+      <classname>MongoDB\Driver\ServerApi</classname>
+     </ooclass>
+     <oointerface>
+      <interfacename>MongoDB\BSON\Serializable</interfacename>
+     </oointerface>
+
+     <oointerface>
+      <interfacename>Serializable</interfacename>
+     </oointerface>
+    </classsynopsisinfo>
+<!-- }}} -->
+    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
+    <fieldsynopsis>
+     <modifier>const</modifier>
+     <type>string</type>
+     <varname linkend="mongodb-driver-serverapi.constants.v1">MongoDB\Driver\ServerAPI::V1</varname>
+     <initializer>"1"</initializer>
+    </fieldsynopsis>
+
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-serverapi')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+   </classsynopsis>
+<!-- }}} -->
+
+  </section>
+
+<!-- {{{ MongoDB\Driver\ServerApi constants -->
+  <section xml:id="mongodb-driver-serverapi.constants">
+   &reftitle.constants;
+   <variablelist>
+
+    <varlistentry xml:id="mongodb-driver-serverapi.constants.v1">
+     <term><constant>MongoDB\Driver\ServerApi::V1</constant></term>
+     <listitem>
+      <para>Server API version 1.</para>
+     </listitem>
+    </varlistentry>
+
+   </variablelist>
+  </section>
+<!-- }}} -->
+
+  <section xml:id="mongodb-driver-serverapi.examples">
+   &reftitle.examples;
+
+   <example>
+    <title>Declare an API version on a manager</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+use MongoDB\Driver\Manager;
+use MongoDB\Driver\ServerApi;
+
+$v1 = new ServerApi(ServerApi::v1);
+$manager = new Manager('mongodb://localhost:27017', [], ['serverApi' => $v1]);
+
+$command = new MongoDB\Driver\Command(['buildInfo' => 1]);
+
+try {
+    $cursor = $manager->executeCommand('admin', $command);
+} catch(MongoDB\Driver\Exception $e) {
+    echo $e->getMessage(), "\n";
+    exit;
+}
+
+/* The buildInfo command returns a single result document, so we need to access
+ * the first result in the cursor. */
+$buildInfo = $cursor->toArray()[0];
+
+echo $buildInfo->version, "\n";
+
+?>
+]]>
+    </programlisting>
+
+    &example.outputs;
+    <screen>
+<![CDATA[
+4.9.0-alpha7-49-gb968ca0
+]]>
+    </screen>
+   </example>
+
+   <example>
+    <title>Declare a strict API version on a manager</title>
+    <para>
+     The following example sets the <parameter>strict</parameter> flag, which
+     tells the server to reject any command that is not part of the declared API
+     version. This results in an error when running the buildInfo command.
+    </para>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+use MongoDB\Driver\Manager;
+use MongoDB\Driver\ServerApi;
+
+$v1 = new ServerApi(ServerApi::v1, true);
+$manager = new Manager('mongodb://localhost:27017', [], ['serverApi' => $v1]);
+
+$command = new MongoDB\Driver\Command(['buildInfo' => 1]);
+
+try {
+    $cursor = $manager->executeCommand('admin', $command);
+} catch(MongoDB\Driver\Exception $e) {
+    echo $e->getMessage(), "\n";
+    exit;
+}
+
+/* The buildInfo command returns a single result document, so we need to access
+ * the first result in the cursor. */
+$buildInfo = $cursor->toArray()[0];
+
+echo $buildInfo->version, "\n";
+
+?>
+]]>
+    </programlisting>
+
+    &example.outputs;
+    <screen>
+<![CDATA[
+Provided apiStrict:true, but the command buildInfo is not in API Version 1
+]]>
+    </screen>
+   </example>
+  </section>
+
+ </partintro>
+
+ &reference.mongodb.mongodb.driver.entities.serverapi;
+
+</phpdoc:classref>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongo/mongocursorinterface/getreadpreference.xml b/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
similarity index 60%
rename from reference/mongo/mongocursorinterface/getreadpreference.xml
rename to reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
index 8dc235eb33..c200ba2570 100644
--- a/reference/mongo/mongocursorinterface/getreadpreference.xml
+++ b/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- $Revision$ -->
-<refentry xml:id="mongocursorinterface.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<refentry xml:id="mongodb-driver-serverapi.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MongoCursorInterface::getReadPreference</refname>
-  <refpurpose>Get the read preference for this query</refpurpose>
+  <refname>MongoDB\Driver\ServerApi::bsonSerialize</refname>
+  <refpurpose>Returns an object for BSON serialization</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoCursorInterface::getReadPreference</methodname>
-   <void/>
+   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\ServerApi::bsonSerialize</methodname>
+   <void />
   </methodsynopsis>
  </refsect1>
 
@@ -22,16 +22,26 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  &mongo.getreadpreference.returnvalues;
+  <para>
+   Returns an object for serializing the ServerApi as BSON.
+  </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member>The <link linkend="mongo.readpreferences">read preferences</link> documentation.</member>
-   <member><function>MongoCursorInterface::setReadPreference</function></member>
+   <member><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname></member>
   </simplelist>
  </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/mongodb/mongodb/driver/serverapi/construct.xml b/reference/mongodb/mongodb/driver/serverapi/construct.xml
new file mode 100644
index 0000000000..63e7f81d09
--- /dev/null
+++ b/reference/mongodb/mongodb/driver/serverapi/construct.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="mongodb-driver-serverapi.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\Driver\ServerApi::__construct</refname>
+  <refpurpose>Create a new ServerApi instance</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\ServerApi::__construct</methodname>
+   <methodparam><type>string</type><parameter>version</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>strict</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>deprecationErrors</parameter><initializer>&null;</initializer></methodparam>
+  </methodsynopsis>
+
+  <para>
+   Creates a new <classname>MongoDB\Driver\ServerApi</classname> instance used to
+   declare an API version when creating a
+   <classname>MongoDB\Driver\Manager</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongo/mongocommandcursor/next.xml b/reference/mongodb/mongodb/driver/serverapi/serialize.xml
similarity index 53%
rename from reference/mongo/mongocommandcursor/next.xml
rename to reference/mongodb/mongodb/driver/serverapi/serialize.xml
index cd94fad9c4..1882c23bd9 100644
--- a/reference/mongo/mongocommandcursor/next.xml
+++ b/reference/mongodb/mongodb/driver/serverapi/serialize.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 342988 $ -->
 
-<!-- $Revision$ -->
-<refentry xml:id="mongocommandcursor.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="mongodb-driver-serverapi.serialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MongoCommandCursor::next</refname>
-  <refpurpose>Advances the cursor to the next result</refpurpose>
+  <refname>MongoDB\Driver\ServerApi::serialize</refname>
+  <refpurpose>Serialize a ServerApi</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoCommandCursor::next</methodname>
-   <void/>
+   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\ServerApi::serialize</methodname>
+   <void />
   </methodsynopsis>
  </refsect1>
 
@@ -23,26 +23,29 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &null;.
+   Returns the serialized representation of the
+   <classname>MongoDB\Driver\ServerApi</classname>.
   </para>
  </refsect1>
 
  <refsect1 role="errors">
   &reftitle.errors;
-  <para>
-   Throws <classname>MongoConnectionException</classname> if it cannot reach the
-   database and <classname>MongoCursorTimeoutException</classname> if the
-   timeout is exceeded.
-  </para>
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::next</methodname></member>
+   <member><methodname>MongoDB\Driver\ServerApi::unserialize</methodname></member>
+   <member><function>serialize</function></member>
+   <member><link linkend="language.oop5.serialization">Serializing Objects</link></member>
   </simplelist>
  </refsect1>
+
 </refentry>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -52,6 +55,7 @@ sgml-minimize-attributes:nil
 sgml-always-quote-attributes:t
 sgml-indent-step:1
 sgml-indent-data:t
+indent-tabs-mode:nil
 sgml-parent-document:nil
 sgml-default-dtd-file:"~/.phpdoc/manual.ced"
 sgml-exposed-tags:nil
@@ -61,4 +65,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
---> 
+-->
diff --git a/reference/mongodb/mongodb/driver/serverapi/unserialize.xml b/reference/mongodb/mongodb/driver/serverapi/unserialize.xml
new file mode 100644
index 0000000000..2d20677860
--- /dev/null
+++ b/reference/mongodb/mongodb/driver/serverapi/unserialize.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 342988 $ -->
+
+<refentry xml:id="mongodb-driver-serverapi.unserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\Driver\ServerApi::unserialize</refname>
+  <refpurpose>Unserialize a ServerApi</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\ServerApi::unserialize</methodname>
+   <methodparam><type>string</type><parameter>serialized</parameter></methodparam>
+  </methodsynopsis>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>serialized</parameter></term>
+     <listitem>
+      <para>
+       The serialized <classname>MongoDB\Driver\ServerApi</classname>.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the unserialized <classname>MongoDB\Driver\ServerApi</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+   <member>Throws <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if the properties cannot be unserialized (i.e. <parameter>serialized</parameter> was malformed).</member>
+   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if the properties are invalid (e.g. missing fields or invalid values).</member>
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>MongoDB\Driver\ServerApi::serialize</methodname></member>
+    <member><function>unserialize</function></member>
+    <member><link linkend="language.oop5.serialization">Serializing Objects</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/set.xml b/reference/mongodb/set.xml
index 448f42e58c..576d2e8922 100644
--- a/reference/mongodb/set.xml
+++ b/reference/mongodb/set.xml
@@ -8,8 +8,7 @@
  <info xml:id="info.mongodb">
   <abstract>
    <simpara>
-    Unlike the <link linkend="book.mongo">mongo</link> extension, this
-    extension is developed atop the
+    This extension is developed atop the
     <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> and
     <link xlink:href="&url.mongodb.libbson;">libbson</link> libraries.
     It provides a minimal API for core driver functionality:
diff --git a/reference/mongodb/tutorial/apm.xml b/reference/mongodb/tutorial/apm.xml
index db8112ef4a..ba88668ecc 100644
--- a/reference/mongodb/tutorial/apm.xml
+++ b/reference/mongodb/tutorial/apm.xml
@@ -67,7 +67,9 @@ class QueryTimeCollector implements \MongoDB\Driver\Monitoring\CommandSubscriber
   <para>
    Once a subscriber object is instantiated, it needs to be registered with the
    driver's monitoring system. This is done by calling
-   <methodname>MongoDB\Driver\Monitoring\addSubscriber</methodname>.
+   <methodname>MongoDB\Driver\Monitoring\addSubscriber</methodname> or
+   <methodname>MongoDB\Driver\Manager::addSubscriber</methodname> to register
+   the subscriber globally or with a specific Manager, respectively.
   </para>
 
   <programlisting role="php">
diff --git a/reference/mongodb/versions.xml b/reference/mongodb/versions.xml
index d1396d0719..7602601887 100644
--- a/reference/mongodb/versions.xml
+++ b/reference/mongodb/versions.xml
@@ -56,6 +56,7 @@
 
  <function name='mongodb\driver\manager' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\driver\manager::__construct' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\driver\manager::addsubscriber' from='mongodb &gt;=1.10.0'/>
  <function name='mongodb\driver\manager::createclientencryption' from='mongodb &gt;=1.7.0'/>
  <function name='mongodb\driver\manager::executebulkwrite' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\driver\manager::executecommand' from='mongodb &gt;=1.0.0'/>
@@ -67,6 +68,7 @@
  <function name='mongodb\driver\manager::getreadpreference' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\driver\manager::getservers' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\driver\manager::getwriteconcern' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\driver\manager::removesubscriber' from='mongodb &gt;=1.10.0'/>
  <function name='mongodb\driver\manager::selectserver' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\driver\manager::startsession' from='mongodb &gt;=1.4.0'/>
 
@@ -112,6 +114,12 @@
  <function name='mongodb\driver\server::isprimary' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\driver\server::issecondary' from='mongodb &gt;=1.0.0'/>
 
+ <function name='mongodb\driver\serverapi' from='mongodb &gt;=1.10.0'/>
+ <function name='mongodb\driver\serverapi::__construct' from='mongodb &gt;=1.10.0'/>
+ <function name='mongodb\driver\serverapi::bsonserialize' from='mongodb &gt;=1.10.0'/>
+ <function name='mongodb\driver\serverapi::serialize' from='mongodb &gt;=1.10.0'/>
+ <function name='mongodb\driver\serverapi::unserialize' from='mongodb &gt;=1.10.0'/>
+
  <function name='mongodb\driver\session' from='mongodb &gt;=1.4.0'/>
  <function name='mongodb\driver\session::__construct' from='mongodb &gt;=1.4.0'/>
  <function name='mongodb\driver\session::aborttransaction' from='mongodb &gt;=1.5.0'/>
diff --git a/reference/mqseries/book.xml b/reference/mqseries/book.xml
index 759f36b737..21f2e576eb 100644
--- a/reference/mqseries/book.xml
+++ b/reference/mqseries/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.mqseries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>mqseries</title>
 
  <!-- {{{ preface -->
diff --git a/reference/mqseries/setup.xml b/reference/mqseries/setup.xml
index 0ca785bc66..44bcc7a67c 100644
--- a/reference/mqseries/setup.xml
+++ b/reference/mqseries/setup.xml
@@ -18,14 +18,6 @@
     just the way the WebSphere MQ Client Interface works.
    </simpara>
   </note>
-  <section xml:id="mqseries.requirements.nix">
-   <title>Installation requirements on non windows platforms</title>
-   <para>Build the extension and put it in the PHP extension directory.</para>
-  </section>
-  <section xml:id="mqseries.requirements.windows">
-   <title>Installation requirements on Windows</title>
-   <para>No additional requirements.</para>
-  </section>
 
  </section>
  <!-- }}} -->
diff --git a/reference/mysql/book.xml b/reference/mysql/book.xml
index 5281bf76bc..a5a3b9c9d4 100644
--- a/reference/mysql/book.xml
+++ b/reference/mysql/book.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
+<!-- State: deprecated -->
 <book xml:id="book.mysql" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal"?>
+ <?phpdoc extension-membership="pecl"?>
  <title>Original MySQL API</title>
  <titleabbrev>MySQL (Original)</titleabbrev>
 
@@ -36,7 +35,6 @@
  &reference.mysql.reference;
 
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mysql/changelog.xml b/reference/mysql/changelog.xml
index 31307a45cb..cd3578b34d 100644
--- a/reference/mysql/changelog.xml
+++ b/reference/mysql/changelog.xml
@@ -36,32 +36,6 @@
         </para>
        </entry>
       </row>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        <para>
-         This extension has been deprecated. Connecting to a MySQL database
-         via <function>mysql_connect</function>,
-         <function>mysql_pconnect</function> or an implicit connection via any
-         other <literal>mysql_*</literal> function will generate an
-         <constant>E_DEPRECATED</constant> error.
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        <para>
-         All of the old deprecated functions and aliases now emit
-         <constant>E_DEPRECATED</constant> errors. These functions are:
-        </para>
-        <para>
-         mysql(), mysql_fieldname(), mysql_fieldtable(), mysql_fieldlen(), mysql_fieldtype(), mysql_fieldflags(), mysql_selectdb(),
-         mysql_createdb(), mysql_dropdb(), mysql_freeresult(), mysql_numfields(), mysql_numrows(), mysql_listdbs(), mysql_listtables(),
-         mysql_listfields(), mysql_db_name(), mysql_dbname(), mysql_tablename(), and mysql_table_name().
-         </para>
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml
index 62733f7b52..e7caa35308 100644
--- a/reference/mysql/functions/mysql-connect.xml
+++ b/reference/mysql/functions/mysql-connect.xml
@@ -114,31 +114,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable xml:id="function.mysql-connect.changelog">
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        This function will generate an <constant>E_DEPRECATED</constant>
-        error.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/mysql/functions/mysql-db-name.xml b/reference/mysql/functions/mysql-db-name.xml
index 552590e69c..9fb771cd3c 100644
--- a/reference/mysql/functions/mysql-db-name.xml
+++ b/reference/mysql/functions/mysql-db-name.xml
@@ -70,31 +70,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable xml:id="function.mysql-db-name.changelog">
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        The <function>mysql_list_dbs</function> function is deprecated, 
-        and emits an <constant>E_DEPRECATED</constant> level error.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/mysql/functions/mysql-get-client-info.xml b/reference/mysql/functions/mysql-get-client-info.xml
index c97b099995..acae754c1b 100644
--- a/reference/mysql/functions/mysql-get-client-info.xml
+++ b/reference/mysql/functions/mysql-get-client-info.xml
@@ -28,6 +28,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysql/functions/mysql-pconnect.xml b/reference/mysql/functions/mysql-pconnect.xml
index 8a1e7599a1..24bd226e57 100644
--- a/reference/mysql/functions/mysql-pconnect.xml
+++ b/reference/mysql/functions/mysql-pconnect.xml
@@ -121,31 +121,6 @@
    failure.
   </para>
  </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable xml:id="function.mysql-pconnect.changelog">
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        This function will generate an <constant>E_DEPRECATED</constant>
-        error.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
 
  <refsect1 role="notes">
   &reftitle.notes;
diff --git a/reference/mysql/functions/mysql-tablename.xml b/reference/mysql/functions/mysql-tablename.xml
index b89954b96a..f6dce07c9e 100644
--- a/reference/mysql/functions/mysql-tablename.xml
+++ b/reference/mysql/functions/mysql-tablename.xml
@@ -69,31 +69,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable xml:id="function.mysql-tablename.changelog">
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.0</entry>
-       <entry>
-        The <function>mysql_tablename</function> function is deprecated, 
-        and emits an <constant>E_DEPRECATED</constant> level error.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/mysql_xdevapi/book.xml b/reference/mysql_xdevapi/book.xml
index ef50291226..6e6f8c4a6b 100644
--- a/reference/mysql_xdevapi/book.xml
+++ b/reference/mysql_xdevapi/book.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision: 348241 $ -->
 
 <book xml:id="book.mysql-xdevapi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Mysql_xdevapi</title>
  <titleabbrev>Mysql_xdevapi</titleabbrev>
 
@@ -26,6 +27,7 @@
 
  &reference.mysql-xdevapi.setup;
  &reference.mysql-xdevapi.constants;
+ &reference.mysql-xdevapi.changelog;
  &reference.mysql-xdevapi.examples;
  &reference.mysql-xdevapi.reference;
 
diff --git a/reference/mysql_xdevapi/changelog.xml b/reference/mysql_xdevapi/changelog.xml
new file mode 100644
index 0000000000..a453f3af0d
--- /dev/null
+++ b/reference/mysql_xdevapi/changelog.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 339141 $ -->
+
+<appendix xmlns="http://docbook.org/ns/docbook" xml:id="changelog.mysql_xdevapi" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>&ChangelogListingTitle;</title>
+ <para>&ChangelogListingDescription;</para>
+
+ <simplesect>
+  <title>General Changelog for the ext/mysql_xdevapi extension</title>
+  <para>
+   This changelog references the ext/mysql_xdevapi extension.
+  </para>
+ </simplesect>
+ 
+ <simplesect xml:id="changelog.mysql_xdevapi.global">
+  <title>Global ext/mysql_xdevapi changes</title>
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>8.0.26</entry>
+       <entry>
+        <para>
+          Deprecated TLSv1 and TLSv1.1 support.
+        </para>
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </simplesect>
+
+</appendix>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
diff --git a/reference/mysqli/functions/mysqli-get-client-stats.xml b/reference/mysqli/functions/mysqli-get-client-stats.xml
index b2dbcc5c2f..aa398609d2 100644
--- a/reference/mysqli/functions/mysqli-get-client-stats.xml
+++ b/reference/mysqli/functions/mysqli-get-client-stats.xml
@@ -14,8 +14,12 @@
   </methodsynopsis>
   <para>
    Returns client per-process statistics.
-   &mysqli.available.mysqlnd;
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/ini.xml b/reference/mysqli/ini.xml
index e0a9e11010..fab903c11f 100644
--- a/reference/mysqli/ini.xml
+++ b/reference/mysqli/ini.xml
@@ -84,7 +84,7 @@
      </row>
      <row>
       <entry><link linkend="ini.mysqli.rollback-on-cached-plink">mysqli.rollback_on_cached_plink</link></entry>
-      <entry>TRUE</entry>
+      <entry>"0"</entry>
       <entry>PHP_INI_SYSTEM</entry>
       <entry></entry>
      </row>
diff --git a/reference/mysqli/mysqli/affected-rows.xml b/reference/mysqli/mysqli/affected-rows.xml
index 749af36671..d12e2fe560 100644
--- a/reference/mysqli/mysqli/affected-rows.xml
+++ b/reference/mysqli/mysqli/affected-rows.xml
@@ -20,10 +20,8 @@
    Returns the number of rows affected by the last <literal>INSERT</literal>,
    <literal>UPDATE</literal>, <literal>REPLACE</literal> or 
    <literal>DELETE</literal> query.
-  </para>
-  <para>
-   For SELECT statements <function>mysqli_affected_rows</function> works like
-   <function>mysqli_num_rows</function>.
+   Works like <function>mysqli_num_rows</function> for
+   <literal>SELECT</literal> statements.
   </para>
  </refsect1>
  
@@ -40,16 +38,18 @@
   &reftitle.returnvalues;
   <para>
    An integer greater than zero indicates the number of rows affected or
-   retrieved.
-   Zero indicates that no records were updated for an UPDATE statement, no
-   rows matched the <literal>WHERE</literal> clause in the query or that no
-   query has yet been executed. -1 indicates that the query returned an
-   error.
+   retrieved. Zero indicates that no records were updated for an 
+   <literal>UPDATE</literal> statement, no rows matched the
+   <literal>WHERE</literal> clause in the query or that no query has yet been
+   executed. <literal>-1</literal> indicates that the query returned an error or
+   that <function>mysqli_affected_rows</function> was called for an unbuffered
+   <literal>SELECT</literal> query.
   </para>
   <note>
    <para>
-    If the number of affected rows is greater than the maximum integer value(<constant> PHP_INT_MAX </constant>), the
-    number of affected rows will be returned as a string.
+    If the number of affected rows is greater than the maximum int value
+    (<constant>PHP_INT_MAX</constant>), the number of affected rows will be
+    returned as a string.
    </para>
   </note>
  </refsect1>
@@ -62,13 +62,9 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
 /* Insert rows */
 $mysqli->query("CREATE TABLE Language SELECT * from CountryLanguage");
@@ -88,26 +84,17 @@ printf("Affected rows (DELETE): %d\n", $mysqli->affected_rows);
 $result = $mysqli->query("SELECT CountryCode FROM Language");
 printf("Affected rows (SELECT): %d\n", $mysqli->affected_rows);
 
-$result->close();
-
 /* Delete table Language */
 $mysqli->query("DROP TABLE Language");
-
-/* close connection */
-$mysqli->close();
-?>
 ]]>
    </programlisting>
    <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-if (!$link) {
-    printf("Can't connect to localhost. Error: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
 /* Insert rows */
 mysqli_query($link, "CREATE TABLE Language SELECT * from CountryLanguage");
@@ -127,14 +114,8 @@ printf("Affected rows (DELETE): %d\n", mysqli_affected_rows($link));
 $result = mysqli_query($link, "SELECT CountryCode FROM Language");
 printf("Affected rows (SELECT): %d\n", mysqli_affected_rows($link));
 
-mysqli_free_result($result);
-
 /* Delete table Language */
 mysqli_query($link, "DROP TABLE Language");
-
-/* close connection */
-mysqli_close($link);
-?>
 ]]>
    </programlisting>
    &examples.outputs;
diff --git a/reference/mysqli/mysqli/autocommit.xml b/reference/mysqli/mysqli/autocommit.xml
index ca7af2f3dc..146c795487 100644
--- a/reference/mysqli/mysqli/autocommit.xml
+++ b/reference/mysqli/mysqli/autocommit.xml
@@ -53,16 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function does not work with non transactional table types (like
-    MyISAM or ISAM).
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -209,6 +199,16 @@ Committed 2 row in the database
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function does not work with non transactional table types (like
+    MyISAM or ISAM).
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/begin-transaction.xml b/reference/mysqli/mysqli/begin-transaction.xml
index 4f5c67093d..83c294fee8 100644
--- a/reference/mysqli/mysqli/begin-transaction.xml
+++ b/reference/mysqli/mysqli/begin-transaction.xml
@@ -83,16 +83,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function does not work with non transactional table types (like
-    MyISAM or ISAM).
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -200,6 +190,16 @@ try {
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function does not work with non transactional table types (like
+    MyISAM or ISAM).
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/change-user.xml b/reference/mysqli/mysqli/change-user.xml
index 9a4dbb5804..c659ebb664 100644
--- a/reference/mysqli/mysqli/change-user.xml
+++ b/reference/mysqli/mysqli/change-user.xml
@@ -81,19 +81,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Using this command will always cause the current database connection to
-    behave as if was a completely new database connection, regardless of if
-    the operation was completed successfully. This reset includes performing
-    a rollback on any active transactions, closing all temporary tables, and
-    unlocking all locked tables.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -185,6 +172,19 @@ Value of variable a is NULL
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Using this command will always cause the current database connection to
+    behave as if was a completely new database connection, regardless of if
+    the operation was completed successfully. This reset includes performing
+    a rollback on any active transactions, closing all temporary tables, and
+    unlocking all locked tables.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/character-set-name.xml b/reference/mysqli/mysqli/character-set-name.xml
index ce20149de2..29c29662a9 100644
--- a/reference/mysqli/mysqli/character-set-name.xml
+++ b/reference/mysqli/mysqli/character-set-name.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>mysqli::character_set_name</refname>
   <refname>mysqli_character_set_name</refname>
-  <refpurpose>Returns the default character set for the database connection</refpurpose>
+  <refpurpose>Returns the current character set of the database connection</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -20,7 +20,7 @@
    <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the current character set for the database connection.
+   Returns the current character set of the database connection.
   </para>
  </refsect1>
 
@@ -35,7 +35,7 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>The default character set for the current connection</para>
+  <para>The current character set of the connection</para>
  </refsect1>
 
  <refsect1 role="examples">
@@ -46,49 +46,38 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-/* Open a connection */
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+/* Set the default character set */
+$mysqli->set_charset('utf8mb4');
 
 /* Print current character set */
 $charset = $mysqli->character_set_name();
-printf ("Current character set is %s\n", $charset);
-
-$mysqli->close();
-?>
+printf("Current character set is %s\n", $charset);
 ]]>
    </programlisting>
    <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-/* Open a connection */
-$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (!$link) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = mysqli_connect("localhost", "my_user", "my_password", "world");
+
+/* Set the default character set */
+mysqli_set_charset($mysqli, 'utf8mb4');
 
 /* Print current character set */
-$charset = mysqli_character_set_name($link);
-printf ("Current character set is %s\n",$charset);
-
-/* close connection */
-mysqli_close($link);
-?>
+$charset = mysqli_character_set_name($mysqli);
+printf("Current character set is %s\n", $charset);
 ]]>
    </programlisting>
    &examples.outputs;
    <screen>
 <![CDATA[
-Current character set is latin1_swedish_ci
+Current character set is utf8mb4
 ]]>
    </screen>
   </example>
diff --git a/reference/mysqli/mysqli/close.xml b/reference/mysqli/mysqli/close.xml
index 43dca7f3af..1b176b1a43 100644
--- a/reference/mysqli/mysqli/close.xml
+++ b/reference/mysqli/mysqli/close.xml
@@ -22,7 +22,14 @@
   <para>
    Closes a previously opened database connection.
   </para>
-  &mysql.close.connections.result.sets;
+  <para>
+   Open non-persistent MySQL connections and result sets are automatically
+   closed when their objects are destroyed. Explicitly closing open 
+   connections and freeing result sets is optional. However, it's a good idea
+   to close the connection as soon as the script finishes performing all of its
+   database operations, if it still has a lot of processing to do after
+   getting the results.
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -43,9 +50,45 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   See <function>mysqli_connect</function>.
-  </para>
+  <example>
+   <title><methodname>mysqli::close</methodname> example</title>
+   <para>&style.oop;</para>
+   <programlisting role="php">
+<![CDATA[
+<?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
+
+$result = $mysqli->query("SELECT Name, CountryCode FROM City ORDER BY ID LIMIT 3");
+
+/* Close the connection as soon as it's no longer needed */
+$mysqli->close();
+
+foreach ($result as $row) {
+    /* Processing of the data retrieved from the database */
+}
+]]>
+   </programlisting>
+   <para>&style.procedural;</para>
+   <programlisting role="php">
+<![CDATA[
+<?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = mysqli_connect("localhost", "my_user", "my_password", "world");
+
+$result = mysqli_query($mysqli, "SELECT Name, CountryCode FROM City ORDER BY ID LIMIT 3");
+
+/* Close the connection as soon as it's no longer needed */
+mysqli_close($mysqli);
+
+foreach ($result as $row) {
+    /* Processing of the data retrieved from the database */
+}
+]]>
+   </programlisting>
+  </example>
  </refsect1>
 
  <refsect1 role="notes">
diff --git a/reference/mysqli/mysqli/commit.xml b/reference/mysqli/mysqli/commit.xml
index 11cb538d79..6720f251e7 100644
--- a/reference/mysqli/mysqli/commit.xml
+++ b/reference/mysqli/mysqli/commit.xml
@@ -59,16 +59,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function does not work with non transactional table types (like
-    MyISAM or ISAM).
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -100,6 +90,16 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function does not work with non transactional table types (like
+    MyISAM or ISAM).
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/connect-errno.xml b/reference/mysqli/mysqli/connect-errno.xml
index fdf397765a..c2ff4af4d4 100644
--- a/reference/mysqli/mysqli/connect-errno.xml
+++ b/reference/mysqli/mysqli/connect-errno.xml
@@ -10,32 +10,27 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <fieldsynopsis><modifier>static</modifier> <type>int</type><varname linkend="mysqli.connect-errno">mysqli->connect_errno</varname></fieldsynopsis>
+  <fieldsynopsis><type>int</type><varname linkend="mysqli.connect-errno">mysqli->connect_errno</varname></fieldsynopsis>
   <para>&style.procedural;</para>
   <methodsynopsis>
    <type>int</type><methodname>mysqli_connect_errno</methodname>
    <void />
   </methodsynopsis>
   <para>
-   Returns the last error code number from the last call to 
-   <function>mysqli_connect</function>.
+   Returns the error code from the last connection attempt.
   </para>
-  <note>
-   <para>
-    Client error message numbers are listed in the MySQL 
-    <filename>errmsg.h</filename> header file, server error message numbers
-    are listed in <filename>mysqld_error.h</filename>. In the MySQL source
-    distribution you can find a complete list of error messages and error
-    numbers in the file <filename>Docs/mysqld_error.txt</filename>.
-   </para>
-  </note>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   An error code value for the last call to <function>mysqli_connect</function>, if it failed.
-   zero means no error occurred.
+   An error code for the last connection attempt, if it failed.
+   Zero means no error occurred.
   </para>
  </refsect1>
 
@@ -47,30 +42,32 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+/* @ is used to suppress default error messages */
 $mysqli = @new mysqli('localhost', 'fake_user', 'my_password', 'my_db');
 
 if ($mysqli->connect_errno) {
-    die('Connect Error: ' . $mysqli->connect_errno);
+    /* Use your preferred error logging method here */
+    error_log('Connection error: ' . $mysqli->connect_errno);
 }
-?>
 ]]>
    </programlisting>
    <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
+/* @ is used to suppress default error messages */
 $link = @mysqli_connect('localhost', 'fake_user', 'my_password', 'my_db');
 
 if (!$link) {
-    die('Connect Error: ' . mysqli_connect_errno());
+    /* Use your preferred error logging method here */
+    error_log('Connection error: ' . mysqli_connect_errno());
 }
-?>
 ]]>
    </programlisting>
    &examples.outputs;
    <screen>
 <![CDATA[
-Connect Error: 1045
+Connection error: 1045
 ]]>
    </screen>
   </example>
diff --git a/reference/mysqli/mysqli/connect-error.xml b/reference/mysqli/mysqli/connect-error.xml
index 1c1041d8e3..27d3330b40 100644
--- a/reference/mysqli/mysqli/connect-error.xml
+++ b/reference/mysqli/mysqli/connect-error.xml
@@ -4,23 +4,27 @@
  <refnamediv>
   <refname>mysqli::$connect_error</refname>
   <refname>mysqli_connect_error</refname>
-  <refpurpose>Returns a string description of the last connect error</refpurpose>
+  <refpurpose>Returns a description of the last connection error</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <fieldsynopsis><modifier>static</modifier> <type class="union"><type>string</type><type>null</type></type><varname linkend="mysqli.connect-error">mysqli-&gt;connect_error</varname></fieldsynopsis>
+  <fieldsynopsis><type class="union"><type>string</type><type>null</type></type><varname linkend="mysqli.connect-error">mysqli-&gt;connect_error</varname></fieldsynopsis>
   <para>&style.procedural;</para>
   <methodsynopsis>
    <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_connect_error</methodname>
    <void/>
   </methodsynopsis>
   <para>
-   Returns the last error message string from the last call to 
-   <function>mysqli_connect</function>.
+   Returns the error message from the last connection attempt.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
@@ -37,30 +41,32 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+/* @ is used to suppress default error messages */
 $mysqli = @new mysqli('localhost', 'fake_user', 'my_password', 'my_db');
 
 if ($mysqli->connect_error) {
-    die('Connect Error: ' . $mysqli->connect_error);
+    /* Use your preferred error logging method here */
+    error_log('Connection error: ' . $mysqli->connect_error);
 }
-?>
 ]]>
    </programlisting>
    <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
+/* @ is used to suppress default error messages */
 $link = @mysqli_connect('localhost', 'fake_user', 'my_password', 'my_db');
 
 if (!$link) {
-    die('Connect Error: ' . mysqli_connect_error());
+    /* Use your preferred error logging method here */
+    error_log('Connection error: ' . mysqli_connect_error());
 }
-?>
 ]]>
    </programlisting>
    &examples.outputs;
    <screen>
 <![CDATA[
-Connect Error: Access denied for user 'fake_user'@'localhost' (using password: YES)
+Connection error: Access denied for user 'fake_user'@'localhost' (using password: YES)
 ]]>
    </screen>
   </example>
diff --git a/reference/mysqli/mysqli/construct.xml b/reference/mysqli/mysqli/construct.xml
index b9010d4f95..6a47f46ed7 100644
--- a/reference/mysqli/mysqli/construct.xml
+++ b/reference/mysqli/mysqli/construct.xml
@@ -13,29 +13,29 @@
   <para>&style.oop;</para>
   <constructorsynopsis>
    <modifier>public</modifier> <methodname>mysqli::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter><initializer>ini_get("mysqli.default_host")</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>hostname</parameter><initializer>ini_get("mysqli.default_host")</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>username</parameter><initializer>ini_get("mysqli.default_user")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter><initializer>ini_get("mysqli.default_pw")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>dbname</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>ini_get("mysqli.default_pw")</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>database</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>ini_get("mysqli.default_port")</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>socket</parameter><initializer>ini_get("mysqli.default_socket")</initializer></methodparam>
   </constructorsynopsis>
   <methodsynopsis role="oop">
    <modifier>public</modifier> <type>void</type><methodname>mysqli::connect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter><initializer>ini_get("mysqli.default_host")</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>hostname</parameter><initializer>ini_get("mysqli.default_host")</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>username</parameter><initializer>ini_get("mysqli.default_user")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter><initializer>ini_get("mysqli.default_pw")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>dbname</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>ini_get("mysqli.default_pw")</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>database</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>ini_get("mysqli.default_port")</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>socket</parameter><initializer>ini_get("mysqli.default_socket")</initializer></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
   <methodsynopsis>
    <type class="union"><type>mysqli</type><type>false</type></type><methodname>mysqli_connect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter><initializer>ini_get("mysqli.default_host")</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>hostname</parameter><initializer>ini_get("mysqli.default_host")</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>username</parameter><initializer>ini_get("mysqli.default_user")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter><initializer>ini_get("mysqli.default_pw")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>dbname</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>ini_get("mysqli.default_pw")</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>database</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>ini_get("mysqli.default_port")</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>socket</parameter><initializer>ini_get("mysqli.default_socket")</initializer></methodparam>
   </methodsynopsis>
@@ -49,7 +49,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        Can be either a host name or an IP address. The local host is 
@@ -73,7 +73,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>passwd</parameter></term>
+     <term><parameter>password</parameter></term>
      <listitem>
       <para>
        If not provided or &null;, the MySQL server will attempt to authenticate
@@ -84,7 +84,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dbname</parameter></term>
+     <term><parameter>database</parameter></term>
      <listitem>
       <para>
        If provided will specify the default database to be used when
@@ -111,7 +111,7 @@
         Specifying the <parameter>socket</parameter> parameter will not
         explicitly determine the type of connection to be used when
         connecting to the MySQL server. How the connection is made to the
-        MySQL database is determined by the <parameter>host</parameter>
+        MySQL database is determined by the <parameter>hostname</parameter>
         parameter.
        </para>
       </note>
diff --git a/reference/mysqli/mysqli/debug.xml b/reference/mysqli/mysqli/debug.xml
index 0c629a78fd..f3f0e4cd01 100644
--- a/reference/mysqli/mysqli/debug.xml
+++ b/reference/mysqli/mysqli/debug.xml
@@ -47,16 +47,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    To use the <function>mysqli_debug</function> function you must compile
-    the MySQL client library to support debugging.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -76,6 +66,16 @@ mysqli_debug("d:t:o,/tmp/client.trace");
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    To use the <function>mysqli_debug</function> function you must compile
+    the MySQL client library to support debugging.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/errno.xml b/reference/mysqli/mysqli/errno.xml
index d51766fa76..f2a2169a9e 100644
--- a/reference/mysqli/mysqli/errno.xml
+++ b/reference/mysqli/mysqli/errno.xml
@@ -20,14 +20,6 @@
    Returns the last error code for the most recent MySQLi function call that
    can succeed or fail.
   </para>
-  <para>
-   Client error message numbers are listed in the MySQL 
-   <filename>errmsg.h</filename> header file, server error message numbers
-   are listed in <filename>mysqld_error.h</filename>.
-   In the MySQL source distribution you can find a complete list of error
-   messages and error numbers in the file 
-   <filename>Docs/mysqld_error.txt</filename>.
-  </para>
  </refsect1>
  
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/get-client-info.xml b/reference/mysqli/mysqli/get-client-info.xml
index c239d91151..bbda134b7b 100644
--- a/reference/mysqli/mysqli/get-client-info.xml
+++ b/reference/mysqli/mysqli/get-client-info.xml
@@ -26,6 +26,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysqli/mysqli/get-client-version.xml b/reference/mysqli/mysqli/get-client-version.xml
index e9bea790f5..5194c982a5 100644
--- a/reference/mysqli/mysqli/get-client-version.xml
+++ b/reference/mysqli/mysqli/get-client-version.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysqli/mysqli/get-connection-stats.xml b/reference/mysqli/mysqli/get-connection-stats.xml
index 304c0f56be..aa21ee97af 100644
--- a/reference/mysqli/mysqli/get-connection-stats.xml
+++ b/reference/mysqli/mysqli/get-connection-stats.xml
@@ -21,8 +21,12 @@
   </methodsynopsis>
   <para>
    Returns statistics about the client connection.
-   &mysqli.available.mysqlnd;
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/init.xml b/reference/mysqli/mysqli/init.xml
index 9668752893..f133ece6e5 100644
--- a/reference/mysqli/mysqli/init.xml
+++ b/reference/mysqli/mysqli/init.xml
@@ -32,6 +32,11 @@
   </note>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysqli/mysqli/insert-id.xml b/reference/mysqli/mysqli/insert-id.xml
index 97eb53b38b..f22f51a7f4 100644
--- a/reference/mysqli/mysqli/insert-id.xml
+++ b/reference/mysqli/mysqli/insert-id.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>mysqli::$insert_id</refname>
   <refname>mysqli_insert_id</refname>
-  <refpurpose>Returns the auto generated id used in the latest query</refpurpose>
+  <refpurpose>Returns the value generated for an AUTO_INCREMENT column by the last query</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -17,19 +17,25 @@
    <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
   </methodsynopsis>
   <para>
-   The <function>mysqli_insert_id</function> function returns the ID generated
-   by a query (usually INSERT) on a table with a column having the
-   AUTO_INCREMENT attribute. If no INSERT or UPDATE statements were sent via this 
-connection, or if the modified table does not have a column
-   with the AUTO_INCREMENT attribute, this function will return zero.
+   Returns the ID generated by an <literal>INSERT</literal> or
+   <literal>UPDATE</literal> query on a table with a column having the
+   <literal>AUTO_INCREMENT</literal> attribute. In the case of a multiple-row
+   <literal>INSERT</literal> statement, it returns the first automatically
+   generated value that was successfully inserted.
+  </para>
+  <para>
+   Performing an <literal>INSERT</literal> or <literal>UPDATE</literal>
+   statement using the <literal>LAST_INSERT_ID()</literal>
+   MySQL function will also modify the value returned by <function>mysqli_insert_id</function>.
+   If <literal>LAST_INSERT_ID(expr)</literal> was used to generate the value of
+   <literal>AUTO_INCREMENT</literal>, it returns the value of the last <literal>expr</literal>
+   instead of the generated <literal>AUTO_INCREMENT</literal> value.
+  </para>
+  <para>
+   Returns <literal>0</literal> if the previous statement did not change an 
+   <literal>AUTO_INCREMENT</literal> value. <function>mysqli_insert_id</function> must be
+   called immediately after the statement that generated the value.
   </para>
-  <note>
-   <para>
-    Performing an INSERT or UPDATE statement using the LAST_INSERT_ID()
-    function will also modify the value returned by the
-    <function>mysqli_insert_id</function> function.
-   </para>
-  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,10 +55,14 @@ connection, or if the modified table does not have a column
    connection or if the query did not update an <literal>AUTO_INCREMENT</literal>
    value.
   </para>
+  <para>
+   Only statements issued using the current connection affect the return value. The
+   value is not affected by statements issued using other connections or clients.
+  </para>
   <note>
    <para>
-    If the number is greater than maximal int value, <function>mysqli_insert_id</function>
-    will return a string.
+    If the number is greater than the maximum int value, it will be returned as
+    a string.
    </para>
   </note>
  </refsect1>
@@ -65,60 +75,44 @@ connection, or if the modified table does not have a column
    <programlisting role="php">
 <![CDATA[
 <?php
-$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
 $mysqli->query("CREATE TABLE myCity LIKE City");
 
 $query = "INSERT INTO myCity VALUES (NULL, 'Stuttgart', 'DEU', 'Stuttgart', 617000)";
 $mysqli->query($query);
 
-printf ("New Record has id %d.\n", $mysqli->insert_id);
+printf("New record has ID %d.\n", $mysqli->insert_id);
 
 /* drop table */
 $mysqli->query("DROP TABLE myCity");
-
-/* close connection */
-$mysqli->close();
-?>
 ]]>
    </programlisting>
    <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
 mysqli_query($link, "CREATE TABLE myCity LIKE City");
 
 $query = "INSERT INTO myCity VALUES (NULL, 'Stuttgart', 'DEU', 'Stuttgart', 617000)";
 mysqli_query($link, $query);
 
-printf ("New Record has id %d.\n", mysqli_insert_id($link));
+printf("New record has ID %d.\n", mysqli_insert_id($link));
 
 /* drop table */
 mysqli_query($link, "DROP TABLE myCity");
-
-/* close connection */
-mysqli_close($link);
-?>
 ]]>
    </programlisting>
    &examples.outputs;
    <screen>
 <![CDATA[
-New Record has id 1.
+New record has ID 1.
 ]]>
    </screen>
   </example>
diff --git a/reference/mysqli/mysqli/multi-query.xml b/reference/mysqli/mysqli/multi-query.xml
index dc30f7f0de..9667c67358 100644
--- a/reference/mysqli/mysqli/multi-query.xml
+++ b/reference/mysqli/mysqli/multi-query.xml
@@ -42,9 +42,7 @@
       <para>
        The query, as a string.
       </para>
-      <para>
-       Data inside the query should be <link linkend="mysqli.real-escape-string">properly escaped</link>.
-      </para>
+      &mysqli.sqlinjection.warning;
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml
index 52071d5b3a..8e6e83737f 100644
--- a/reference/mysqli/mysqli/poll.xml
+++ b/reference/mysqli/mysqli/poll.xml
@@ -29,10 +29,14 @@
   </methodsynopsis>
   <para>
    Poll connections.
-   &mysqli.available.mysqlnd;
    The method can be used as
    <link linkend="language.oop5.static">static</link>.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/query.xml b/reference/mysqli/mysqli/query.xml
index 3df7427eed..e240544576 100644
--- a/reference/mysqli/mysqli/query.xml
+++ b/reference/mysqli/mysqli/query.xml
@@ -77,17 +77,7 @@
       <para>
        The query string.
       </para>
-      <warning>
-       <title>Security warning: SQL injection</title>
-       <para>
-        If the query contains any variable input then 
-        <link linkend="mysqli.quickstart.prepared-statements">parameterized
-        prepared statements</link> should be used instead. Alternatively, the
-        data must be properly formatted and all strings must be escaped using 
-        the <function>mysqli_real_escape_string</function>
-        function.
-       </para>
-      </warning>
+      &mysqli.sqlinjection.warning;
      </listitem>
     </varlistentry>
     <varlistentry>
diff --git a/reference/mysqli/mysqli/real-query.xml b/reference/mysqli/mysqli/real-query.xml
index e4e5f08fc5..b7a2e4e42d 100644
--- a/reference/mysqli/mysqli/real-query.xml
+++ b/reference/mysqli/mysqli/real-query.xml
@@ -42,17 +42,7 @@
       <para>
        The query string.
       </para>
-      <warning>
-       <title>Security warning: SQL injection</title>
-       <para>
-        If the query contains any variable input then 
-        <link linkend="mysqli.quickstart.prepared-statements">parameterized
-        prepared statements</link> should be used instead. Alternatively, the
-        data must be properly formatted and all strings must be escaped using 
-        the <function>mysqli_real_escape_string</function>
-        function.
-       </para>
-      </warning>
+      &mysqli.sqlinjection.warning;
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/mysqli/mysqli/reap-async-query.xml b/reference/mysqli/mysqli/reap-async-query.xml
index 0f61e33477..da4a0d413f 100644
--- a/reference/mysqli/mysqli/reap-async-query.xml
+++ b/reference/mysqli/mysqli/reap-async-query.xml
@@ -21,8 +21,12 @@
   </methodsynopsis>
   <para>
    Get result from async query.
-   &mysqli.available.mysqlnd;
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/rollback.xml b/reference/mysqli/mysqli/rollback.xml
index c94f89174f..83fbe34eed 100644
--- a/reference/mysqli/mysqli/rollback.xml
+++ b/reference/mysqli/mysqli/rollback.xml
@@ -59,16 +59,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function does not work with non transactional table types (like
-    MyISAM or ISAM).
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -100,6 +90,16 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function does not work with non transactional table types (like
+    MyISAM or ISAM).
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/set-charset.xml b/reference/mysqli/mysqli/set-charset.xml
index ae5821dea0..494d37a72f 100644
--- a/reference/mysqli/mysqli/set-charset.xml
+++ b/reference/mysqli/mysqli/set-charset.xml
@@ -50,24 +50,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    To use this function on a Windows platform you need MySQL client library
-    version 4.1.11 or above (for MySQL 5.0 you need 5.0.6 or above).
-   </para>
-  </note>
-  <note>
-   <para>
-    This is the preferred way to change the charset. Using
-    <function>mysqli_query</function> to set it (such as <literal>SET NAMES utf8</literal>)
-    is not recommended. See the <link linkend="mysqlinfo.concepts.charset">MySQL character set concepts</link>
-    section for more information.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -134,6 +116,24 @@ Current character set: utf8mb4
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    To use this function on a Windows platform you need MySQL client library
+    version 4.1.11 or above (for MySQL 5.0 you need 5.0.6 or above).
+   </para>
+  </note>
+  <note>
+   <para>
+    This is the preferred way to change the charset. Using
+    <function>mysqli_query</function> to set it (such as <literal>SET NAMES utf8</literal>)
+    is not recommended. See the <link linkend="mysqlinfo.concepts.charset">MySQL character set concepts</link>
+    section for more information.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/store-result.xml b/reference/mysqli/mysqli/store-result.xml
index bef496cb0f..98c8987011 100644
--- a/reference/mysqli/mysqli/store-result.xml
+++ b/reference/mysqli/mysqli/store-result.xml
@@ -88,6 +88,13 @@
   </note>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   See <function>mysqli_multi_query</function>.
+  </para>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
@@ -101,13 +108,6 @@
   </note>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   See <function>mysqli_multi_query</function>.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli/thread-safe.xml b/reference/mysqli/mysqli/thread-safe.xml
index af3d61562c..6537d506e6 100644
--- a/reference/mysqli/mysqli/thread-safe.xml
+++ b/reference/mysqli/mysqli/thread-safe.xml
@@ -24,6 +24,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysqli/mysqli/use-result.xml b/reference/mysqli/mysqli/use-result.xml
index de9dedf301..88cf8bf488 100644
--- a/reference/mysqli/mysqli/use-result.xml
+++ b/reference/mysqli/mysqli/use-result.xml
@@ -45,6 +45,11 @@
   </note>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysqli/mysqli_result/data-seek.xml b/reference/mysqli/mysqli_result/data-seek.xml
index 41fd36ea38..6fe01de290 100644
--- a/reference/mysqli/mysqli_result/data-seek.xml
+++ b/reference/mysqli/mysqli_result/data-seek.xml
@@ -52,17 +52,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function can only be used with buffered results attained from the
-    use of the <function>mysqli_store_result</function> or
-    <function>mysqli_query</function> functions.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -144,6 +133,17 @@ City: Benin City  Countrycode: NGA
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function can only be used with buffered results attained from the
+    use of the <function>mysqli_store_result</function> or
+    <function>mysqli_query</function> functions.
+   </para>
+  </note>
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli_result/fetch-all.xml b/reference/mysqli/mysqli_result/fetch-all.xml
index 0f5750d640..e4439fb345 100644
--- a/reference/mysqli/mysqli_result/fetch-all.xml
+++ b/reference/mysqli/mysqli_result/fetch-all.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>mysqli_result::fetch_all</refname>
   <refname>mysqli_fetch_all</refname>
-  <refpurpose>Fetches all result rows as an associative array, a numeric array, or both</refpurpose>
+  <refpurpose>Fetch all result rows as an associative array, a numeric array, or both</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -21,9 +21,14 @@
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>MYSQLI_NUM</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   <function>mysqli_fetch_all</function> fetches all result rows and returns the result 
-   set as an associative array, a numeric array, or both.
+   Returns a two-dimensional array of all result rows 
+   as an associative array, a numeric array, or both.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -53,24 +58,51 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <example>
+   <title><methodname>mysqli_result::fetch_all</methodname> example</title>
+   <para>&style.oop;</para>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-  <para>
-    As <function>mysqli_fetch_all</function> returns all the rows as an
-    array in a single step, it may consume more memory than some similar
-    functions such as <function>mysqli_fetch_array</function>, which
-    only returns one row at a time from the result set. Further, if you
-    need to iterate over the result set, you will need a looping
-    construct that will further impact performance. For these reasons
-    <function>mysqli_fetch_all</function> should only be used in those
-    situations where the fetched result set will be sent to another
-    layer for processing.
-  </para>
+$result = $mysqli->query("SELECT Name, CountryCode FROM City ORDER BY ID LIMIT 3");
+
+$rows = $result->fetch_all(MYSQLI_ASSOC);
+foreach ($rows as $row) {
+    printf("%s (%s)\n", $row["Name"], $row["CountryCode"]);
+}
+]]>
+   </programlisting>
+   <para>&style.procedural;</para>
+   <programlisting role="php">
+<![CDATA[
+<?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = mysqli_connect("localhost", "my_user", "my_password", "world");
+
+$result = mysqli_query($mysqli, "SELECT Name, CountryCode FROM City ORDER BY ID LIMIT 3");
+
+$rows = mysqli_fetch_all($result, MYSQLI_ASSOC);
+foreach ($rows as $row) {
+    printf("%s (%s)\n", $row["Name"], $row["CountryCode"]);
+}
+]]>
+   </programlisting>
+   &examples.outputs;
+   <screen>
+<![CDATA[
+Kabul (AFG)
+Qandahar (AFG)
+Herat (AFG)
+]]>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/mysqli/mysqli_stmt/affected-rows.xml b/reference/mysqli/mysqli_stmt/affected-rows.xml
index 1ad820cc50..ba6e8ce840 100644
--- a/reference/mysqli/mysqli_stmt/affected-rows.xml
+++ b/reference/mysqli/mysqli_stmt/affected-rows.xml
@@ -4,8 +4,8 @@
  <refnamediv>
   <refname>mysqli_stmt::$affected_rows</refname>
   <refname>mysqli_stmt_affected_rows</refname>
-  <refpurpose>Returns the total number of rows changed, deleted, or
-  inserted by the last executed statement
+  <refpurpose>Returns the total number of rows changed, deleted, inserted, or
+  matched by the last statement executed
   </refpurpose>
  </refnamediv>
 
@@ -21,11 +21,8 @@
   <para>
    Returns the number of rows affected by <literal>INSERT</literal>,
    <literal>UPDATE</literal>, or <literal>DELETE</literal> query. 
-  </para>
-  <para>
-   This function only works with queries which update a table. In order to
-   get the number of rows from a SELECT query, use 
-   <function>mysqli_stmt_num_rows</function> instead.
+   Works like <function>mysqli_stmt_num_rows</function> for
+   <literal>SELECT</literal> statements.
   </para>
  </refsect1>
 
@@ -42,15 +39,17 @@
   &reftitle.returnvalues;
   <para>
    An integer greater than zero indicates the number of rows affected or
-   retrieved.
-   Zero indicates that no records where updated for an UPDATE/DELETE
-   statement, no rows matched the WHERE clause in the query or that no query
-   has yet been executed. -1 indicates that the query has returned an error.
-   NULL indicates an invalid argument was supplied to the function.
+   retrieved. Zero indicates that no records were updated for an 
+   <literal>UPDATE</literal> statement, no rows matched the
+   <literal>WHERE</literal> clause in the query or that no query has yet been
+   executed. <literal>-1</literal> indicates that the query returned an error or
+   that, for a <literal>SELECT</literal> query,
+   <function>mysqli_stmt_affected_rows</function> was called prior to calling
+   <function>mysqli_stmt_store_result</function>.
   </para>
   <note>
    <para>
-    If the number of affected rows is greater than maximal PHP int value, the
+    If the number of affected rows is greater than maximum PHP int value, the
     number of affected rows will be returned as a string value.
    </para>
   </note>
@@ -59,17 +58,14 @@
  <refsect1 role="examples">
  &reftitle.examples;
   <example>
-   <title>&style.oop;</title>
+   <title><methodname>mysqli_stmt_affected_rows</methodname> example</title>
+   <para>&style.oop;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
 /* create temp table */
 $mysqli->query("CREATE TEMPORARY TABLE myCountry LIKE Country");
@@ -77,39 +73,25 @@ $mysqli->query("CREATE TEMPORARY TABLE myCountry LIKE Country");
 $query = "INSERT INTO myCountry SELECT * FROM Country WHERE Code LIKE ?";
 
 /* prepare statement */
-if ($stmt = $mysqli->prepare($query)) {
+$stmt = $mysqli->prepare($query);
 
-    /* Bind variable for placeholder */
-    $code = 'A%';
-    $stmt->bind_param("s", $code);
+/* Bind variable for placeholder */
+$code = 'A%';
+$stmt->bind_param("s", $code);
 
-    /* execute statement */
-    $stmt->execute();
+/* execute statement */
+$stmt->execute();
 
-    printf("rows inserted: %d\n", $stmt->affected_rows);
-
-    /* close statement */
-    $stmt->close();
-}
-
-/* close connection */
-$mysqli->close();
-?>
+printf("Rows inserted: %d\n", $stmt->affected_rows);
 ]]>
    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
+   <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
 /* create temp table */
 mysqli_query($link, "CREATE TEMPORARY TABLE myCountry LIKE Country");
@@ -117,30 +99,22 @@ mysqli_query($link, "CREATE TEMPORARY TABLE myCountry LIKE Country");
 $query = "INSERT INTO myCountry SELECT * FROM Country WHERE Code LIKE ?";
 
 /* prepare statement */
-if ($stmt = mysqli_prepare($link, $query)) {
+$stmt = mysqli_prepare($link, $query);
 
-    /* Bind variable for placeholder */
-    $code = 'A%';
-    mysqli_stmt_bind_param($stmt, "s", $code);
+/* Bind variable for placeholder */
+$code = 'A%';
+mysqli_stmt_bind_param($stmt, "s", $code);
 
-    /* execute statement */
-    mysqli_stmt_execute($stmt);
+/* execute statement */
+mysqli_stmt_execute($stmt);
 
-    printf("rows inserted: %d\n", mysqli_stmt_affected_rows($stmt));
-
-    /* close statement */
-    mysqli_stmt_close($stmt);
-}
-
-/* close connection */
-mysqli_close($link);
-?>
+printf("Rows inserted: %d\n", mysqli_stmt_affected_rows($stmt));
 ]]>
    </programlisting>
    &examples.outputs;
    <screen>
 <![CDATA[
-rows inserted: 17
+Rows inserted: 17
 ]]>
    </screen>
   </example>
@@ -151,7 +125,7 @@ rows inserted: 17
   <para>
    <simplelist>
     <member><function>mysqli_stmt_num_rows</function></member>
-    <member><function>mysqli_prepare</function></member>
+    <member><function>mysqli_stmt_store_result</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/mysqli/mysqli_stmt/attr-set.xml b/reference/mysqli/mysqli_stmt/attr-set.xml
index c011de53f4..5df59422ea 100644
--- a/reference/mysqli/mysqli_stmt/attr-set.xml
+++ b/reference/mysqli/mysqli_stmt/attr-set.xml
@@ -98,6 +98,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli_stmt/bind-param.xml b/reference/mysqli/mysqli_stmt/bind-param.xml
index 438c2a7e3e..433de60321 100644
--- a/reference/mysqli/mysqli_stmt/bind-param.xml
+++ b/reference/mysqli/mysqli_stmt/bind-param.xml
@@ -25,8 +25,8 @@
    <methodparam rep="repeat"><type>mixed</type><parameter role="reference">vars</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Bind variables for the parameter markers in the SQL statement that was
-   passed to <function>mysqli_prepare</function>.
+   Bind variables for the parameter markers in the SQL statement prepared by
+   <function>mysqli_prepare</function> or <function>mysqli_stmt_prepare</function>.
   </para>
   <note>
    <para>
@@ -113,17 +113,14 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title>&style.oop;</title>
+   <title><methodname>mysqli_stmt::bind_param</methodname> example</title>
+   <para>&style.oop;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-$mysqli = new mysqli('localhost', 'my_user', 'my_password', 'world');
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli('localhost', 'my_user', 'my_password', 'world');
 
 $stmt = $mysqli->prepare("INSERT INTO CountryLanguage VALUES (?, ?, ?, ?)");
 $stmt->bind_param('sssd', $code, $language, $official, $percent);
@@ -133,36 +130,22 @@ $language = 'Bavarian';
 $official = "F";
 $percent = 11.2;
 
-/* execute prepared statement */
 $stmt->execute();
 
-printf("%d Row inserted.\n", $stmt->affected_rows);
-
-/* close statement and connection */
-$stmt->close();
+printf("%d row inserted.\n", $stmt->affected_rows);
 
 /* Clean up table CountryLanguage */
 $mysqli->query("DELETE FROM CountryLanguage WHERE Language='Bavarian'");
-printf("%d Row deleted.\n", $mysqli->affected_rows);
-
-/* close connection */
-$mysqli->close();
-?>
+printf("%d row deleted.\n", $mysqli->affected_rows);
 ]]>
    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
+   <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
-$link = mysqli_connect('localhost', 'my_user', 'my_password', 'world');
 
-/* check connection */
-if (!$link) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$link = mysqli_connect('localhost', 'my_user', 'my_password', 'world');
 
 $stmt = mysqli_prepare($link, "INSERT INTO CountryLanguage VALUES (?, ?, ?, ?)");
 mysqli_stmt_bind_param($stmt, 'sssd', $code, $language, $official, $percent);
@@ -172,28 +155,49 @@ $language = 'Bavarian';
 $official = "F";
 $percent = 11.2;
 
-/* execute prepared statement */
 mysqli_stmt_execute($stmt);
 
-printf("%d Row inserted.\n", mysqli_stmt_affected_rows($stmt));
-
-/* close statement and connection */
-mysqli_stmt_close($stmt);
+printf("%d row inserted.\n", mysqli_stmt_affected_rows($stmt));
 
 /* Clean up table CountryLanguage */
 mysqli_query($link, "DELETE FROM CountryLanguage WHERE Language='Bavarian'");
-printf("%d Row deleted.\n", mysqli_affected_rows($link));
-
-/* close connection */
-mysqli_close($link);
-?>
+printf("%d row deleted.\n", mysqli_affected_rows($link));
 ]]>
    </programlisting>
    &examples.outputs;
    <screen>
 <![CDATA[
-1 Row inserted.
-1 Row deleted.
+1 row inserted.
+1 row deleted.
+]]>
+   </screen>
+  </example>
+  <example>
+   <title>Using <literal>...</literal> to provide arguments</title>
+   <para>
+    The <literal>...</literal> operator can be used to provide variable-length
+    argument list, e.g. in a <literal>WHERE IN</literal> clause.
+   </para>
+   <programlisting role="php">
+<![CDATA[
+<?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli('localhost', 'my_user', 'my_password', 'world');
+
+$stmt = $mysqli->prepare("SELECT Language FROM CountryLanguage WHERE CountryCode IN (?, ?)");
+/* Using ... to provide arguments */
+$stmt->bind_param('ss', ...['DEU', 'POL']);
+$stmt->execute();
+$stmt->store_result();
+
+printf("%d rows found.\n", $stmt->num_rows());
+]]>
+   </programlisting>
+   &examples.outputs;
+   <screen>
+<![CDATA[
+10 rows found.
 ]]>
    </screen>
   </example>
diff --git a/reference/mysqli/mysqli_stmt/bind-result.xml b/reference/mysqli/mysqli_stmt/bind-result.xml
index b741beefad..bde4d1150c 100644
--- a/reference/mysqli/mysqli_stmt/bind-result.xml
+++ b/reference/mysqli/mysqli_stmt/bind-result.xml
@@ -30,20 +30,31 @@
    MySQL client/server protocol places the data for the bound columns into
    the specified variables <parameter>var</parameter>/<parameter>vars</parameter>.
   </para>
+  <para>
+   A column can be bound or rebound at any time, even after a result set has
+   been partially retrieved. The new binding takes effect the next time 
+   <function>mysqli_stmt_fetch</function> is called.
+  </para>
   <note>
    <para>
-    Note that all columns must be bound after 
+    All columns must be bound after 
     <function>mysqli_stmt_execute</function> and prior to calling
     <function>mysqli_stmt_fetch</function>.
+   </para>
+  </note>
+  <note>
+   <para>
     Depending on column types bound variables can silently change to the
     corresponding PHP type.
    </para>
-   <para>
-    A column can be bound or rebound at any time, even after a result set has
-    been partially retrieved. The new binding takes effect the next time 
-    <function>mysqli_stmt_fetch</function> is called.
-   </para>
   </note>
+  <tip>
+   <para>
+    This functions is useful for simple results. To retrieve iterable result
+    set, or fetch each row as an array or object,
+    use <function>mysqli_stmt_get_result</function>.
+   </para>
+  </tip>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -85,32 +96,21 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
-
 /* prepare statement */
-if ($stmt = $mysqli->prepare("SELECT Code, Name FROM Country ORDER BY Name LIMIT 5")) {
-    $stmt->execute();
+$stmt = $mysqli->prepare("SELECT Code, Name FROM Country ORDER BY Name LIMIT 5");
+$stmt->execute();
 
-    /* bind variables to prepared statement */
-    $stmt->bind_result($col1, $col2);
+/* bind variables to prepared statement */
+$stmt->bind_result($col1, $col2);
 
-    /* fetch values */
-    while ($stmt->fetch()) {
-        printf("%s %s\n", $col1, $col2);
-    }
-
-    /* close statement */
-    $stmt->close();
+/* fetch values */
+while ($stmt->fetch()) {
+    printf("%s %s\n", $col1, $col2);
 }
-/* close connection */
-$mysqli->close();
-
-?>
 ]]>
    </programlisting>
   </example>
@@ -119,36 +119,24 @@ $mysqli->close();
    <programlisting role="php">
 <![CDATA[
 <?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (!$link) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
-
 /* prepare statement */
-if ($stmt = mysqli_prepare($link, "SELECT Code, Name FROM Country ORDER BY Name LIMIT 5")) {
-    mysqli_stmt_execute($stmt);
+$stmt = mysqli_prepare($link, "SELECT Code, Name FROM Country ORDER BY Name LIMIT 5");
+mysqli_stmt_execute($stmt);
 
-    /* bind variables to prepared statement */
-    mysqli_stmt_bind_result($stmt, $col1, $col2);
+/* bind variables to prepared statement */
+mysqli_stmt_bind_result($stmt, $col1, $col2);
 
-    /* fetch values */
-    while (mysqli_stmt_fetch($stmt)) {
-        printf("%s %s\n", $col1, $col2);
-    }
-
-    /* close statement */
-    mysqli_stmt_close($stmt);
+/* fetch values */
+while (mysqli_stmt_fetch($stmt)) {
+    printf("%s %s\n", $col1, $col2);
 }
-
-/* close connection */
-mysqli_close($link);
-?>
 ]]>
    </programlisting>
-   &examples.outputs;
+   &examples.outputs.similar;
    <screen>
 <![CDATA[
 AFG Afghanistan
@@ -171,9 +159,6 @@ AND Andorra
     <member><function>mysqli_stmt_fetch</function></member>
     <member><function>mysqli_prepare</function></member>
     <member><function>mysqli_stmt_prepare</function></member>
-    <member><function>mysqli_stmt_init</function></member>
-    <member><function>mysqli_stmt_errno</function></member>
-    <member><function>mysqli_stmt_error</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/mysqli/mysqli_stmt/errno.xml b/reference/mysqli/mysqli_stmt/errno.xml
index d579bcc736..69571e3430 100644
--- a/reference/mysqli/mysqli_stmt/errno.xml
+++ b/reference/mysqli/mysqli_stmt/errno.xml
@@ -20,15 +20,6 @@
    Returns the error code for the most recently invoked statement function
    that can succeed or fail.
   </para>
-  <para>
-   Client error message numbers are listed in the MySQL
-   <filename>errmsg.h</filename> header file,
-   server error message numbers are listed in
-   <filename>mysqld_error.h</filename>.
-   In the MySQL source distribution you can find a complete list of error
-   messages and error numbers in the file 
-   <filename>Docs/mysqld_error.txt</filename>.
-  </para>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli_stmt/get-result.xml b/reference/mysqli/mysqli_stmt/get-result.xml
index ab099f6cae..51e46486e6 100644
--- a/reference/mysqli/mysqli_stmt/get-result.xml
+++ b/reference/mysqli/mysqli_stmt/get-result.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>mysqli_stmt::get_result</refname>
   <refname>mysqli_stmt_get_result</refname>
-  <refpurpose>Gets a result set from a prepared statement</refpurpose>
+  <refpurpose>Gets a result set from a prepared statement as a <classname>mysqli_result</classname> object</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -20,8 +20,23 @@
    <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Call to return a result set from a prepared statement query.
+    Retrieves a result set from a prepared statement as a
+    <classname>mysqli_result</classname> object. The data will be fetched from
+    the MySQL server to PHP. This method should be called only for
+    queries which produce a result set.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
+  <note>
+   <para>
+    This function cannot be used together
+    with <function>mysqli_stmt_store_result</function>. Both of these functions
+    retrieve the full result set from the MySQL server.
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -45,60 +60,34 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
    <title>&style.oop;</title>
    <programlisting role="php">
 <![CDATA[
-<?php 
+<?php
 
-$mysqli = new mysqli("127.0.0.1", "user", "password", "world"); 
-
-if($mysqli->connect_error)
-{
-    die("$mysqli->connect_errno: $mysqli->connect_error");
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
 $query = "SELECT Name, Population, Continent FROM Country WHERE Continent=? ORDER BY Name LIMIT 1";
 
-$stmt = $mysqli->stmt_init();
-if(!$stmt->prepare($query))
-{
-    print "Failed to prepare statement\n";
-}
-else
-{
-    $stmt->bind_param("s", $continent);
+$stmt = $mysqli->prepare($query);
+$stmt->bind_param("s", $continent);
 
-    $continent_array = array('Europe','Africa','Asia','North America');
+$continentList = array('Europe', 'Africa', 'Asia', 'North America');
 
-    foreach($continent_array as $continent)
-    {
-        $stmt->execute();
-        $result = $stmt->get_result();
-        while ($row = $result->fetch_array(MYSQLI_NUM))
-        {
-            foreach ($row as $r)
-            {
-                print "$r ";
-            }
-            print "\n";
+foreach ($continentList as $continent) {
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_array(MYSQLI_NUM)) {
+        foreach ($row as $r) {
+            print "$r ";
         }
+        print "\n";
     }
 }
-
-$stmt->close();
-$mysqli->close();
-?>
 ]]>
    </programlisting>
   </example>
@@ -106,51 +95,31 @@ $mysqli->close();
    <title>&style.procedural;</title>
    <programlisting role="php">
 <![CDATA[
-<?php 
+<?php
 
-$link = mysqli_connect("127.0.0.1", "user", "password", "world"); 
-
-if (!$link)
-{
-    $error = mysqli_connect_error();
-    $errno = mysqli_connect_errno();
-    print "$errno: $error\n";
-    exit();
-}
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+$link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
 $query = "SELECT Name, Population, Continent FROM Country WHERE Continent=? ORDER BY Name LIMIT 1";
 
-$stmt = mysqli_stmt_init($link);
-if(!mysqli_stmt_prepare($stmt, $query))
-{
-    print "Failed to prepare statement\n";
-}
-else
-{
-    mysqli_stmt_bind_param($stmt, "s", $continent);
+$stmt = mysqli_prepare($link, $query);
+mysqli_stmt_bind_param($stmt, "s", $continent);
 
-    $continent_array = array('Europe','Africa','Asia','North America');
+$continentList= array('Europe', 'Africa', 'Asia', 'North America');
 
-    foreach($continent_array as $continent)
-    {
-        mysqli_stmt_execute($stmt);
-        $result = mysqli_stmt_get_result($stmt);
-        while ($row = mysqli_fetch_array($result, MYSQLI_NUM))
-        {
-            foreach ($row as $r)
-            {
-                print "$r ";
-            }
-            print "\n";
+foreach ($continentList as $continent) {
+    mysqli_stmt_execute($stmt);
+    $result = mysqli_stmt_get_result($stmt);
+    while ($row = mysqli_fetch_array($result, MYSQLI_NUM)) {
+        foreach ($row as $r) {
+            print "$r ";
         }
+        print "\n";
     }
 }
-mysqli_stmt_close($stmt);
-mysqli_close($link);
-?>
 ]]>
    </programlisting>
-   &examples.outputs;
+   &examples.outputs.similar;
    <screen>
 <![CDATA[
 Albania 3401200 Europe 
@@ -171,7 +140,6 @@ Anguilla 8000 North America
     <member><function>mysqli_stmt_fetch</function></member>
     <member><function>mysqli_fetch_array</function></member>
     <member><function>mysqli_stmt_store_result</function></member>
-    <member><function>mysqli_errno</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/mysqli/mysqli_stmt/more-results.xml b/reference/mysqli/mysqli_stmt/more-results.xml
index fd4a47b7f1..eac3a0e830 100644
--- a/reference/mysqli/mysqli_stmt/more-results.xml
+++ b/reference/mysqli/mysqli_stmt/more-results.xml
@@ -22,6 +22,11 @@
   <para>
    Checks if there are more query results from a multiple query.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,14 +45,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli_stmt/next-result.xml b/reference/mysqli/mysqli_stmt/next-result.xml
index 812ab25ae4..08c97bf09c 100644
--- a/reference/mysqli/mysqli_stmt/next-result.xml
+++ b/reference/mysqli/mysqli_stmt/next-result.xml
@@ -22,6 +22,11 @@
   <para>
    Reads the next result from a multiple query.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,14 +54,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli_stmt/num-rows.xml b/reference/mysqli/mysqli_stmt/num-rows.xml
index 66d4fdd377..f9865d8cfb 100644
--- a/reference/mysqli/mysqli_stmt/num-rows.xml
+++ b/reference/mysqli/mysqli_stmt/num-rows.xml
@@ -5,7 +5,7 @@
   <refname>mysqli_stmt::$num_rows</refname>
   <refname>mysqli_stmt::num_rows</refname>
   <refname>mysqli_stmt_num_rows</refname>
-  <refpurpose>Return the number of rows in statements result set</refpurpose>
+  <refpurpose>Returns the number of rows fetched from the server</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -22,15 +22,13 @@
    <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the number of rows in the result set.
-   The use of <function>mysqli_stmt_num_rows</function>
-   depends on whether or not you used
-   <function>mysqli_stmt_store_result</function> to buffer the entire result
-   set in the statement handle.
+   Returns the number of rows buffered in the statement. This function will only
+   work after <function>mysqli_stmt_store_result</function> is called to buffer
+   the entire result set in the statement handle.
   </para>
   <para>
-   If you use <function>mysqli_stmt_store_result</function>,
-   <function>mysqli_stmt_num_rows</function> may be called immediately.
+   This function returns <literal>0</literal> unless all rows have been
+   fetched from the server.
   </para>
  </refsect1>
 
@@ -46,7 +44,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   An integer representing the number of rows in result set.
+   An <type>int</type> representing the number of buffered rows.
+   Returns <literal>0</literal> in unbuffered mode unless all rows have been
+   fetched from the server.
   </para>
  </refsect1>
 
@@ -57,33 +57,18 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-/* Open a connection */
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
-
 $query = "SELECT Name, CountryCode FROM City ORDER BY Name LIMIT 20";
-if ($stmt = $mysqli->prepare($query)) {
+$stmt = $mysqli->prepare($query);
+$stmt->execute();
 
-    /* execute query */
-    $stmt->execute();
+/* store the result in an internal buffer */
+$stmt->store_result();
 
-    /* store result */
-    $stmt->store_result();
-
-    printf("Number of rows: %d.\n", $stmt->num_rows);
-
-    /* close statement */
-    $stmt->close();
-}
-
-/* close connection */
-$mysqli->close();
-?>
+printf("Number of rows: %d.\n", $stmt->num_rows);
 ]]>
    </programlisting>
   </example>
@@ -92,33 +77,18 @@ $mysqli->close();
    <programlisting role="php">
 <![CDATA[
 <?php
-/* Open a connection */
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
-
 $query = "SELECT Name, CountryCode FROM City ORDER BY Name LIMIT 20";
-if ($stmt = mysqli_prepare($link, $query)) {
+$stmt = mysqli_prepare($link, $query);
+mysqli_stmt_execute($stmt);
 
-    /* execute query */
-    mysqli_stmt_execute($stmt);
+/* store the result in an internal buffer */
+mysqli_stmt_store_result($stmt);
 
-    /* store result */
-    mysqli_stmt_store_result($stmt);
-
-    printf("Number of rows: %d.\n", mysqli_stmt_num_rows($stmt));
-
-    /* close statement */
-    mysqli_stmt_close($stmt);
-}
-
-/* close connection */
-mysqli_close($link);
-?>
+printf("Number of rows: %d.\n", mysqli_stmt_num_rows($stmt));
 ]]>
    </programlisting>
    &examples.outputs;
@@ -134,9 +104,9 @@ Number of rows: 20.
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>mysqli_stmt_store_result</function></member>
     <member><function>mysqli_stmt_affected_rows</function></member>
     <member><function>mysqli_prepare</function></member>
-    <member><function>mysqli_stmt_store_result</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/mysqli/mysqli_stmt/sqlstate.xml b/reference/mysqli/mysqli_stmt/sqlstate.xml
index 7a803fb8a8..dcd931a087 100644
--- a/reference/mysqli/mysqli_stmt/sqlstate.xml
+++ b/reference/mysqli/mysqli_stmt/sqlstate.xml
@@ -42,16 +42,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Note that not all MySQL errors are yet mapped to SQLSTATE's.
-    The value <literal>HY000</literal> (general error) is used for unmapped errors.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -140,6 +130,16 @@ Error: 42S02.
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Note that not all MySQL errors are yet mapped to SQLSTATE's.
+    The value <literal>HY000</literal> (general error) is used for unmapped errors.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli_stmt/store-result.xml b/reference/mysqli/mysqli_stmt/store-result.xml
index ef492c390e..1eecc59966 100644
--- a/reference/mysqli/mysqli_stmt/store-result.xml
+++ b/reference/mysqli/mysqli_stmt/store-result.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>mysqli_stmt::store_result</refname>
   <refname>mysqli_stmt_store_result</refname>
-  <refpurpose>Transfers a result set from a prepared statement</refpurpose>
+  <refpurpose>Stores a result set in an internal buffer</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -20,10 +20,10 @@
    <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
-   You must call <function>mysqli_stmt_store_result</function> for every query that
-   successfully produces a result set (<literal>SELECT, SHOW, DESCRIBE, EXPLAIN</literal>),
-   if and only if you want to buffer the complete result set by the client,
-   so that the subsequent <function>mysqli_stmt_fetch</function> call returns buffered data.
+   This function should be called for queries that successfully 
+   produce a result set (e.g. <literal>SELECT, SHOW, DESCRIBE, EXPLAIN</literal>)
+   only if the complete result set needs to be buffered in PHP. Each subsequent
+   <function>mysqli_stmt_fetch</function> call will return buffered data.
   </para>
   <note>
    <para>
@@ -58,36 +58,18 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-/* Open a connection */
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $mysqli = new mysqli("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
-
 $query = "SELECT Name, CountryCode FROM City ORDER BY Name LIMIT 20";
-if ($stmt = $mysqli->prepare($query)) {
+$stmt = $mysqli->prepare($query);
+$stmt->execute();
 
-    /* execute query */
-    $stmt->execute();
+/* store the result in an internal buffer */
+$stmt->store_result();
 
-    /* store result */
-    $stmt->store_result();
-
-    printf("Number of rows: %d.\n", $stmt->num_rows);
-
-    /* free result */
-    $stmt->free_result();
-
-    /* close statement */
-    $stmt->close();
-}
-
-/* close connection */
-$mysqli->close();
-?>
+printf("Number of rows: %d.\n", $stmt->num_rows);
 ]]>
    </programlisting>
   </example>
@@ -96,36 +78,18 @@ $mysqli->close();
    <programlisting role="php">
 <![CDATA[
 <?php
-/* Open a connection */
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $link = mysqli_connect("localhost", "my_user", "my_password", "world");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
-
 $query = "SELECT Name, CountryCode FROM City ORDER BY Name LIMIT 20";
-if ($stmt = mysqli_prepare($link, $query)) {
+$stmt = mysqli_prepare($link, $query);
+mysqli_stmt_execute($stmt);
 
-    /* execute query */
-    mysqli_stmt_execute($stmt);
+/* store the result in an internal buffer */
+mysqli_stmt_store_result($stmt);
 
-    /* store result */
-    mysqli_stmt_store_result($stmt);
-
-    printf("Number of rows: %d.\n", mysqli_stmt_num_rows($stmt));
-
-    /* free result */
-    mysqli_stmt_free_result($stmt);
-
-    /* close statement */
-    mysqli_stmt_close($stmt);
-}
-
-/* close connection */
-mysqli_close($link);
-?>
+printf("Number of rows: %d.\n", mysqli_stmt_num_rows($stmt));
 ]]>
    </programlisting>
    &examples.outputs;
diff --git a/reference/mysqli/summary.xml b/reference/mysqli/summary.xml
index b8b0f8a09b..489fa3f976 100644
--- a/reference/mysqli/summary.xml
+++ b/reference/mysqli/summary.xml
@@ -188,7 +188,7 @@
      <entry>Returns the MySQL client version as a string</entry>
     </row>
     <row>
-     <entry><methodname>mysqli::get_client_stats</methodname></entry>
+     <entry>N/A</entry>
      <entry><function>mysqli_get_client_stats</function></entry>
      <entry>N/A</entry>
      <entry>Returns client per-process statistics. &mysqli.available.mysqlnd;</entry>
diff --git a/reference/mysqli/versions.xml b/reference/mysqli/versions.xml
index 7ce7233846..8ce04bab37 100644
--- a/reference/mysqli/versions.xml
+++ b/reference/mysqli/versions.xml
@@ -4,222 +4,214 @@
   Do NOT translate this file
 -->
 <versions>
- <function name="mysqli_affected_rows" from="PHP 5, PHP 7"/>
- <function name="mysqli_autocommit" from="PHP 5, PHP 7"/>
- <function name="mysqli_begin_transaction" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="mysqli_change_user" from="PHP 5, PHP 7"/>
- <function name="mysqli_character_set_name" from="PHP 5, PHP 7"/>
- <function name="mysqli_close" from="PHP 5, PHP 7"/>
- <function name="mysqli_commit" from="PHP 5, PHP 7"/>
- <function name="mysqli_connect" from="PHP 5, PHP 7"/>
- <function name="mysqli_connect_errno" from="PHP 5, PHP 7"/>
- <function name="mysqli_connect_error" from="PHP 5, PHP 7"/>
- <function name="mysqli_data_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_debug" from="PHP 5, PHP 7"/>
- <function name="mysqli_dump_debug_info" from="PHP 5, PHP 7"/>
+ <function name="mysqli_affected_rows" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_autocommit" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_begin_transaction" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="mysqli_change_user" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_character_set_name" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_close" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_commit" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_connect" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_connect_errno" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_connect_error" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_data_seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_debug" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_dump_debug_info" from="PHP 5, PHP 7, PHP 8"/>
  <function name="mysqli_embedded_server_end" from="PHP 5 &gt;= 5.1.0, PHP 7 &lt; 7.4.0"/>
  <function name="mysqli_embedded_server_start" from="PHP 5 &gt;= 5.1.0, PHP 7 &lt; 7.4.0"/>
- <function name="mysqli_errno" from="PHP 5, PHP 7"/>
- <function name="mysqli_error" from="PHP 5, PHP 7"/>
- <function name="mysqli_error_list" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="mysqli_escape_string" from="PHP 5, PHP 7"/>
- <function name="mysqli_execute" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_all" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_fetch_array" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_assoc" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_field" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_field_direct" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_fields" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_lengths" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_object" from="PHP 5, PHP 7"/>
- <function name="mysqli_fetch_row" from="PHP 5, PHP 7"/>
- <function name="mysqli_field_count" from="PHP 5, PHP 7"/>
- <function name="mysqli_field_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_field_tell" from="PHP 5, PHP 7"/>
- <function name="mysqli_free_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_charset" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="mysqli_get_client_info" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_client_stats" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_get_client_version" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_connection_stats" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_get_host_info" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_links_stats" from="PHP 5 &gt;= 5.6.0, PHP 7"/>
- <function name="mysqli_get_proto_info" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_server_info" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_server_version" from="PHP 5, PHP 7"/>
- <function name="mysqli_get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="mysqli_host_info" from="PHP 5, PHP 7"/>
- <function name="mysqli_info" from="PHP 5, PHP 7"/>
- <function name="mysqli_init" from="PHP 5, PHP 7"/>
- <function name="mysqli_insert_id" from="PHP 5, PHP 7"/>
- <function name="mysqli_kill" from="PHP 5, PHP 7"/>
- <function name="mysqli_more_results" from="PHP 5, PHP 7"/>
- <function name="mysqli_multi_query" from="PHP 5, PHP 7"/>
- <function name="mysqli_next_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_num_fields" from="PHP 5, PHP 7"/>
- <function name="mysqli_num_rows" from="PHP 5, PHP 7"/>
- <function name="mysqli_options" from="PHP 5, PHP 7"/>
- <function name="mysqli_ping" from="PHP 5, PHP 7"/>
- <function name="mysqli_poll" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_prepare" from="PHP 5, PHP 7"/>
- <function name="mysqli_query" from="PHP 5, PHP 7"/>
- <function name="mysqli_read_query_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_real_connect" from="PHP 5, PHP 7"/>
- <function name="mysqli_real_escape_string" from="PHP 5, PHP 7"/>
- <function name="mysqli_real_query" from="PHP 5, PHP 7"/>
- <function name="mysqli_reap_async_query" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_refresh" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_release_savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="mysqli_report" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_current_field" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_data_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_all" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_result_fetch_array" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_assoc" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_field_direct" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_field" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_fields" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_object" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_fetch_row" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_field_count" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_field_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_free" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_lengths" from="PHP 5, PHP 7"/>
- <function name="mysqli_result_num_rows" from="PHP 5, PHP 7"/>
- <function name="mysqli_rollback" from="PHP 5, PHP 7"/>
- <function name="mysqli_row_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="mysqli_select_db" from="PHP 5, PHP 7"/>
- <function name="mysqli_set_charset" from="PHP 5 &gt;= 5.0.5, PHP 7"/>
- <function name="mysqli_set_opt" from="PHP 5, PHP 7"/>
- <function name="mysqli_sqlstate" from="PHP 5, PHP 7"/>
- <function name="mysqli_ssl_set" from="PHP 5, PHP 7"/>
- <function name="mysqli_stat" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_affected_rows" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_attr_get" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_attr_set" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_bind_param" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_bind_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_close" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_data_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_errno" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_error" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_error_list" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="mysqli_stmt_execute" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_fetch" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_field_count" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_free_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_get_result" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_stmt_get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="mysqli_stmt_init" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_insert_id" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_more_results" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_stmt_next_result" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_stmt_num_rows" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_param_count" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_prepare" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_reset" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_result_metadata" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_send_long_data" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_sqlstate" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt_store_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_store_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_thread_id" from="PHP 5, PHP 7"/>
- <function name="mysqli_thread_safe" from="PHP 5, PHP 7"/>
- <function name="mysqli_use_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_warning_count" from="PHP 5, PHP 7"/>
+ <function name="mysqli_errno" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_error" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_error_list" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="mysqli_escape_string" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_execute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_all" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_array" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_assoc" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_field" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_field_direct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_fields" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_lengths" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_object" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_fetch_row" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_field_count" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_field_seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_field_tell" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_free_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_charset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="mysqli_get_client_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_client_stats" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_get_client_version" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_connection_stats" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_get_host_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_links_stats" from="PHP 5 &gt;= 5.6.0, PHP 7, PHP 8"/>
+ <function name="mysqli_get_proto_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_server_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_server_version" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+  <!-- Property -->
+ <function name="mysqli_host_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_init" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_insert_id" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_kill" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_more_results" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_multi_query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_next_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_num_fields" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_num_rows" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_options" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_ping" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_poll" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_prepare" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_real_connect" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_real_escape_string" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_real_query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_reap_async_query" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_refresh" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_release_savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="mysqli_report" from="PHP 5, PHP 7, PHP 8"/>
+  <!-- Property -->
+ <function name="mysqli_result_current_field" from="PHP 5, PHP 7, PHP 8"/>
+  <!-- Property -->
+ <function name="mysqli_result_field_count" from="PHP 5, PHP 7, PHP 8"/>
+  <!-- Property -->
+ <function name="mysqli_result_lengths" from="PHP 5, PHP 7, PHP 8"/>
+  <!-- Property -->
+ <function name="mysqli_result_num_rows" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_rollback" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="mysqli_select_db" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_set_charset" from="PHP 5 &gt;= 5.0.5, PHP 7, PHP 8"/>
+ <function name="mysqli_set_opt" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_sqlstate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_ssl_set" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stat" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_affected_rows" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_attr_get" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_attr_set" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_bind_param" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_bind_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_close" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_data_seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_errno" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_error" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_error_list" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_execute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_fetch" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_field_count" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_free_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_get_result" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_init" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_insert_id" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_more_results" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_next_result" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_num_rows" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_param_count" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_prepare" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_reset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_result_metadata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_send_long_data" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_sqlstate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt_store_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_store_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_thread_id" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_thread_safe" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_use_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_warning_count" from="PHP 5, PHP 7, PHP 8"/>
 
  <!-- Classes -->
- <function name="mysqli" from="PHP 5, PHP 7"/>
- <function name="mysqli::__construct" from="PHP 5, PHP 7"/>
- <function name="mysqli::autocommit" from="PHP 5, PHP 7"/>
- <function name="mysqli::begin_transaction" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="mysqli::change_user" from="PHP 5, PHP 7"/>
- <function name="mysqli::character_set_name" from="PHP 5, PHP 7"/>
- <function name="mysqli::close" from="PHP 5, PHP 7"/>
- <function name="mysqli::commit" from="PHP 5, PHP 7"/>
- <function name="mysqli::connect" from="PHP 5, PHP 7"/>
- <function name="mysqli::debug" from="PHP 5, PHP 7"/>
- <function name="mysqli::dump_debug_info" from="PHP 5, PHP 7"/>
- <function name="mysqli::escape_string" from="PHP 5, PHP 7"/>
- <function name="mysqli::get_charset" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="mysqli::get_client_info" from="PHP 5, PHP 7"/>
- <function name="mysqli::get_connection_stats" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli::get_server_info" from="PHP 5, PHP 7"/>
- <function name="mysqli::get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="mysqli::init" from="PHP 5, PHP 7"/>
- <function name="mysqli::kill" from="PHP 5, PHP 7"/>
- <function name="mysqli::more_results" from="PHP 5, PHP 7"/>
- <function name="mysqli::multi_query" from="PHP 5, PHP 7"/>
- <function name="mysqli::next_result" from="PHP 5, PHP 7"/>
- <function name="mysqli::options" from="PHP 5, PHP 7"/>
- <function name="mysqli::ping" from="PHP 5, PHP 7"/>
- <function name="mysqli::poll" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli::prepare" from="PHP 5, PHP 7"/>
- <function name="mysqli::query" from="PHP 5, PHP 7"/>
- <function name="mysqli::real_connect" from="PHP 5, PHP 7"/>
- <function name="mysqli::real_escape_string" from="PHP 5, PHP 7"/>
- <function name="mysqli::real_query" from="PHP 5, PHP 7"/>
- <function name="mysqli::reap_async_query" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli::refresh" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli::release_savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="mysqli::rollback" from="PHP 5, PHP 7"/>
- <function name="mysqli::savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="mysqli::select_db" from="PHP 5, PHP 7"/>
- <function name="mysqli::set_charset" from="PHP 5 &gt;= 5.0.5, PHP 7"/>
- <function name="mysqli::set_opt" from="PHP 5, PHP 7"/>
- <function name="mysqli::ssl_set" from="PHP 5, PHP 7"/>
- <function name="mysqli::stat" from="PHP 5, PHP 7"/>
- <function name="mysqli::stmt_init" from="PHP 5, PHP 7"/>
- <function name="mysqli::store_result" from="PHP 5, PHP 7"/>
- <function name="mysqli::thread_safe" from="PHP 5, PHP 7"/>
- <function name="mysqli::use_result" from="PHP 5, PHP 7"/>
+ <function name="mysqli" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::autocommit" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::begin_transaction" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="mysqli::change_user" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::character_set_name" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::close" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::commit" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::connect" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::debug" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::dump_debug_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::escape_string" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::get_charset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="mysqli::get_client_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::get_connection_stats" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli::get_server_info" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="mysqli::init" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::kill" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::more_results" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::multi_query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::next_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::options" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::ping" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::poll" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli::prepare" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::real_connect" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::real_escape_string" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::real_query" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::reap_async_query" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli::refresh" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli::release_savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="mysqli::rollback" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::savepoint" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="mysqli::select_db" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::set_charset" from="PHP 5 &gt;= 5.0.5, PHP 7, PHP 8"/>
+ <function name="mysqli::set_opt" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::ssl_set" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::stat" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::stmt_init" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::store_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::thread_safe" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli::use_result" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="mysqli_stmt" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::__construct" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::attr_get" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::attr_set" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::bind_param" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::bind_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::close" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::data_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::execute" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::fetch" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::free_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::get_result" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_stmt::get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="mysqli_stmt::more_results" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_stmt::next_result" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_stmt::num_rows" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::prepare" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::reset" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::result_metadata" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::send_long_data" from="PHP 5, PHP 7"/>
- <function name="mysqli_stmt::store_result" from="PHP 5, PHP 7"/>
+ <function name="mysqli_stmt" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::attr_get" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::attr_set" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::bind_param" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::bind_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::close" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::data_seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::execute" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::fetch" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::free_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::get_result" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::get_warnings" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::more_results" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::next_result" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::num_rows" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::prepare" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::reset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::result_metadata" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::send_long_data" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_stmt::store_result" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="mysqli_result" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::close" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::data_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_all" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="mysqli_result::fetch_array" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_assoc" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_field_direct" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_field" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_fields" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_object" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::fetch_row" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::field_seek" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::free" from="PHP 5, PHP 7"/>
- <function name="mysqli_result::free_result" from="PHP 5, PHP 7"/>
+ <function name="mysqli_result" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::close" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::data_seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_all" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_array" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_assoc" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_field_direct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_field" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_fields" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_object" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::fetch_row" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::field_seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::free" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_result::free_result" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="mysqli_driver" from="PHP 5, PHP 7"/>
+ <function name="mysqli_driver" from="PHP 5, PHP 7, PHP 8"/>
  <function name="mysqli_driver::embedded_server_end" from="PHP 5 &gt;= 5.1.0, PHP 7 &lt; 7.4.0"/>
  <function name="mysqli_driver::embedded_server_start" from="PHP 5 &gt;= 5.1.0, PHP 7 &lt; 7.4.0"/>
 
- <function name="mysqli_warning" from="PHP 5, PHP 7"/>
- <function name="mysqli_warning::next" from="PHP 5, PHP 7"/>
+ <function name="mysqli_warning" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="mysqli_warning::next" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="mysqli_sql_exception" from="PHP 5, PHP 7"/>
+ <function name="mysqli_sql_exception" from="PHP 5, PHP 7, PHP 8"/>
 </versions>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/mysqlinfo/set.xml b/reference/mysqlinfo/set.xml
index 30a65cda67..8608af65c0 100644
--- a/reference/mysqlinfo/set.xml
+++ b/reference/mysqlinfo/set.xml
@@ -428,36 +428,6 @@ $ ./configure --with-mysqli=/path/to/mysql_config --with-pdo-mysql=/path/to/mysq
        <entry>Yes</entry>
        <entry>Limited</entry>
       </row>
-      <row>
-       <entry>Read/Write splitting for MySQL Replication</entry>
-       <entry>Yes, with plugin</entry>
-       <entry>No</entry>
-      </row>
-      <row>
-       <entry>Load Balancing</entry>
-       <entry>Yes, with plugin</entry>
-       <entry>No</entry>
-      </row>
-      <row>
-       <entry>Fail over</entry>
-       <entry>Yes, with plugin</entry>
-       <entry>No</entry>
-      </row>
-      <row>
-       <entry>Lazy connections</entry>
-       <entry>Yes, with plugin</entry>
-       <entry>No</entry>
-      </row>
-      <row>
-       <entry>Query caching</entry>
-       <entry>Yes, with plugin</entry>
-       <entry>No</entry>
-      </row>
-      <row>
-       <entry>Transparent query manipulations (E.g., auto-EXPLAIN or monitoring)</entry>
-       <entry>Yes, with plugin</entry>
-       <entry>No</entry>
-      </row>
       <row>
        <entry>Automatic reconnect</entry>
        <entry>No</entry>
@@ -476,10 +446,5 @@ $ ./configure --with-mysqli=/path/to/mysql_config --with-pdo-mysql=/path/to/mysq
  &reference.mysql-xdevapi.book;
  &reference.mysql.book;
  &reference.mysqlnd.book;
- &reference.mysqlnd-ms.book;
- &reference.mysqlnd-qc.book;
- &reference.mysqlnd-uh.book;
- &reference.mysqlnd-mux.book;
- &reference.mysqlnd-memcache.book;
 
 </set>
diff --git a/reference/mysqlnd_memcache/book.xml b/reference/mysqlnd_memcache/book.xml
deleted file mode 100644
index f59a9f124b..0000000000
--- a/reference/mysqlnd_memcache/book.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mysqlnd-memcache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd Memcache plugin</title>
- <titleabbrev>mysqlnd_memcache</titleabbrev>
-
- <preface xml:id="intro.mysqlnd-memcache">
-  &reftitle.intro;
-  <para>
-   The mysqlnd memcache plugin (<literal>mysqlnd_memcache</literal>) is an PHP
-   extension for transparently translating SQL into requests for the
-   MySQL InnoDB Memcached Daemon Plugin (server plugin). It includes
-   experimental support for the MySQL Cluster Memcached Daemon. The server
-   plugin provides access to data stored inside MySQL InnoDB (respectively
-   MySQL Cluster NDB) tables using the Memcache protocol. 
-   This PHP extension, which supports all PHP MySQL extensions that use
-   <link linkend="book.mysqlnd">mysqlnd</link>, will identify tables exported in
-   this way and will translate specific SELECT queries into Memcache requests. 
-  </para>
-  <mediaobject>
-   <alt>mysqlnd_memcache data flow</alt>
-   <imageobject>
-    <imagedata fileref="en/reference/mysqlnd_memcache/figures/mymemflow.png"/>
-   </imageobject>
-  </mediaobject>
-  <note>
-   <para>
-    This plugin depends on the MySQL InnoDB Memcached Daemon Plugin. It is not
-    provided to be used with a stand-alone Memcached. For a generic query cache
-    using Memcached look at the <link linkend="book.mysqlnd-qc">mysqlnd query
-    cache plugin</link>. For direct Memcache access look at the
-    <link linkend="book.memcache">memcache</link> and
-    <link linkend="book.memcached">memcached</link> extensions.
-   </para>
-  </note>
-  <para>
-   The MySQL native driver for PHP is a C library that ships together with
-   PHP. It serves as a drop-in replacement for the
-   MySQL Client Library (libmysqlclient). Using mysqlnd has
-   several advantages: no extra downloads are required because it's bundled with PHP,
-   it's under the PHP license, there is lower memory consumption in certain cases, and
-   it contains new functionality such as asynchronous queries.
-  </para>
-  <para>
-   The <literal>mysqlnd_mmemcache</literal> operates, for the most part,
-   transparently from a user perspective. The mysqlnd memcache
-   plugin supports all PHP applications, and all MySQL PHP extensions.
-   It does not change existing APIs. Therefore, it can easily be used with
-   existing PHP applications.
-  </para>
-  <para>
-   The MySQL Memcache plugins add key-value style access method for data stored
-   in InnoDB resp. NDB (MySQL Cluster) SQL tables through the Memcache protocol.
-   This type of key-value access if often faster than using SQL.
-  </para>
-  <section xml:id="mysqlnd-memcache.key-features">
-   <title>Key Features</title>
-   <para>
-   The key features of PECL/mysqlnd_memcache are as follows.
-   </para>
-   <para>
-    <itemizedlist>
-     <listitem>
-      <para>
-       Possible performance benefits
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Client-side: light-weight protocol.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Server-side: no SQL parsing, direct access to the storage.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Please, run your own benchmarks! Actual performance results are
-          highly dependent on setup and hardware used.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </itemizedlist>
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-memcache.limitations">
-   <title>Limitations</title>
-   <para>
-    The initial version is not binary safe. Due to the way the MySQL Memcache
-    plugins works there are restrictions related to separators.
-   </para>
-   <para>
-    Prepared statements and asynchronous queries are not supported. Result set
-    meta data support is limited.
-   </para>
-   <para>
-    The mapping information for tables accessible via Memcache is not cached
-    in the plugin between requests but fetched from the MySQL server each time 
-    a MySQL connection is associated with a Memcache connection. See
-    <function>mysqlnd_memcache_set</function> for details.
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-memcache.name">
-   <title>On the name</title>
-   <para>
-    The shortcut <literal>mysqlnd_memcache</literal>
-    stands for <literal>mysqlnd memcache plugin</literal>.
-    Memcache refers to support of the MySQL Memcache plugins
-    for InnoDB and NDB (MySQL Cluster). The plugin is not
-    related to the Memcached cache server.
-   </para>
-  </section>
- </preface>
-
- &reference.mysqlnd-memcache.quickstart;
- &reference.mysqlnd-memcache.setup;
- &reference.mysqlnd-memcache.constants;
- &reference.mysqlnd-memcache.reference;
- &reference.mysqlnd-memcache.changes;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/changes.xml b/reference/mysqlnd_memcache/changes.xml
deleted file mode 100644
index c3306bd3c1..0000000000
--- a/reference/mysqlnd_memcache/changes.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-memcache.changes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title xmlns="http://docbook.org/ns/docbook">Change History</title>
- <para>
-  This change history is a high level summary of selected changes
-  that may impact applications and/or break backwards compatibility.
- </para>
- <para>
-  See also the <filename>CHANGES</filename> file in the source distribution
-  for a complete list of changes.
- </para>
-
- <section xml:id="mysqlnd-memcache.changes-one-o">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_memcache 1.0 series</title>
-  <para>
-   1.0.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: TBD
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Basic mapping of SQL SELECT to a MySQL Memcache plugin access.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The initial release does map basic SQL SELECT statements to a MySQL Memcache plugin
-   access. This bares potential performance benefits as the direct
-   key-value access to MySQL storage using the Memcache protocol is usually
-   faster than using SQL access.
-  </para>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/configure.xml b/reference/mysqlnd_memcache/configure.xml
deleted file mode 100644
index 3998d69963..0000000000
--- a/reference/mysqlnd_memcache/configure.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-memcache.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.moved;
- </para>
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mysqlnd_memcache">&url.pecl.package;mysqlnd_memcache</link>
- </para>
-
- <para>
-  &pecl.windows.download;
- </para>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/constants.xml b/reference/mysqlnd_memcache/constants.xml
deleted file mode 100644
index 1b0f1d844a..0000000000
--- a/reference/mysqlnd_memcache/constants.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mysqlnd-memcache.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
-
- <para>
-  <emphasis role="bold">MySQL Memcache Plugin related</emphasis>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-memcache-default-regexp">
-    <term>
-     <constant>MYSQLND_MEMCACHE_DEFAULT_REGEXP</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Default regular expression (PCRE style) used for matching <literal>SELECT</literal>
-      statements that will be mapped into a MySQL Memcache Plugin access point, if possible.
-     </simpara>
-     <simpara>
-      It is also possible to use <function>mysqlnd_memcache_set</function>, but the default
-      approach is using this regular expression for pattern matching.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <emphasis role="bold">Assorted</emphasis>
- </para>
- <para>
-  The version number of this plugin can be obtained by using
-  <constant>MYSQLND_MEMCACHE_VERSION</constant> or
-  <constant>MYSQLND_MEMCACHE_VERSION_ID</constant>.
-  <constant>MYSQLND_MEMCACHE_VERSION</constant>
-  is the string representation of the numerical version number
-  <constant>MYSQLND_MEMCACHE_VERSION_ID</constant>, which is an integer such as 10000.
-  Developers can calculate the version number as follows.
- </para>
- <para>
-   <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Version (part)</entry>
-      <entry>Example</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Major*10000</entry>
-      <entry>1*10000 = 10000</entry>
-     </row>
-     <row>
-      <entry>Minor*100</entry>
-      <entry>0*100 = 0</entry>
-     </row>
-     <row>
-      <entry>Patch</entry>
-      <entry>0 = 0</entry>
-     </row>
-     <row>
-      <entry>MYSQLND_MEMCACHE_VERSION_ID</entry>
-      <entry>10000</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-memcache-version">
-    <term>
-     <constant>MYSQLND_MEMCACHE_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version string, for example, <quote>1.0.0-alpha</quote>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-memcache-version-id">
-    <term>
-     <constant>MYSQLND_MEMCACHE_VERSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version number, for example, 10000.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/figures/mymemflow.dot b/reference/mysqlnd_memcache/figures/mymemflow.dot
deleted file mode 100644
index a69de553d8..0000000000
--- a/reference/mysqlnd_memcache/figures/mymemflow.dot
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Render using
-$ dot -Tpng -ofigures/mymemflow.png figures/mymemflow.dot
-*/
-graph mymemflow {
-	rankdir=LR
-	node [shape=box]
-
-	subgraph clusterPHP {
-		rankdir=LR
-		label="PHP"
-		extmysql [label="ext/mysql"]
-		extmysql  -- mysqlnd_memcache
-		mysqli    -- mysqlnd_memcache
-		pdo       -- mysqlnd_memcache
-
-		subgraph clusterMysqlnd {
-			label=mysqlnd
-			mysqlnd_memcache [color=blue]
-		}
-	}
-
-	subgraph clusterMySQL {
-		label="MySQL Server"
-		color=black
-		sqlengine  [label="SQL Engine"]
-		innoplugin [label="InnoDB Memcache Daemon" color=blue]
-	}
-
-	mysqlnd_memcache -- innoplugin [label="memcache protocol" color=blue]
-	mysqlnd_memcache -- sqlengine  [label="MySQL Protocol"]
-}
diff --git a/reference/mysqlnd_memcache/figures/mymemflow.png b/reference/mysqlnd_memcache/figures/mymemflow.png
deleted file mode 100644
index 328d66c138..0000000000
Binary files a/reference/mysqlnd_memcache/figures/mymemflow.png and /dev/null differ
diff --git a/reference/mysqlnd_memcache/functions/mysqlnd-memcache-get-config.xml b/reference/mysqlnd_memcache/functions/mysqlnd-memcache-get-config.xml
deleted file mode 100644
index c9bdde6284..0000000000
--- a/reference/mysqlnd_memcache/functions/mysqlnd-memcache-get-config.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-memcache-get-config" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_memcache_get_config</refname>
-  <refpurpose>Returns information about the plugin configuration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_memcache_get_config</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function returns an array of all mysqlnd_memcache related configuration 
-   information that is attached to the MySQL connection. This includes MySQL, the 
-   Memcache object provided via <function>mysqlnd_memcache_set</function>,
-   and the table mapping configuration that was automatically collected
-   from the MySQL Server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A handle to a MySQL Server using one of the MySQL API extensions for PHP, which are
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link>, <link linkend="book.mysqli">mysqli</link> or
-      <link linkend="book.mysql">ext/mysql</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of mysqlnd_memcache configuration information on success, otherwise &false;.
-  </para>
-  <para>
-   The returned array has these elements:
-  </para>
-  <para>
-   <table xml:id="function.mysqlnd-memcache-get-config.returnvalues.structure">
-    <title><function>mysqlnd_memcache_get_config</function> array structure</title>
-    <tgroup cols="2"> 
-     <thead>
-      <row>
-       <entry>Array Key</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody> 
-      <row>
-       <entry>memcached</entry>
-       <entry>
-        Instance of Memcached associated to this MySQL connection
-        by <methodname>mysqlnd_memcache_set</methodname>. You can use this to
-        change settings of the memcache connection, or directly by querying the
-        server on this connection.
-       </entry>
-      </row>
-      <row>
-       <entry>pattern</entry>
-       <entry>
-        The PCRE regular expression used to match the SQL query sent to the server.
-        Queries matching this pattern will be further analyzed to decide whether
-        the query can be intercepted and sent via the memcache interface or
-        whether the query is sent using the general MySQL protocol to the
-        server. The pattern is either the default pattern
-        (<literal>MYSQLND_MEMCACHE_DEFAULT_REGEXP</literal>) or it is set via
-        <function>mysqlnd_memcache_set</function>.
-       </entry>
-      </row>
-      <row>
-       <entry>mappings</entry>
-       <entry>
-        An associative array with a list of all configured containers as they
-        were discovered by this plugin. The key for these elements is the name
-        of the container in the MySQL configuration. The value is described
-        below. The contents of this field is created by querying the MySQL
-        Server during association to MySQL and a memcache connection using
-        <methodname>mysqlnd_memcache_set</methodname>.
-       </entry>
-      </row>
-      <row>
-       <entry>mapping_query</entry>
-       <entry>An SQL query used during
-        <methodname>mysqlnd_memcache_set</methodname>
-        to identify the available containers and mappings. The result of that 
-        query is provided in the mappings element.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-   <table xml:id="function.mysqlnd-memcache-get-config.returnvalues.mapping.structure">
-    <title>Mapping entry structure</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Array Key</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>prefix</entry>
-       <entry>
-        A prefix used while accessing data via memcache. With the MySQL InnoDB 
-        Memcache Deamon plugin, this usually begins with @@ and ends with a
-        configurable separator. This prefix is placed in front of the key value
-        while using the memcache protocol.
-       </entry>
-      </row>
-      <row>
-       <entry>schema_name</entry>
-       <entry>
-        Name of the schema (database) which contains the table being accessed.
-       </entry>
-      </row>
-      <row>
-       <entry>table_name</entry>
-       <entry>
-        Name of the table which contains the data accessible via memcache
-        protocol.
-       </entry>
-      </row>
-      <row>
-       <entry>id_field_name</entry>
-       <entry>
-        Name of the database field (column) with the id used as key when
-        accessing the table via memcache. Often this is the database field
-        having a primary key.
-       </entry>
-      </row>
-      <row>
-       <entry>separator</entry>
-       <entry>
-        The separator used to split the different field values. This is needed as
-        memcache only provides access to a single value while MySQL can map
-        multiple columns to this value.
-        <note>
-         <para>
-          The separator, which can be set in the MySQL Server configuration,
-          should not be part of any value retrieved via memcache because proper
-          mapping can't be guaranteed.
-         </para>
-        </note>
-       </entry>
-      </row>
-      <row>
-       <entry>fields</entry>
-       <entry>
-        An array with the name of all fields available for this mapping.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_memcache_get_config</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("host", "user", "passwd", "database");
-$memc = new Memcached();
-$memc->addServer("host", 11211);
-mysqlnd_memcache_set($mysqli, $memc);
-
-var_dump(mysqlnd_memcache_get_config($mysqli));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  ["memcached"]=>
-  object(Memcached)#2 (0) {
-  }
-  ["pattern"]=>
-  string(125) "/^\s*SELECT\s*(.+?)\s*FROM\s*`?([a-z0-9_]+)`?\s*WHERE\s*`?([a-z0-9_]+)`?\s*=\s*(?(?=["'])["']([^"']*)["']|([0-9e\.]*))\s*$/is"
-  ["mappings"]=>
-  array(1) {
-    ["mymem_test"]=>
-    array(6) {
-      ["prefix"]=>
-      string(13) "@@mymem_test."
-      ["schema_name"]=>
-      string(4) "test"
-      ["table_name"]=>
-      string(10) "mymem_test"
-      ["id_field_name"]=>
-      string(2) "id"
-      ["separator"]=>
-      string(1) "|"
-      ["fields"]=>
-      array(3) {
-        [0]=>
-        string(2) "f1"
-        [1]=>
-        string(2) "f2"
-        [2]=>
-        string(2) "f3"
-      }
-    }
-  }
-  ["mapping_query"]=>
-  string(209) "    SELECT c.name,
-                          CONCAT('@@', c.name, (SELECT value FROM innodb_memcache.config_options WHERE name = 'table_map_delimiter')) AS key_prefix, 
-                          c.db_schema, 
-                          c.db_table, 
-                          c.key_columns, 
-                          c.value_columns, 
-                          (SELECT value FROM innodb_memcache.config_options WHERE name = 'separator') AS sep 
-                     FROM innodb_memcache.containers c"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <methodname>mysqlnd_memcache_set</methodname>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/functions/mysqlnd-memcache-set.xml b/reference/mysqlnd_memcache/functions/mysqlnd-memcache-set.xml
deleted file mode 100644
index 92b40613a6..0000000000
--- a/reference/mysqlnd_memcache/functions/mysqlnd-memcache-set.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-memcache-set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_memcache_set</refname>
-  <refpurpose>Associate a MySQL connection with a Memcache connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_memcache_set</methodname>
-   <methodparam><type>mixed</type><parameter>mysql_connection</parameter></methodparam>
-   <methodparam choice="opt"><type>Memcached</type><parameter>memcache_connection</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Associate <parameter>mysql_connection</parameter> with
-   <parameter>memcache_connection</parameter> using <parameter>pattern</parameter>
-   as a PCRE regular expression, and <parameter>callback</parameter> as a notification
-   callback or to unset the association of <parameter>mysql_connection</parameter>.
-  </para>
-  <para>
-   While associating a MySQL connection with a Memcache connection, this function
-   will query the MySQL Server for its configuration. It will automatically
-   detect whether the server is configured to use the InnoDB Memcache Daemon
-   Plugin or MySQL Cluster NDB Memcache support. It will also query the server
-   to automatically identify exported tables and other configuration options.
-   The results of this automatic configuration can be retrieved using
-   <function>mysqlnd_memcache_get_config</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mysql_connection</parameter></term>
-    <listitem>
-     <para>
-      A handle to a MySQL Server using one of the MySQL API extensions for PHP, which are
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link>, <link linkend="book.mysqli">mysqli</link> or
-      <link linkend="book.mysql">ext/mysql</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>memcache_connection</parameter></term>
-    <listitem>
-     <para>
-      A <link linkend="book.memcached">Memcached</link> instance with a 
-      connection to the MySQL Memcache Daemon plugin. If this parameter
-      is omitted, then <parameter>mysql_connection</parameter> will be unassociated
-      from any memcache connection. And if a previous association exists, then it will be
-      replaced.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pattern</parameter></term>
-    <listitem>
-     <para>
-      A regular expression in <link linkend="book.pcre">Perl Compatible
-      Regular Expression</link> syntax used to identify potential
-      Memcache-queries. The query should have three sub patterns. The
-      first subpattern contains the requested field list, the second the name
-      of the ID column from the query and the third the requested value. If
-      this parameter is omitted or os set to &null;, then a default
-      pattern will be used.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      A callback which will be used whenever a query is being sent to 
-      MySQL. The callback will receive a single &boolean; parameter
-      telling if a query was sent via Memcache.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the association or disassociation is successful, otherwise &false; if there
-   is an error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>
-     <function>mysqlnd_memcache_set</function> example with
-     <function>var_dump</function> as a simple debugging callback.</title>
-
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("host", "user", "passwd", "database");
-$memc = new Memcached();
-$memc->addServer("host", 11211);
-mysqlnd_memcache_set($mysqli, $memc, NULL, 'var_dump');
-
-/* This query will be intercepted and executed via Memcache protocol */
-echo "Sending query for id via Memcache: ";
-$mysqli->query("SELECT f1, f2, f3 FROM test WHERE id = 1");
-
-/* f1 is not configured as valid key field, this won't be sent via Memcache */
-echo "Sending query for f1 via Memcache: ";
-$mysqli->query("SELECT id FROM test WHERE f1 = 1");
-
-mysqlnd_memcache_set($mysqli);
-
-/* Now the regular MySQL protocol will be used */
-echo "var_dump won't be invoked: ";
-$mysqli->query("SELECT f1, f2, f3 WHERE id = 1");
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Sending query for id via Memcache: bool(true)
-Sending query for f1 via Memcache: bool(false)
-var_dump won't be invoked: 
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_memcache_get_config</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/ini.xml b/reference/mysqlnd_memcache/ini.xml
deleted file mode 100644
index 4cf3d3869c..0000000000
--- a/reference/mysqlnd_memcache/ini.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-memcache.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Mysqlnd_memcache &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mysqlnd-memcache.configuration.list">
-     <row>
-      <entry><link linkend="ini.mysqlnd-memcache.enable">mysqlnd_memcache.enable</link></entry>
-      <entry>1</entry>
-      <entry><constant>PHP_INI_SYSTEM</constant></entry>
-      <entry>Available since 1.0.0</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-
-   <varlistentry xml:id="ini.mysqlnd-memcache.enable">
-    <term>
-     <parameter>mysqlnd_memcache.enable</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables the plugin. If disabled, the extension will not plug
-      into
-      <link linkend="book.mysqlnd">mysqlnd</link> to proxy internal
-      <link linkend="book.mysqlnd">mysqlnd</link> C API calls.
-      <note>
-       <para>
-        This option is mainly used by developers to build this
-        extension statically into PHP. General users are encouraged to build
-        this extension as a shared object, and to unload it completely when
-        it is not needed.
-       </para>
-      </note>
-     </para>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/quickstart.xml b/reference/mysqlnd_memcache/quickstart.xml
deleted file mode 100644
index 6ca7001cc7..0000000000
--- a/reference/mysqlnd_memcache/quickstart.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="mysqlnd-memcache.quickstart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Quickstart and Examples</title>
- <para>
-  The mysqlnd memcache plugin is easy to use.
-  This quickstart will demo typical use-cases, and provide practical advice on getting
-  started.
- </para>
- <para>
-  It is strongly recommended to read the reference sections in addition to the
-  quickstart. The quickstart tries to avoid discussing theoretical concepts
-  and limitations. Instead, it will link to the reference sections. It is safe
-  to begin with the quickstart. However, before using the plugin in mission critical
-  environments we urge you to read additionally the background information from the
-  reference sections.
- </para>
- <section xml:id="mysqlnd-memcache.quickstart.configuration">
-  <title>Setup</title>
-  <para>
-   The plugin is implemented as a PHP extension. See also the
-   <link linkend="mysqlnd-memcache.installation">installation instructions</link> to
-   install this extension.
-  </para>
-  <para>
-   Compile or configure the PHP MySQL extension (API) (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>, <link linkend="ref.mysql">mysql</link>). 
-   That extension must use the <link linkend="book.mysqlnd">mysqlnd</link> library as
-   because mysqlnd_memcache is a plugin for the mysqlnd library.  For additional information,
-   refer to the <link linkend="memcached.installation">mysqlnd_memcache installation instructions</link>.
-  </para>
-  <para>
-   Then, load this extension into PHP and activate the plugin in the PHP configuration
-   file using the PHP configuration directive named
-   <link linkend="ini.mysqlnd-memcache.enable">mysqlnd_memcache.enable</link>.
-  </para>
-  <para>
-   <example>
-    <title>Enabling the plugin (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-; On Windows the filename is php_mysqnd_memcache.dll
-; Load the extension
-extension=mysqlnd_memcache.so
-; Enable it
-mysqlnd_memcache.enable=1
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   Follow the instructions given in the <link xlink:href="&url.mysql.docs.memcached;">MySQL
-   Reference Manual on installing the Memcache plugins</link> for the MySQL server. Activate
-   the plugins and configure Memcache access for SQL tables.
-  </para>
-  <para>
-   The examples in this quickguide assume that the following table exists, and that
-   Memcache is configured with access to it.
-  </para>
-  <para>
-   <example>
-    <title>SQL table used for the Quickstart</title>
-    <programlisting role="sql">
-<![CDATA[
-CREATE TABLE test(
-  id CHAR(16),
-  f1 VARCHAR(255),
-  f2 VARCHAR(255),
-  f3 VARCHAR(255),
-  flags INT NOT NULL,
-  cas_column INT,
-  expire_time_column INT,
-  PRIMARY KEY(id)
-  ) ENGINE=InnoDB;
-
-INSERT INTO test (id, f1, f2, f3) VALUES (1, 'Hello', 'World', '!');
-INSERT INTO test (id, f1, f2, f3) VALUES (2, 'Lady', 'and', 'the tramp');
-
-INSERT INTO innodb_memcache.containers(
-  name, db_schema, db_table, key_columns, value_columns, 
-  flags, cas_column, expire_time_column, unique_idx_name_on_key)
-VALUES (
-  'plugin_test', 'test', 'test', 'id', 'f1,f2,f3',
-  'flags', 'cas_column', 'expire_time_column', 'PRIMARY KEY');
-]]>
-    </programlisting>
-   </example>
-  </para>
- </section>
- <section xml:id="mysqlnd-memcache.quickstart.usage">
-  <title>Usage</title>
-  <para>
-   After associating a MySQL connection with a Memcache connection using 
-   <function>mysqnd_memcache_set</function> the plugin attempts to transparently
-   replace SQL <literal>SELECT</literal>
-   statements by a memcache access. For that purpose the plugin monitors
-   all SQL statements executed and tries to match the statement string
-   against <constant>MYSQLND_MEMCACHE_DEFAULT_REGEXP</constant>.
-   In case of a match, the mysqlnd memcache plugin checks whether the
-   <literal>SELECT</literal> is accessing only columns of a mapped table and
-   the <literal>WHERE</literal> clause is limited to a single key lookup.
-  </para>
-  <para>
-   In case of the example SQL table, the plugin will use the Memcache interface
-   of the MySQL server to fetch results for a SQL query like
-   <literal>SELECT f1, f2, f3 WHERE id = n</literal>.
-  </para>
-  <para>
-   <example>
-    <title>
-     Basic example.</title>
-
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("host", "user", "passwd", "database");
-$memc = new Memcached();
-$memc->addServer("host", 11211);
-mysqlnd_memcache_set($mysqli, $memc);
-
-/*
-   This is a query which queries table test using id as key in the WHERE part
-   and is accessing fields f1, f2 and f3. Therefore, mysqlnd_memcache
-   will intercept it and route it via memcache.
-*/
-$result = $mysqli->query("SELECT f1, f2, f3 FROM test WHERE id = 1");
-while ($row = $result->fetch_row()) {
-    print_r($row);
-}
-
-/*
-   This is a query which queries table test but using f1 in the WHERE clause.
-   Therefore, mysqlnd_memcache can't intercept it. This will be executed
-   using the MySQL protocol
-*/
-$mysqli->query("SELECT id FROM test WHERE f1 = 'Lady'");
-while ($row = $result->fetch_row()) {
-    print_r($row);
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(
-    [f1] => Hello
-    [f2] => World
-    [f3] => !
-)
-array(
-    [id] => 2
-)
-]]>
-    </screen>
-   </example>
-  </para>
-
- </section>
-
-</chapter>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/reference.xml b/reference/mysqlnd_memcache/reference.xml
deleted file mode 100644
index 43c158bcff..0000000000
--- a/reference/mysqlnd_memcache/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mysqlnd-memcache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd_memcache &Functions;</title>
-
- &reference.mysqlnd-memcache.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/setup.xml b/reference/mysqlnd_memcache/setup.xml
deleted file mode 100644
index d295e20402..0000000000
--- a/reference/mysqlnd_memcache/setup.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-memcache.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mysqlnd-memcache.requirements">
-  &reftitle.required;
-  <para>
-    PHP: this extension requires PHP 5.4+, version PHP 5.4.4 or never. The required
-    PHP extensions are <link linkend="ref.pcre">PCRE</link> (enabled by default), and
-    the <link linkend="book.memcached">memcached</link> extension version 2.0.x.
-  </para>
-  <para>
-   The <literal>mysqlnd_memcache</literal> Memcache
-   plugin supports all PHP applications and all available PHP MySQL extensions
-   (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>).
-   The PHP MySQL extension must be configured with
-   <link linkend="book.mysqlnd">mysqlnd</link> support.
-  </para>
-  <para>
-   For accessing <literal>InnoDB</literal> tables, this PHP extension requires 
-   <literal>MySQL Server 5.6.6</literal> or newer with the InnoDB Memcache
-   Daemon Plugin enabled.
-  </para>
-  <para>
-   For accessing <literal>MySQL Cluster NDB</literal> tables, this PHP extension requires
-   <literal>MySQL Cluster 7.2</literal> or newer with the NDB Memcache API nodes
-   enabled.
-  </para>
- </section>
-
- &reference.mysqlnd-memcache.configure;
- &reference.mysqlnd-memcache.ini;
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_memcache/versions.xml b/reference/mysqlnd_memcache/versions.xml
deleted file mode 100644
index ebbe0568a5..0000000000
--- a/reference/mysqlnd_memcache/versions.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
- <!-- Functions -->
- <function name='mysqlnd_memcache_get_config' from='PECL mysqlnd_memcache &gt;= 1.0.0'/>
- <function name='mysqlnd_memcache_set' from='PECL mysqlnd_memcache &gt;= 1.0.0'/>
-
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/book.xml b/reference/mysqlnd_ms/book.xml
deleted file mode 100644
index 2f5a3a8a9c..0000000000
--- a/reference/mysqlnd_ms/book.xml
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mysqlnd-ms" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd replication and load balancing plugin</title>
- <titleabbrev>mysqlnd_ms</titleabbrev>
-
- <preface xml:id="intro.mysqlnd-ms">
-  &reftitle.intro;
-  <para>
-   The mysqlnd replication and load balancing plugin (<literal>mysqlnd_ms</literal>)
-   adds easy to use MySQL replication support to all PHP MySQL extensions that use
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
-  <para>
-   As of version PHP 5.3.3 the MySQL native driver for PHP
-   (<literal>mysqlnd</literal>)
-   features an internal plugin C API. C plugins, such as the replication and
-   load balancing plugin, can extend the functionality of
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
-  <para>
-   The MySQL native driver for PHP is a C library that ships together with
-   PHP. It serves as a drop-in replacement for the
-   MySQL Client Library (libmysqlclient). Using mysqlnd has
-   several advantages: no extra downloads are required because it's bundled with PHP,
-   it's under the PHP license, there is lower memory consumption in certain cases, and
-   it contains new functionality such as asynchronous queries.
-  </para>
-  <para>
-   Mysqlnd plugins like <literal>mysqlnd_ms</literal> operate, for the most part,
-   transparently from a user perspective. The replication and load balancing
-   plugin supports all PHP applications, and all MySQL PHP extensions.
-   It does not change existing APIs. Therefore, it can easily be used with
-   existing PHP applications.
-  </para>
-  <section xml:id="mysqlnd-ms.key-features">
-   <title>Key Features</title>
-   <para>
-   The key features of PECL/mysqlnd_ms are as follows.
-   </para>
-   <para>
-    <itemizedlist>
-     <listitem>
-      <para>
-       Transparent and therefore easy to use.
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Supports all of the PHP MySQL extensions.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          SSL support.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          A consistent <acronym>API</acronym>.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Little to no application changes required, dependent on the required usage scenario.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Lazy connections: connections to master and slave servers are not
-          opened before a SQL statement is executed.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Optional: automatic use of master after the first write in a web request, to
-          lower the possible impact of replication lag.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Can be used with any MySQL clustering solution.
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          MySQL Replication: Read-write splitting is done by the plugin.
-          Primary focus of the plugin.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          MySQL Cluster: Read-write splitting can be disabled.
-          Configuration of multiple masters possible
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Third-party solutions: the plugin is optimized for MySQL Replication
-          but can be used with any other kind of MySQL clustering solution.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Featured read-write split strategies
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Automatic detection of SELECT.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Supports SQL hints to overrule automatism.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          User-defined.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Can be disabled for, for example, when using synchronous clusters such as MySQL Cluster.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Featured load balancing strategies
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Round Robin: choose a different slave in round-robin fashion for every slave request.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Random: choose a random slave for every slave request.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Random once (sticky): choose a random slave once to run all slave requests for the duration of a web request.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          User-defined. The application can register callbacks with mysqlnd_ms.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          PHP 5.4.0 or newer: transaction aware when using API calls only to control transactions.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Weighted load balancing: servers can be assigned different priorities, for example, to
-          direct more requests to a powerful machine than to another less powerful machine. Or, to
-          prefer nearby machines to reduce latency.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Global transaction ID
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Client-side emulation. Makes manual master server failover and slave promotion easier
-          with asynchronous clusters, such as MySQL Replication.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Support for built-in global transaction identifier feature of MySQL 5.6.5 or newer.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Supports using transaction ids to identify up-to-date asynchronous slaves
-          for reading when session consistency is required. Please, note the restrictions
-          mentioned in the manual.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Throttling: optionally, the plugin can wait for a slave to become "synchronous" before
-          continuing.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Service and consistency levels
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Applications can request eventual, session and strong consistency
-          service levels for connections. Appropriate cluster nodes will
-          be searched automatically.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Eventual consistent MySQL Replication slave accesses can be replaced
-          with fast local cache accesses transparently to reduce server load.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Partitioning and sharding
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Servers of a replication cluster can be organized into groups. SQL hints
-          can be used to manually direct queries to a specific group.
-          Grouping can be used to partition (shard) the data, or to cure the issue of
-          hotspots with updates.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          MySQL Replication filters are supported through the table filter.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-      <listitem>
-      <para>
-       MySQL Fabric
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          <link linkend="mysqlnd-ms.quickstart.mysql_fabric">Experimental support</link>
-          for MySQL Fabric is included.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </itemizedlist>
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-ms.limitations">
-   <title>Limitations</title>
-   <para>
-    The built-in read-write-split mechanism is very basic. Every
-    query which starts with <literal>SELECT</literal>
-    is considered a read request to be sent to a MySQL slave server.
-    All other queries (such as <literal>SHOW</literal> statements)
-    are considered as write requests that are sent to the MySQL master server.
-    The build-in behavior can be overruled using
-    <link linkend="mysqlnd-ms.constants">SQL hints</link>, or a user-defined
-    <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-user">callback function</link>.
-   </para>
-   <para>
-    The read-write splitter is not aware of multi-statements. Multi-statements
-    are considered as one statement. The decision of where to run the statement
-    will be based on the beginning of the statement string. For example, if
-    using <function>mysqli_multi_query</function>
-    to execute the multi-statement <literal>SELECT id FROM test ; INSERT INTO test(id) VALUES (1)</literal>,
-    the statement will be redirected to a slave server because it begins with
-    <literal>SELECT</literal>. The <literal>INSERT</literal> statement, which is
-    also part of the multi-statement, will not be redirected to a master server.
-   </para>
-   <note>
-    <para>
-     Applications must be aware of the consequences of connection switches that are
-     performed for load balancing purposes. Please check the documentation on
-     <link linkend="mysqlnd-ms.pooling">connection pooling and switching</link>,
-     <link linkend="mysqlnd-ms.transaction">transaction handling</link>,
-     <link linkend="mysqlnd-ms.failover">failover</link>
-     <link linkend="mysqlnd-ms.loadbalancing">load balancing</link>&listendand;
-     <link linkend="mysqlnd-ms.rwsplit">read-write splitting</link>.
-    </para>
-   </note>
-  </section>
-
-  <section xml:id="mysqlnd-ms.name">
-   <title>On the name</title>
-   <para>
-    The shortcut <literal>mysqlnd_ms</literal>
-    stands for <literal>mysqlnd master slave plugin</literal>. The name
-    was chosen for a quick-and-dirty proof-of-concept. In the beginning
-    the developers did not expect to continue using the code base.
-   </para>
-  </section>
- </preface>
-
- &reference.mysqlnd-ms.quickstart;
- &reference.mysqlnd-ms.concepts;
- &reference.mysqlnd-ms.setup;
- &reference.mysqlnd-ms.constants;
- &reference.mysqlnd-ms.reference;
- &reference.mysqlnd-ms.changes;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/changes.xml b/reference/mysqlnd_ms/changes.xml
deleted file mode 100644
index c057ea8991..0000000000
--- a/reference/mysqlnd_ms/changes.xml
+++ /dev/null
@@ -1,1008 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-ms.changes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title xmlns="http://docbook.org/ns/docbook">Change History</title>
- <para>
-  This change history is a high level summary of selected changes
-  that may impact applications and/or break backwards compatibility.
- </para>
- <para>
-  See also the <filename>CHANGES</filename> file in the source distribution
-  for a complete list of changes.
- </para>
-
- <section xml:id="mysqlnd-ms.changes-one-six">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.6 series</title>
-  <para>
-   1.6.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: TBD
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Maintenance and initial MySQL Fabric support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <note>
-   <para>
-     This is the current development series. All
-     features are at an early stage. Changes may happen at any time without
-     prior notice. Please, do not use this version in production environments.
-    </para>
-    <para>
-     The documentation may not reflect all changes yet.
-    </para>
-  </note>
-  <para>
-   Bug fixes
-   <itemizedlist>
-     <listitem>
-     <para>
-      Won't fix: #66616 R/W split fails: QOS with mysqlnd_get_last_gtid with built-in MySQL GTID
-     </para>
-     <para>
-      This is not a bug in the plugins implementation but a server side feature
-      limitation not considered and documented before. MySQL 5.6 built-in GTIDs cannot be
-      used to ensure session consistency when reading from slaves in all cases.
-      In the worst case the plugin will not consider using the slaves and
-      fallback to using the master. There will be no wrong results but no benefit
-      from doing GTID checks either.
-     </para>
-    </listitem>
-    <listitem>
-      <para>
-        Fixed #66064 - Random once load balancer ignoring weights
-      </para>
-      <para>
-        Due to a config parsing bug random load balancing has ignored node
-        weights if, and only if, the sticky flag was set (random once).
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Fixed #65496 - Wrong check for slave delay
-      </para>
-      <para>
-       The quality of service filter has erroneously ignored slaves
-       that lag for zero (0) seconds if a any maximum lag had been set.
-       Although a slave was not lagging behind, it was excluded from the
-       load balancing list if a maximum age was set by the QoS filter.
-       This was due to using the wrong comparison operator in the source
-       of the filter.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Fixed #65408 - Compile failure with -Werror=format-security
-      </para>
-     </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-    <para>
-      Introduced an internal connection pool. When using Fabric and switching
-      from shard group A to shard group B, we are replacing the entire list of
-      masters and slaves. This troubles the connections state alignment logic and
-      some filters. Some filters cache information on the master and slave lists.
-      The new internal connection pool abstraction allows us to inform the filters
-      of changes, hence they can update their caches.
-     </para>
-     <para>
-      Later on, the pool can also be used to reduce connection overhead. Assume
-      you are switching from a shard group to another and back again. Whenever
-      the switch is done, the pool's active server (and connection) lists are
-      replaced. However, no longer used connections are not necessarily closed
-      immediately but can be kept in the pool for later reuse.
-     </para>
-     <para>
-      Please note, the connection pool is internalat this point. There are some
-      new statistics to monitor it. However, you cannot yet configure pool size
-      of behaviour. 
-     </para>
-    </listitem>
-    <listitem>
-    <para>
-      Added a basic distributed transaction abstraction.
-      XA transactions can are supported ever since using standard SQL calls.
-      This is inconvenient as XA participants must be managed manually.
-      PECL/mysqlnd_ms introduces API calls to control XA transaction among MySQL servers.
-      When using the new functions, PECL/mysqlnd_ms acts as a transaction coordinator.
-      After starting a distributed transaction, the plugin tracks all servers
-      involved until the transaction is ended and issues appropriate SQL statements
-      on the XA participants.
-     </para>
-     <para>
-       This is useful, for example, when using Fabric and sharding. When using
-       Fabric the actual shard servers involved in a business transaction may not be known
-       in advance. Thus, manually controlling a transaction that spawns multiple shards becomes
-       difficult.
-       Please, be warned about <link linkend="mysqlnd-ms.concept_xa_trx">current limitations</link>.
-     </para>
-    </listitem>
-    <listitem>
-    <para>
-      Introduced automatic retry loop for
-      <link linkend="mysqlnd-ms.transient_errors">transient errors</link> and
-      <link linkend="function.mysqlnd-ms-get-stats">corresponding statistic</link>
-      to count the number of implicit retries. Some distributed
-      database clusters use transient errors to hint a client to retry
-      its operation in a bit. Most often, the client is then supposed
-      to halt execution (sleep) for a short moment before retrying the
-      desired operation. Immediately failing over to another node
-      is not necessary in response to the error. Instead, a retry loop
-      can be performed. Common situation when using MySQL Cluster.
-     </para>
-    </listitem>
-    <listitem>
-    <para>
-      Introduced automatic retry loop for
-      <link linkend="mysqlnd-ms.transient_errors">transient errors</link> and
-      <link linkend="function.mysqlnd-ms-get-stats">corresponding statistic</link>
-      to count the number of implicit retries. Some distributed
-      database clusters use transient errors to hint a client to retry
-      its operation in a bit. Most often, the client is then supposed
-      to halt execution (sleep) for a short moment before retrying the
-      desired operation. Immediately failing over to another node
-      is not necessary in response to the error. Instead, a retry loop
-      can be performed. Common situation when using MySQL Cluster.
-     </para>
-    </listitem>
-    <listitem>
-    <para>
-      Introduced <link linkend="mysqlnd-ms.quickstart.mysql_fabric">most basic support</link>
-      for the MySQL Fabric High Availability and sharding framework.
-    </para>
-    <para>
-      Please, consider this pre-alpha quality. Both the
-      server side framework and the client side code is supposed to work flawless
-      considering the MySQL Fabric quickstart examples only. However, testing has not been
-      performed to the level of prior plugin  alpha releases.
-      Either sides are moving targets, API changes may happen at any
-      time without prior warning.
-     </para>
-     <para>
-      As this is work in progress, the manual may not yet reflect allow
-      feature limitations and known bugs.
-     </para>
-    </listitem>
-    <listitem>
-    <para>
-      New
-      <link linkend="function.mysqlnd-ms-get-stats">statistics</link>
-      to monitor the Fabric XML RPC call <literal>sharding.lookup_servers</literal>:
-      <literal>fabric_sharding_lookup_servers_success</literal>,
-      <literal>fabric_sharding_lookup_servers_failure</literal>,
-      <literal>fabric_sharding_lookup_servers_time_total</literal>,
-      <literal>fabric_sharding_lookup_servers_bytes_total</literal>,
-      <literal>fabric_sharding_lookup_servers_xml_failure</literal>.
-     </para>
-    </listitem>
-   <listitem>
-    <para>
-      New functions related to MySQL Fabric:
-      <function>mysqlnd_ms_fabric_select_shard</function>,
-      <function>mysqlnd_ms_fabric_select_global</function>,
-      <function>mysqlnd_ms_dump_servers</function>.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.changes-one-five">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.5 series</title>
-   <para>
-   1.5.1-stable
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 06/2013
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Sharding support, improved transaction support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <note>
-   <para>
-     This is the current stable series. Use this version in production environments.
-    </para>
-    <para>
-     The documentation is complete.
-    </para>
-  </note>
-  <para>
-   1.5.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 03/2013
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Sharding support, improved transaction support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Bug fixes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Fixed #60605 PHP segmentation fault when mysqlnd_ms is enabled.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Setting transaction stickiness disables all load balancing, including
-      automatic failover, for the duration of a transaction. So far
-      connection switches could have happened in the middle of a transaction
-      in multi-master configurations  and during automatic failover although
-      transaction monitoring had detected transaction boundaries properly.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      BC break and bug fix. SQL hints enforcing the use of a specific
-      kind of server (<constant>MYSQLND_MS_MASTER_SWITCH</constant>,
-      <constant>MYSQLND_MS_SLAVE_SWITCH</constant>,
-      <constant>MYSQLND_MS_LAST_USED_SWITCH</constant>) are ignored for the
-      duration of a transaction of transaction stickiness is enabled and
-      transaction boundaries have been detected properly.
-     </para>
-     <para>
-      This is a change in behaviour. However, it is also a bug fix and a step
-      to align behaviour. If, in previous versions, transaction stickiness,
-      one of the above listed SQL hints and the quality of service filtering
-      was combined it could happened that the SQL hints got ignored. In some
-      case the SQL hints did work, in other cases they did not. The new
-      behaviour is more consistent. SQL hints will always be ignore for
-      the duration of a transaction, if
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">transaction stickiness</link>
-      is enabled.
-     </para>
-     <para>
-      Please note, transaction boundary detection continues to be based on API
-      call monitoring. SQL commands controlling transactions are not monitored.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      BC break and bug fix. Calls to <function>mysqlnd_ms_set_qos</function>
-      will fail when done in the middle of a transaction if
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">transaction stickiness</link>
-      is enabled. Connection switches are not allowed for the duration of a
-      transaction. Changing the quality of service likely results on a different
-      set of servers qualifying for query execution, possibly making it
-      necessary to switch connections. Thus, the call is not allowed in
-      during an active transaction. The quality of server can, however, be
-      changed in between transactions.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-    <para>
-      Introduced the <literal>node_group</literal> filter.
-      The filter lets you organize servers (master and slaves)
-      into groups. Queries can be directed to a certain group of servers
-      by prefixing the query statement with a SQL hint/comment that contains
-      the groups configured name. Grouping can be used for
-      partitioning and sharding, and also to optimize for local caching.
-      In the case of sharding, a group name can be thought of like a shard key.
-      All queries for a given shard key will be executed on the
-      configured shard. Note: both the client and server must support sharding
-      for sharding to function with mysqlnd_ms.
-     </para>
-    </listitem>
-    <listitem>
-    <para>
-      Extended configuration file validation during PHP startup (RINIT).
-      An <constant>E_WARNING</constant> level error will be thrown if the configuration
-      file can not be read (permissions), is empty, or the file (JSON) could not be parsed.
-      Warnings may appear in log files, which depending on how PHP is configured.
-    </para>
-    <para>
-      Distributions that aim to provide a pre-configured setup, including a
-      configuration file stub, are asked to put <literal>{}</literal> into
-      the configuration file to prevent this warning about an invalid
-      configuration file.
-     </para>
-    <para>
-      Further configuration file validation is done when parsing sections
-      upon opening a connection. Please, note that there may still be situations
-      when an invalid plugin configuration file does not lead to proper error messages
-      but a failure to connect.
-    </para>
-    </listitem>
-    <listitem>
-     <para>
-      As of PHP 5.5.0, improved support for transaction boundaries detection was added for
-      <literal>mysqli</literal>. The <literal>mysqli</literal> extension has been
-      modified to use the new C API calls of the <literal>mysqlnd</literal>
-      library to begin, commit, and rollback a transaction or savepoint.
-      If <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">trx_stickiness</link>
-      is used to enable transaction aware load balancing, the <function>mysqli_begin</function>,
-      <function>mysqli_commit</function> and <function>mysqli_rollback</function> functions
-      will now be monitered by the plugin, to go along with the <function>mysqli_autocommit</function>
-      function that was already supported. All SQL features to control
-      transactions are also available through the improved <literal>mysqli</literal>
-      transaction control related functions. This means that it is not required to
-      issue SQL statements instead of using API calls. Applications
-      using the appropriate API calls can be load balanced by PECL/mysqlnd_ms
-      in a completely transaction-aware way.
-     </para>
-     <para>
-      Please note, <literal>PDO_MySQL</literal> has not been updated
-      yet to utilize the new mysqlnd API calls. Thus, transaction boundary
-      detection with <literal>PDO_MySQL</literal> continues to be limited to
-      the monitoring by passing in <constant>PDO::ATTR_AUTOCOMMIT</constant> to
-      <methodname>PDO::setAttribute</methodname>.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Introduced <literal>trx_stickiness=on</literal>. This
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">trx_stickiness</link>
-      option differs from <literal>trx_stickiness=master</literal> as it
-      tries to execute a read-only transaction on a slave, if
-      quality of service (consistency level) allows the use of a slave.
-      Read-only transactions were introduced in MySQL 5.6, and they
-      offer performance gains.
-     </para>
-    </listitem>
-    <listitem>
-      <para>
-       Query cache support is considered beta if used with the <literal>mysqli</literal>
-       API. It should work fine with primary copy based clusters. For all other
-       APIs, this feature continues to be called experimental.
-      </para>
-    </listitem>
-    <listitem>
-     <para>
-      The code examples in the mysqlnd_ms source were updated.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.changes-one-four">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.4 series</title>
-  <para>
-   1.4.2-stable
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 08/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Tweaking based on user feedback
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.4.1-beta
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 08/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Tweaking based on user feedback
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Bug fixes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Fixed build with PHP 5.5
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.4.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 07/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Tweaking based on user feedback
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-    <para>
-      BC break: Renamed plugin configuration setting <literal>ini_file</literal>
-      to <literal>config_file</literal>. In early versions the plugin configuration
-      file used ini style. Back then the configuration setting was named accordingly.
-      It has now been renamed to reflect the newer file format and to distinguish it
-      from PHP's own ini file (configuration directives file).
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Introduced new default charset setting <literal>server_charset</literal>
-      to allow proper escaping before a connection
-      is opened. This is most useful when using lazy connections, which are a default.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Introduced <literal>wait_for_gtid_timeout</literal> setting to throttle
-      slave reads that need session consistency. If global transaction identifier are
-      used and the service level is set to session consistency, the plugin
-      tries to find up-to-date slaves. The slave status check is done by
-      a SQL statement. If nothing else is set, the slave status is checked only
-      one can the search for more up-to-date slaves continues immediately
-      thereafter. Setting <literal>wait_for_gtid_timeout</literal> instructs the plugin
-      to poll a slaves status for <literal>wait_for_gtid_timeout</literal> seconds
-      if the first execution of the SQL statement has shown that the slave is not
-      up-to-date yet. The poll will be done once per second. This way, the plugin
-      will wait for slaves to catch up and throttle the client.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      New failover strategy <literal>loop_before_master</literal>.
-      By default the plugin does no failover. It is possible to enable
-      automatic failover if a connection attempt fails. Upto version 1.3
-      only <literal>master</literal> strategy existed to failover to a master if
-      a slave connection fails. <literal>loop_before_master</literal> is
-      similar but tries all other slaves before attempting to connect to the master
-      if a slave connection fails.
-     </para>
-     <para>
-      The number of attempts can be limited using the <literal>max_retries</literal> option.
-      Failed hosts can be remembered and skipped in load balancing for the rest of
-      the web request. <literal>max_retries</literal> and
-      <literal>remember_failed</literal> are considered experimental although
-      decent stability is given. Syntax and semantics may change in the future
-      without prior notice.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.changes-one-three">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.3 series</title>
-  <para>
-   1.3.2-stable
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: see 1.3.0-alpha
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Bug fixes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Fixed problem with multi-master where although in a transaction
-      the queries to the master weren't sticky and were spread all
-      over the masters (RR). Still not sticky for Random. Random_once
-      is not affected.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.3.1-beta
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: see 1.3.0-alpha
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Bug fixes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Fixed problem with building together with QC.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.3.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Query caching through quality-of-service concept
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The 1.3 series aims to improve the performance of applications
-   and the overall load of an asynchronous MySQL cluster, for example, a MySQL
-   cluster using MySQL Replication. This is done by transparently replacing
-   a slave access with a local cache access, if the application allows it by
-   setting an appropriate quality of service flag. When using MySQL replication
-   a slave can serve stale data. An application using MySQL replication must
-   continue to work correctly with stale data. Given that the application
-   is know to work correctly with stale data, the slave access can transparently
-   be replace with a local cache access.
-  </para>
-  <para>
-   <link linkend="book.mysqlnd-qc">PECL/mysqlnd_qc</link> serves as a cache
-   backend. PECL/mysqlnd_qc supports use of various storage locations,
-   among others main memory, <literal>APC</literal> and <literal>MEMCACHE</literal>.
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Added cache option to quality-of-service (QoS) filter.
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          New configure option <literal>enable-mysqlnd-ms-cache-support</literal>
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          New constant <literal>MYSQLND_MS_HAVE_CACHE_SUPPORT</literal>.
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          New constant <literal>MYSQLND_MS_QOS_OPTION_CACHE</literal> to be used
-          with <function>mysqlnd_ms_set_qos</function>.
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Support for built-in global transaction identifier feature of MySQL 5.6.5-m8 or newer.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.changes-one-two">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.2 series</title>
-  <para>
-   1.2.1-beta
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 01/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: see 1.2.0-alpha
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Minor test changes.
-  </para>
-  <para>
-   1.2.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 11/2011
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Global Transaction ID injection and quality-of-service concept
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   In version 1.2 the focus continues to be on supporting MySQL database clusters
-   with asynchronous replication. The plugin tries to make using the cluster
-   introducing a quality-of-service filter which applications can use to define
-   what service quality they need from the cluster. Service levels provided are
-   eventual consistency with optional maximum age/slave slag, session consistency
-   and strong consistency.
-  </para>
-  <para>
-   Additionally the plugin can do client-side global transaction id injection
-   to make manual master failover easier.
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Introduced quality-of-service (QoS) filter. Service levels provided by QoS filter:
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          eventual consistency, optional option slave lag
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          session consistency, optional option GTID
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          strong consistency
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Added the <function>mysqlnd_ms_set_qos</function> function to set the
-      required connection quality at runtime. The new constants related to
-      <function>mysqlnd_ms_set_qos</function> are:
-      <itemizedlist>
-       <listitem>
-        <simpara>
-         <constant>MYSQLND_MS_QOS_CONSISTENCY_STRONG</constant>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>MYSQLND_MS_QOS_CONSISTENCY_SESSION</constant>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL</constant>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>MYSQLND_MS_QOS_OPTION_GTID</constant>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>MYSQLND_MS_QOS_OPTION_AGE</constant>
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Added client-side global transaction id injection (GTID).
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-     New statistics related to GTID:
-     <itemizedlist>
-       <listitem>
-        <simpara>
-         <literal>gtid_autocommit_injections_success</literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>gtid_autocommit_injections_failure</literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>gtid_commit_injections_success</literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>gtid_commit_injections_failure</literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>gtid_implicit_commit_injections_success</literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>gtid_implicit_commit_injections_failure</literal>
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-      <para>
-       Added <function>mysqlnd_ms_get_last_gtid</function> to fetch the last
-       global transaction id.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-       Enabled support for multi master without slaves.
-      </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.changes-one-one">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.1 series</title>
-  <para>
-   1.1.0
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 09/2011
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Cover replication basics with production quality
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The 1.1 and 1.0 series expose a similar feature set. Internally,
-   the 1.1 series has been refactored to plan for future feature
-   additions. A new configuration file format has been introduced,
-   and limitations have been lifted. And the code quality and quality
-   assurance has been improved.
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Added the (chainable) <link linkend="mysqlnd-ms.filter">filter concept</link>:
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          BC break:
-          <function>mysqlnd_ms_set_user_pick_server</function>
-          has been removed. Thehttp://svn.php.net/viewvc/pecl/mysqlnd_ms/trunk/
-          <link linkend="mysqlnd-ms.filter"><literal>user</literal></link>
-          filter has been introduced to replace it.
-          The filter offers similar functionality, but see below for an
-          explanation of the differences.
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <simpara>
-      New powerful <acronym>JSON</acronym> based configuration syntax.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <link linkend="mysqlnd-ms.pooling">Lazy connections improved</link>:
-      security relevant, and state changing commands are covered.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Support for (native) prepared statements.
-     </simpara>
-    </listitem>
-    <listitem>
-     <para>
-      New statistics: <literal>use_master_guess</literal>,
-      <literal>use_slave_guess</literal>.
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          BC break: Semantics of statistics changed for
-          <literal>use_slave</literal>, <literal>use_master</literal>.
-          Future changes are likely. Please see,
-          <function>mysqlnd_ms_get_stats</function>.
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <simpara>
-      List of broadcasted messages extended by <literal>ssl_set</literal>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Library calls now monitored to remember settings for lazy connections:
-      <literal>change_user</literal>, <literal>select_db</literal>,
-      <literal>set_charset</literal>, <literal>set_autocommit</literal>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Introduced <link linkend="ini.mysqlnd-ms.disable-rw-split"><literal>mysqlnd_ms.disable_rw_split</literal></link>.
-      The configuration setting allows using the load balancing and lazy connection
-      functionality independently of read write splitting.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Bug fixes
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Fixed PECL #22724 - Server switching (mysqlnd_ms_query_is_select() case sensitive)
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Fixed PECL #22784 - Using mysql_connect and mysql_select_db did not work
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Fixed PECL #59982 - Unusable extension with --enable-mysqlnd-ms-table-filter.
-      Use of the option is NOT supported. You must not used it. Added note to m4.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Fixed Bug #60119 - host="localhost" lost in mysqlnd_ms_get_last_used_connection()
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-    The <function>mysqlnd_ms_set_user_pick_server</function> function was removed, and
-    replaced in favor of a new <literal>user</literal> filter. You can no longer set a
-    callback function using <function>mysqlnd_ms_set_user_pick_server</function> at
-    runtime, but instead have to configure it in the plugins configuration file. The <literal>user</literal>
-    filter will pass the same arguments to the callback as before.
-    Therefore, you can continue to use the same procedural function as a callback.callback
-    It is no longer possible to use static class methods, or class methods of
-    an object instance, as a callback. Doing so will cause the function
-    executing a statement handled by the plugin to emit an
-    <constant>E_RECOVERABLE_ERROR</constant> level error, which might look like:
-    "<literal>(mysqlnd_ms) Specified callback (picker) is not a valid callback</literal>."
-    Note: this may halt your application.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.changes-one-o">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.0 series</title>
-  <para>
-   1.0.1-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2011
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: bug fix release
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.0.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2011
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Cover replication basics to test user feedback
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The first release of practical use. It features basic automatic read-write splitting,
-   SQL hints to overrule automatic redirection, load balancing of
-   slave requests, lazy connections, and optional, automatic use of the master
-   after the first write.
-  </para>
-  <para>
-   The public feature set is close to that of the 1.1 release.
-  </para>
-  <para>
-   1.0.0-pre-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 09/2010
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Proof of concept
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Initial check-in. Essentially a demo of the
-   <link linkend="book.mysqlnd">mysqlnd</link> plugin API.
-  </para>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/concepts.xml b/reference/mysqlnd_ms/concepts.xml
deleted file mode 100644
index 75c491144a..0000000000
--- a/reference/mysqlnd_ms/concepts.xml
+++ /dev/null
@@ -1,2353 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-ms.concepts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Concepts</title>
- <para>
-  This explains the architecture and related concepts for this plugin, and
-  describes the impact that MySQL replication and this plugin have on developmental
-  tasks while using a database cluster. Reading and understanding these concepts
-  is required, in order to use this plugin with success.
- </para>
- <section xml:id="mysqlnd-ms.architecture">
-  <title>Architecture</title>
-  <para>
-   The mysqlnd replication and load balancing plugin is
-   implemented as a PHP extension.
-   It is written in C and operates under the hood of PHP. During the
-   startup of the PHP interpreter, in the module init phase of the
-   PHP engine, it gets registered as a
-   <link linkend="book.mysqlnd">mysqlnd</link> plugin to replace selected
-   mysqlnd C methods.
-  </para>
-  <para>
-   At PHP runtime, it inspects queries sent from
-   mysqlnd (PHP) to the MySQL server. If a query is recognized as read-only,
-   it will be sent to one of the configured slave servers. Statements are
-   considered read-only if they either start with <literal>SELECT</literal>,
-   the SQL hint <literal>/*ms=slave*/</literal> or a slave had been chosen for
-   running the previous query, and the query started with the SQL hint
-   <literal>/*ms=last_used*/</literal>. In all other cases, the query will
-   be sent to the MySQL replication master server.
-  </para>
-  <para>
-   For better portability, applications should use the
-   <constant>MYSQLND_MS_MASTER_SWITCH</constant>,
-   <constant>MYSQLND_MS_SLAVE_SWITCH</constant>, and
-   <constant>MYSQLND_MS_LAST_USED_SWITCH</constant>
-   <link linkend="mysqlnd-ms.constants">predefined mysqlnd_ms constants</link>,
-   instead of their literal values, such as <literal>/*ms=slave*/</literal>.
-  </para>
-  <para>
-   The plugin handles the opening and closing of database connections
-   to both master and slave servers. From an application
-   point of view, there continues to be only one connection handle. However,
-   internally, this one public connection handle represents a pool of
-   network connections that are managed by the plugin. The plugin proxies queries
-   to the master server, and to the slaves using multiple connections.
-  </para>
-  <para>
-    Database connections have a state consisting of, for example, transaction
-    status, transaction settings, character set settings, and temporary tables.
-    The plugin will try to maintain the same state among all internal
-    connections, whenever this can be done in an automatic and transparent way.
-    In cases where it is not easily possible to maintain state among all
-    connections, such as when using <literal>BEGIN TRANSACTION</literal>, the
-    plugin leaves it to the user to handle.
-  </para>
-
- </section>
-
- <section xml:id="mysqlnd-ms.pooling">
-  <title>Connection pooling and switching</title>
-  <para>
-   The replication and load balancing plugin changes the semantics of a PHP
-   MySQL connection handle. The existing API of the PHP MySQL extensions
-   (<link linkend="ref.mysqli">mysqli</link>,
-  <link linkend="ref.mysql">mysql</link>, and
-  <link linkend="ref.pdo-mysql">PDO_MYSQL</link>) are not changed in
-  a way that functions are added or removed. But their behavior
-  changes when using the plugin. Existing applications do not need to
-  be adapted to a new API, but they may need to be modified because of
-  the behavior changes.
-  </para>
-  <para>
-   The plugin breaks the one-by-one relationship between a
-   <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>, and
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link> connection
-   handle and a MySQL network connection. And a
-   <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>, and
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link> connection
-   handle represents a local pool of connections to the configured
-   MySQL replication master and MySQL replication slave servers.
-   The plugin redirects queries to the master and slave servers.
-   At some point in time one and the same PHP connection handle
-   may point to the MySQL master server. Later on, it may point
-   to one of the slave servers or still the master. Manipulating
-   and replacing the network connection referenced by a PHP MySQL
-   connection handle is not a transparent operation.
-  </para>
-  <para>
-   Every MySQL connection has a state. The state of the connections in
-   the connection pool of the plugin can differ. Whenever the
-   plugin switches from one wire connection to another, the current state of
-   the user connection may change. The applications must be aware of this.
-  </para>
-  <para>
-   The following list shows what the connection state consists of. The list
-   may not be complete.
-  </para>
-  <para>
-    <itemizedlist>
-     <listitem>
-      <simpara>
-       Transaction status
-      </simpara>
-     </listitem>
-     <listitem>
-      <simpara>
-       Temporary tables
-      </simpara>
-    </listitem>
-    <listitem>
-      <simpara>
-       Table locks
-      </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Session system variables and session user variables
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      The current database set using <literal>USE</literal> and other state chaining SQL commands
-     </simpara>
-    </listitem>
-    <listitem>
-      <simpara>
-       Prepared statements
-      </simpara>
-    </listitem>
-    <listitem>
-      <simpara>
-       <literal>HANDLER</literal> variables
-      </simpara>
-    </listitem>
-    <listitem>
-      <simpara>
-       Locks acquired with <literal>GET_LOCK()</literal>
-      </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-    Connection switches happen right before queries are executed. The plugin does
-    not switch the current connection until the next statement is executed.
-  </para>
-  <note>
-   <title>Replication issues</title>
-   <para>
-    See also the MySQL reference manual chapter about
-    <link xlink:href="&url.mysql.docs.replication;">replication features</link> and
-    related issues. Some restrictions may not be related to the PHP plugin, but
-    are properties of the MySQL replication system.
-   </para>
-  </note>
-  <para>Broadcasted messages</para>
-  <para>
-   The plugins philosophy is to align the state of connections in the
-   pool only if the state is under full control of the plugin, or if it is
-   necessary for security reasons. Just a few actions that change the
-   state of the connection fall into this category.
-  </para>
-  <para>
-   The following is a list of connection client library calls that change state,
-   and are broadcasted to all open connections in the connection pool.
-  </para>
-  <para>
-   If any of the listed calls below are to be executed, the plugin loops over all
-   open master and slave connections. The loop continues until all servers
-   have been contacted, and the loop does not break if a server indicates a failure.
-   If possible, the failure will propagate to the called user API function, which may
-   be detected depending on which underlying library function was triggered.
-  </para>
-  <informaltable>
-   <tgroup cols="3">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="7*"/>
-    <colspec colwidth="2*"/>
-    <thead>
-     <row>
-      <entry>Library call</entry>
-      <entry>Notes</entry>
-      <entry>Version</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>change_user()</literal>
-      </entry>
-      <entry>
-       Called by the <function>mysqli_change_user</function> user API call.
-       Also triggered upon reuse of a persistent <literal>mysqli</literal>
-       connection.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>select_db</literal>
-      </entry>
-      <entry>
-       Called by the following user API calls:
-       <function>mysql_select_db</function>,
-       <function>mysql_list_tables</function>,
-       <function>mysql_db_query</function>,
-       <function>mysql_list_fields</function>,
-       <function>mysqli_select_db</function>.
-       Note, that SQL <literal>USE</literal> is not monitored.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>set_charset()</literal>
-      </entry>
-      <entry>
-       Called by the following user API calls:
-       <function>mysql_set_charset</function>.
-       <function>mysqli_set_charset</function>.
-       Note, that SQL <literal>SET NAMES</literal> is not monitored.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>set_server_option()</literal>
-      </entry>
-      <entry>
-        Called by the following user API calls:
-        <function>mysqli_multi_query</function>,
-        <function>mysqli_real_query</function>,
-        <function>mysqli_query</function>,
-        <function>mysql_query</function>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>set_client_option()</literal>
-      </entry>
-      <entry>
-        Called by the following user API calls:
-        <function>mysqli_options</function>,
-        <function>mysqli_ssl_set</function>,
-        <function>mysqli_connect</function>,
-        <function>mysql_connect</function>,
-        <function>mysql_pconnect</function>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>set_autocommit()</literal>
-      </entry>
-      <entry>
-        Called by the following user API calls:
-        <function>mysqli_autocommit</function>,
-        <literal>PDO::setAttribute(PDO::ATTR_AUTOCOMMIT)</literal>.
-      </entry>
-      <entry>Since 1.0.0. PHP &gt;= 5.4.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>ssl_set()</literal>
-      </entry>
-      <entry>
-       Called by the following user API calls:
-       <function>mysqli_ssl_set</function>.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
-  <para>Broadcasting and lazy connections</para>
-  <para>
-   The plugin does not proxy or
-   <quote>remember</quote> all settings to apply them on connections
-   opened in the future. This is important to remember, if
-   using
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link>.
-   Lazy connections are connections which are not
-   opened before the client sends the first connection.
-   Use of lazy connections is the default plugin action.
-  </para>
-  <para>
-   The following connection library calls each changed state, and their execution is
-   recorded for later use when lazy connections are opened. This helps ensure that
-   the connection state of all connections in the connection pool are comparable.
-  </para>
-  <informaltable>
-   <tgroup cols="3">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="7*"/>
-    <colspec colwidth="2*"/>
-    <thead>
-     <row>
-      <entry>Library call</entry>
-      <entry>Notes</entry>
-      <entry>Version</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>change_user()</literal>
-      </entry>
-      <entry>
-       User, password and database recorded for future use.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>select_db</literal>
-      </entry>
-      <entry>
-       Database recorded for future use.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>set_charset()</literal>
-      </entry>
-      <entry>
-       Calls <literal>set_client_option(MYSQL_SET_CHARSET_NAME, charset)</literal>
-       on lazy connection to ensure <literal>charset</literal> will be used
-       upon opening the lazy connection.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>set_autocommit()</literal>
-      </entry>
-      <entry>
-       Adds <literal>SET AUTOCOMMIT=0|1</literal> to the list of init commands
-       of a lazy connection using
-       <literal>set_client_option(MYSQL_INIT_COMMAND, &quot;SET AUTOCOMMIT=...%quot;)</literal>.
-      </entry>
-      <entry>Since 1.1.0. PHP &gt;= 5.4.0.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
-
-  <caution>
-   <title>Connection state</title>
-   <para>
-    The connection state is not only changed by API calls. Thus, even if
-    PECL mysqlnd_ms monitors all API calls, the application must still
-    be aware. Ultimately, it is the applications responsibility to maintain
-    the connection state, if needed.
-   </para>
-  </caution>
-
-  <para>Charsets and string escaping</para>
-  <para>
-   Due to the use of lazy connections, which are a default, it can happen that
-   an application tries to escape a string for use within SQL statements before
-   a connection has been established. In this case string escaping is not possible.
-   The string escape function does not know what charset to use before a connection
-   has been established.
-  </para>
-  <para>
-   To overcome the problem a new configuration setting
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.server-charset"><literal>server_charset</literal></link>
-   has been introduced in version 1.4.0.
-  </para>
-  <para>
-   Attention has to be paid on escaping strings with a certain charset but using
-   the result on a connection that uses a different charset. Please note,
-   that PECL/mysqlnd_ms manipulates connections and one application level connection
-   represents a pool of multiple connections that all may have different default charsets.
-   It is recommended to configure the servers involved to use the same default charsets.
-   The configuration setting <literal>server_charset</literal> does help with this situation as well.
-   If using <literal>server_charset</literal>, the plugin will set the given
-   charset on all newly opened connections.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.transaction">
-  <title>Local transaction handling</title>
-  <para>
-   Transaction handling is fundamentally changed.
-   An SQL transaction is a unit of work that is run on one database server. The
-   unit of work consists of one or more SQL statements.
-  </para>
-  <para>
-   By default the plugin is not aware of SQL transactions. The plugin may
-   switch connections for load balancing at any point in time. Connection
-   switches may happen in the middle of a transaction. This is against the
-   nature of an SQL transaction. By default, the plugin is not transaction safe.
-  </para>
-  <para>
-   Any kind of MySQL load balancer must be hinted about the begin and end of a
-   transaction. Hinting can either be done implicitly by monitoring API calls
-   or using SQL hints. Both options are supported by the plugin, depending on
-   your PHP version. API monitoring requires PHP 5.4.0 or newer. The plugin,
-   like any other MySQL load balancer, cannot detect transaction boundaries based
-   on the MySQL Client Server Protocol. Thus, entirely transparent transaction
-   aware load balancing is not possible. The least intrusive option is API
-   monitoring, which requires little to no application changes, depending
-   on your application.
-  </para>
-  <para>
-   Please, find examples of using SQL hints or the API monitoring in the
-   <link linkend="mysqlnd-ms.quickstart">examples section</link>. The
-   details behind the API monitoring, which makes the plugin transaction
-   aware, are described below.
-  </para>
-  <para>
-   Beginning with PHP 5.4.0, the <link linkend="book.mysqlnd">mysqlnd</link>
-   library allows this plugin to subclass the library C API call
-   <literal>set_autocommit()</literal>, to detect the status of
-   <literal>autocommit</literal> mode.
-  </para>
-  <para>
-   The PHP MySQL extensions either issue a query (such as <literal>SET AUTOCOMMIT=0|1</literal>),
-   or use the mysqlnd library call <literal>set_autocommit()</literal> to control
-   the <literal>autocommit</literal> setting. If an extension makes use of
-   <literal>set_autocommit()</literal>, the plugin can be made transaction aware.
-   Transaction awareness cannot be achieved if using SQL to set the autocommit
-   mode.
-   The library function <literal>set_autocommit()</literal> is called by the
-   <function>mysqli_autocommit</function> and
-   <literal>PDO::setAttribute(PDO::ATTR_AUTOCOMMIT)</literal> user API calls.
-  </para>
-  <para>
-   The plugin configuration option
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">trx_stickiness=master</link>
-   can be used to make the plugin transactional aware. In this mode, the plugin stops load
-   balancing if autocommit becomes disabled, and directs all statements to the master until
-   autocommit gets enabled.
-  </para>
-  <para>
-   An application that does not want to set SQL hints for transactions but wants
-   to use the transparent API monitoring to avoid application changes must make
-   sure that the autocommit settings is changed exclusively through the listed
-   API calls.
-  </para>
-  <para>
-   API based transaction boundary detection has been improved with PHP 5.5.0 and
-   PECL/mysqlnd_ms 1.5.0 to cover not only calls to <function>mysqli_autocommit</function>
-   but also <function>mysqli_begin</function>,
-   <function>mysqli_commit</function> and <function>mysqli_rollback</function>.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.errorhandling">
-  <title>Error handling</title>
-  <para>
-   Applications using PECL/mysqlnd_ms should implement proper error handling
-   for all user API calls. And because the plugin changes the semantics
-   of a connection handle, API calls may return unexpected errors. If using
-   the plugin on a connection handle that no longer represents an individual network
-   connection, but a connection pool, an error code and error message will
-   be set on the connection handle whenever an error occurs on any of the network
-   connections behind.
-  </para>
-  <para>
-   If using lazy connections, which is the default, connections are not
-   opened until they are needed for query execution. Therefore,
-   an API call for a statement execution may return a connection error.
-   In the example below, an error is provoked when trying to run a statement on a slave.
-   Opening a slave connection fails because the plugin configuration file
-   lists an invalid host name for the slave.
-  </para>
-  <para>
-   <example>
-    <title>Provoking a connection error</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "invalid_host_name",
-            }
-        },
-        "lazy_connections": 1
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The explicit activation of lazy connections is for demonstration purpose only.
-  </para>
-  <para>
-   <example>
-    <title>Connection error on query execution</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (mysqli_connect_errno())
-  /* Of course, your error handling is nicer... */
-  die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-
-/* Connection 1, connection bound SQL user variable, no SELECT thus run on master */
-if (!$mysqli->query("SET @myrole='master'")) {
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-/* Connection 2, run on slave because SELECT, provoke connection error */
-if (!($res = $mysqli->query("SELECT @myrole AS _role"))) {
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-} else {
- $row = $res->fetch_assoc();
- $res->close();
- printf("@myrole = '%s'\n", $row['_role']);
-}
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-&example.outputs.similar;
-    <screen>
-<![CDATA[
-PHP Warning:  mysqli::query(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %d
-PHP Warning:  mysqli::query(): [2002] php_network_getaddresses: getaddrinfo failed: Name or service not known (trying to connect via tcp://invalid_host_name:3306) in %s on line %d
-[2002] php_network_getaddresses: getaddrinfo failed: Name or service not known
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   Applications are expected to handle possible connection errors by
-   implementing proper error handling.
-  </para>
-  <para>
-   Depending on the use case, applications may want to handle connection errors
-   differently from other errors.  Typical connection errors are
-   <literal>2002 (CR_CONNECTION_ERROR) - Can't connect to local MySQL server through socket '%s' (%d)</literal>,
-   <literal>2003 (CR_CONN_HOST_ERROR) - Can't connect to MySQL server on '%s' (%d)</literal> and
-   <literal>2005 (CR_UNKNOWN_HOST) - Unknown MySQL server host '%s' (%d)</literal>.
-   For example, the application may test for the error codes and manually
-   perform a fail over. The plugins philosophy is not to offer automatic fail over,
-   beyond master fail over, because fail over is not a transparent operation.
-  </para>
-  <para>
-   <example>
-    <title>Provoking a connection error</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "invalid_host_name"
-            },
-            "slave_1": {
-                "host": "192.168.78.136"
-            }
-        },
-        "lazy_connections": 1,
-        "filters": {
-            "roundrobin": [
-
-            ]
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Explicitly activating lazy connections is done for demonstration purposes,
-   as is round robin load balancing as opposed to the default <literal>random once</literal>
-   type.
-  </para>
-  <para>
-   <example>
-    <title>Most basic failover</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (mysqli_connect_errno())
-  /* Of course, your error handling is nicer... */
-  die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-
-/* Connection 1, connection bound SQL user variable, no SELECT thus run on master */
-if (!$mysqli->query("SET @myrole='master'")) {
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-/* Connection 2, first slave */
-$res = $mysqli->query("SELECT VERSION() AS _version");
-/* Hackish manual fail over */
-if (2002 == $mysqli->errno || 2003 == $mysqli->errno || 2004 == $mysqli->errno) {
-  /* Connection 3, first slave connection failed, trying next slave */
-  $res = $mysqli->query("SELECT VERSION() AS _version");
-}
-
-if (!$res) {
-  printf("ERROR, [%d] '%s'\n", $mysqli->errno, $mysqli->error);
-} else {
- /* Error messages are taken from connection 3, thus no error */
- printf("SUCCESS, [%d] '%s'\n", $mysqli->errno, $mysqli->error);
- $row = $res->fetch_assoc();
- $res->close();
- printf("version = %s\n", $row['_version']);
-}
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-&example.outputs.similar;
-    <screen>
-<![CDATA[
-[1045] Access denied for user 'username'@'localhost' (using password: YES)
-PHP Warning:  mysqli::query(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %d
-PHP Warning:  mysqli::query(): [2002] php_network_getaddresses: getaddrinfo failed: Name or service not known (trying to connect via tcp://invalid_host_name:3306) in %s on line %d
-SUCCESS, [0] ''
-version = 5.6.2-m5-log
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   In some cases, it may not be easily possible to retrieve all errors that
-   occur on all network connections through a connection handle. For example, let's assume a
-   connection handle represents a pool of three open connections. One connection
-   to a master and two connections to the slaves. The application changes the
-   current database using the user API call <function>mysqli_select_db</function>,
-   which then calls the mysqlnd library function to change the schemata.
-   mysqlnd_ms monitors the function, and tries to change the current
-   database on all connections to harmonize their state. Now, assume the master succeeds
-   in changing the database, and both slaves fail. Upon the initial error
-   from the first slave, the plugin will set an appropriate error on the
-   connection handle. The same is done when the second slave fails to change the
-   database. The error message from the first slave is lost.
-  </para>
-  <para>
-   Such cases can be debugged by either checking for errors of the type
-   <literal>E_WARNING</literal> (see above) or, if no other option, investigation
-   of the <link linkend="mysqlnd-ms.debugging">mysqlnd_ms debug and trace log</link>.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.transient_errors">
-  <title>Transient errors</title>
-  <para>
-   Some distributed database clusters make use of transient errors. A transient
-   error is a temporary error that is likely to disappear soon. By definition
-   it is safe for a client to ignore a transient error and retry the failed
-   operation on the same database server. The retry is free of side effects.
-   Clients are not forced to abort their work or to fail over to another database
-   server immediately. They may enter a retry loop before to wait for the
-   error to disappear before giving up on the database server.
-   Transient errors can be seen, for example, when using MySQL Cluster. But they
-   are not bound to any specific clustering solution per se.
-  </para>
-  <para>
-   <literal>PECL/mysqlnd_ms</literal> can perform an automatic retry loop in
-   case of a transient error. This increases distribution transparency and thus
-   makes it easier to migrate an application running on a single database
-   server to run on a cluster of database servers without having to change
-   the source of the application.
-  </para>
-  <para>
-   The automatic retry loop will repeat the requested operation up to a user
-   configurable number of times and pause between the attempts for a configurable
-   amount of time. If the error disappears during the loop, the application will
-   never see it. If not, the error is forwarded to the application for handling.
-  </para>
-  <para>
-   In the example below a duplicate key error is provoked to make the plugin
-   retry the failing query two times before the error is passed to the application.
-   Between the two attempts the plugin sleeps for 100 milliseconds.
-  </para>
-  <para>
-   <example>
-    <title>Provoking a transient error</title>
-<programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.collect_statistics=1
-]]>
-    </programlisting>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-       },
-       "transient_error": {
-          "mysql_error_codes": [
-            1062
-          ],
-          "max_retries": 2,
-          "usleep_retry": 100
-       }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Transient error retry loop</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (mysqli_connect_errno())
-  /* Of course, your error handling is nicer... */
-  die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-
-if (!$mysqli->query("DROP TABLE IF EXISTS test") ||
-    !$mysqli->query("CREATE TABLE test(id INT PRIMARY KEY)") ||
-    !$mysqli->query("INSERT INTO test(id) VALUES (1))")) {
-  printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-/* Retry loop is completely transparent. Checking statistics is
- the only way to know about implicit retries */
-$stats = mysqlnd_ms_get_stats();
-printf("Transient error retries before error: %d\n", $stats['transient_error_retries']);
-
-/* Provoking duplicate key error to see statistics change */
-if (!$mysqli->query("INSERT INTO test(id) VALUES (1))")) {
-  printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-$stats = mysqlnd_ms_get_stats();
-printf("Transient error retries after error: %d\n", $stats['transient_error_retries']);
-
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-&example.outputs.similar;
-    <screen>
-<![CDATA[
-Transient error retries before error: 0
-[1062] Duplicate entry '1' for key 'PRIMARY'
-Transient error retries before error: 2
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   Because the execution of the retry loop is transparent from a users point of
-   view, the example checks the
-   <link linkend="function.mysqlnd-ms-get-stats">statistics</link>
-   provided by the plugin to learn about it.
-  </para>
-  <para>
-   As the example shows, the plugin can be instructed to consider any error
-   transient regardless of the database servers error semantics. The only error
-   that a stock MySQL server considers temporary has the error code
-   <constant>1297</constant>. When configuring other error codes but
-   <constant>1297</constant> make sure your configuration reflects
-   the semantics of your clusters error codes.
-  </para>
-  <para>
-   The following mysqlnd C API calls are monitored by the plugin to check
-   for transient errors: <literal>query()</literal>,
-   <literal>change_user()</literal>, <literal>select_db()</literal>,
-   <literal>set_charset()</literal>, <literal>set_server_option()</literal>
-   <literal>prepare()</literal>, <literal>execute()</literal>,
-   <literal>set_autocommit()</literal>,
-   <literal>tx_begin()</literal>, <literal>tx_commit()</literal>,
-   <literal>tx_rollback()</literal>, <literal>tx_commit_or_rollback()</literal>.
-   The corresponding user API calls have similar names.
-  </para>
-  <para>
-   The maximum time the plugin may sleep during the retry loop depends on the
-   function in question. The a retry loop for <literal>query()</literal>,
-   <literal>prepare()</literal> or <literal>execute()</literal> will sleep for
-   up to <literal>max_retries * usleep_retry</literal> milliseconds.
-  </para>
-  <para>
-   However, functions that
-   <link linkend="mysqlnd-ms.pooling">control connection state</link>
-   are dispatched to all connections. The retry loop settings are applied
-   to every  connection on which the command is to be run. Thus, such a function
-   may interrupt program execution for longer than a function that is run
-   on one server only. For example, <literal>set_autocommit()</literal> is
-   dispatched to connections and may sleep up to
-   <literal>(max_retries * usleep_retry) * number_of_open_connections)</literal>
-   milliseconds. Please, keep this in mind when setting long sleep times
-   and large retry numbers. Using the default settings of
-   <literal>max_retries=1</literal>, <literal>usleep_retry=100</literal> and
-   <literal>lazy_connections=1</literal> it is unlikely that you will
-   ever see a delay of more than 1 second.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.failover">
-  <title>Failover</title>
-  <para>
-   By default, connection failover handling is left to the user.
-   The application is responsible
-   for checking return values of the database functions it calls and reacting
-   to possible errors. If, for example, the plugin recognizes a query as a read-only
-   query to be sent to the slave servers, and the slave server selected by the
-   plugin is not available, the plugin will raise an error after not executing
-   the statement.
-  </para>
-  <para>
-   <emphasis role="bold">Default: manual failover</emphasis>
-  </para>
-  <para>
-   It is up to
-   the application to handle the error and, if required, re-issue the query to
-   trigger the selection of another slave server for statement execution.
-   The plugin will make no attempts to failover automatically, because the plugin
-   cannot ensure that an automatic failover will not change the state of
-   the connection. For example, the application may have issued a query
-   which depends on SQL user variables which are bound to a specific connection.
-   Such a query might return incorrect results if the plugin would switch the
-   connection implicitly as part of automatic failover. To ensure correct
-   results, the application must take care of the failover, and rebuild
-   the required connection state. Therefore, by default, no automatic failover
-   is performed by the plugin.
-  </para>
-  <para>
-   A user that does not change the connection state after opening a connection
-   may activate automatic failover. Please note, that automatic failover logic
-   is limited to connection attempts. Automatic failover is not used for already
-   established connections. There is no way to instruct the plugin to attempt
-   failover on a connection that has been connected to MySQL already in the past.
-  </para>
-  <para>
-   <emphasis role="bold">Automatic failover</emphasis>
-  </para>
-  <para>
-   The failover policy is configured in the plugins configuration file, by
-   using the <link linkend="ini.mysqlnd-ms-plugin-config-v2.failover">failover</link>
-   configuration directive.
-  </para>
-  <para>
-   Automatic and silent failover can be enabled through the
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.failover">failover</link>
-   configuration directive. Automatic failover can either be configured to
-   try exactly one master after a slave failure or, alternatively, loop
-   over slaves and masters before returning an error to the user. The number
-   of connection attempts can be limited and failed hosts can be excluded
-   from future load balancing attempts. Limiting the number of retries and
-   remembering failed hosts are considered experimental features, albeit being
-   reasonable stable. Syntax and semantics may change in future versions.
-  </para>
-  <para>
-    Please note, since version 1.5.0 automatic failover is disabled for the
-    duration of a transaction if transaction stickiness is enabled and
-    transaction boundaries have been detected.  The plugin will not switch
-    connections for the duration of a transaction. It will also not perform
-    automatic and silent failover. Instead an error  will be thrown. It is then left
-    to the user to handle the failure of the transaction. Please check, the
-    <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness"><literal>trx_stickiness</literal></link>
-    documentation how to do this.
-  </para>
-  <para>
-   A basic manual failover example is provided within the
-   <link linkend="mysqlnd-ms.errorhandling">error handling</link> section.
-  </para>
-  <para>
-   <emphasis role="bold">Standby servers</emphasis>
-  </para>
-  <para>
-   Using <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-random">weighted load balancing</link>,
-   introduced in PECL/mysqlnd 1.4.0, it is possible
-   to configure standby servers that are sparsely used during normal operations.
-   A standby server that is primarily used as a worst-case standby failover target
-   can be assigned a very low weight/priority in relation to all other
-   servers. As long as all servers are up and running the majority of the workload
-   is assigned to the servers which have hight weight values. Few requests
-   will be directed to the standby system which has a very low weight value.
-  </para>
-  <para>
-   Upon failure of the servers with a high priority, you can still failover to
-   the standby, which has been given a low load balancing priority by assigning a low
-   weight to it. Failover can be some manually or automatically. If done
-   automatically, you may want to combine it with the
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.failover"><literal>remember_failed</literal></link>
-   option.
-  </para>
-  <para>
-   At this point, it is not possible to instruct the load balancer to direct no
-   requests at all to a standby. This may not be much of a limitation given that
-   the highest weight you can assign to a server is 65535. Given two slaves,
-   of which one shall act as a standby and has been assigned a weight of 1,
-   the standby will have to handle far less than one percent of the overall workload.
-  </para>
-  <para>
-   <emphasis role="bold">Failover and primary copy</emphasis>
-  </para>
-  <para>
-   Please note, if using a primary copy cluster, such as MySQL Replication, it is
-   difficult to do connection failover in case of a master failure.
-   At any time there is only one master in the cluster for a given dataset.
-   The master is a single point of failure. If the master fails, clients have no
-   target to fail over write requests. In case of a master outage the database
-   administrator must take care of the situation and update the client
-   configurations, if need be.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.loadbalancing">
-  <title>Load balancing</title>
-  <para>
-   Four load balancing strategies are supported to distribute
-   statements over the configured MySQL slave servers:
-  </para>
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>random</term>
-     <listitem>
-      <para>
-       Chooses a random server whenever a statement is executed.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>random once (default)</term>
-     <listitem>
-      <para>
-       Chooses a random server after the first statement is executed,
-       and uses the decision for the rest of the PHP request.
-      </para>
-      <para>
-       It is the default, and the lowest impact on the connection state.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>round robin</term>
-     <listitem>
-      <para>
-       Iterates over the list of configured servers.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>user-defined via callback</term>
-     <listitem>
-      <para>
-       Is used to implement any other strategy.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-  <para>
-   The load balancing policy is configured in the plugins configuration
-   file using the
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-random">random</link>,
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-roundrobin">roundrobin</link>,
-   and <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-user">user</link>
-   <link linkend="mysqlnd-ms.filter">filters</link>.
-  </para>
-  <para>
-   Servers can be prioritized assigning a weight. A server that has been given
-   a weight of two will get twice as many requests as a server that has been
-   given the default weight of one. Prioritization can be handy in heterogenous
-   environments. For example, you may want to assign more requests to
-   a powerful machine than to a less powerful. Or, you may have configured
-   servers that are close or far from the client, thus expose different latencies.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.rwsplit">
-  <title>Read-write splitting</title>
-  <para>
-   The plugin executes read-only statements on the configured MySQL slaves, and
-   all other queries on the MySQL master. Statements are
-   considered read-only if they either start with <literal>SELECT</literal>,
-   the SQL hint <literal>/*ms=slave*/</literal>, or if a slave had been chosen for
-   running the previous query and the query starts with the SQL hint
-   <literal>/*ms=last_used*/</literal>. In all other cases, the query will
-   be sent to the MySQL replication master server. It is recommended to
-   use the constants <constant>MYSQLND_MS_SLAVE_SWITCH</constant>,
-   <constant>MYSQLND_MS_MASTER_SWITCH</constant> and <constant>MYSQLND_MS_LAST_USED_SWITCH</constant>
-   instead of <literal>/*ms=slave*/</literal>. See also the
-   <link linkend="mysqlnd-ms.constants">list of mysqlnd_ms constants</link>.
-  </para>
-  <para>
-   SQL hints are a special kind of standard compliant SQL comments. The plugin
-   does check every statement for certain SQL hints. The SQL hints are described
-   within the <link linkend="mysqlnd-ms.constants">mysqlnd_ms constants</link>
-   documentation, constants that are exported by the extension. Other systems
-   involved with the statement processing, such as the MySQL server, SQL firewalls,
-   and SQL proxies, are unaffected by the SQL hints, because those systems are
-   designed to ignore SQL comments.
-  </para>
-  <para>
-   The built-in read-write splitter can be replaced by a user-defined filter, see also the
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-user">user filter</link>
-   documentation.
-  </para>
-  <para>
-   A user-defined read-write splitter can request the built-in logic to
-   send a statement to a specific location, by invoking
-   <function>mysqlnd_ms_is_select</function>.
-  </para>
-  <note>
-   <para>
-    The built-in read-write splitter is not aware of multi-statements.
-    Multi-statements are seen as one statement. The splitter will check the
-    beginning of the statement to decide where to run the statement. If, for example,
-    a multi-statement begins with
-    <literal>SELECT 1 FROM DUAL; INSERT INTO test(id) VALUES (1); ...</literal>
-    the plugin will run it on a slave although the statement is not read-only.
-   </para>
-  </note>
- </section>
-
- <section xml:id="mysqlnd-ms.filter">
-  <title>Filter</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    Filters exist as of mysqlnd_ms version 1.1.0-beta.
-   </para>
-  </note>
-  <para>
-   <link linkend="mysqlnd-ms.plugin-ini-json">filters</link>.
-   PHP applications that implement a MySQL replication cluster must first identify
-   a group of servers in the cluster which could execute a statement before
-   the statement is executed by one of the candidates. In other words: a defined
-   list of servers must be filtered until only one server is available.
-  </para>
-  <para>
-   The process of filtering may include using one or more filters, and filters can be
-   chained. And they are executed in the order they are defined in the plugins
-   configuration file.
-  </para>
-  <note>
-   <title>Explanation: comparing filter chaining to pipes</title>
-   <para>
-    The concept of chained filters can be compared to using pipes to connect
-    command line utilities on an operating system command shell. For example,
-    an input stream is passed to a processor, filtered, and then transferred
-    to be output. Then, the output is passed as input to the next command,
-    which is connected to the previous using the pipe operator.
-   </para>
-  </note>
-  <para>
-   Available filters:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Load balancing filters:
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.filters">random</link> and
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.filters">roundrobin</link>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Selection filter:
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.filters">user</link>,
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.filters">user_multi</link>,
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.filters">quality_of_service</link>.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-
-  <para>
-   The <literal>random</literal> filter implements the 'random' and 'random once'
-   load balancing policies. The 'round robin' load balancing can be configured
-   through the <literal>roundrobin</literal> filter. Setting a 'user defined
-   callback' for server selection is possible with the <literal>user</literal>
-   filter. The <literal>quality_of_service</literal> filter finds cluster
-   nodes capable of delivering a certain service, for example, read-your-writes or,
-   not lagging more seconds behind the master than allowed.
-  </para>
-  <para>
-   Filters can accept parameters to change their behavior.
-   The <literal>random</literal> filter accepts an optional
-   <literal>sticky</literal> parameter. If set to true, the filter changes
-   load balancing from random to random once. Random picks a random server
-   every time a statement is to be executed. Random once picks a random
-   server when the first statement is to be executed and uses the same
-   server for the rest of the PHP request.
-  </para>
-  <para>
-   One of the biggest strength of the filter concept is the possibility to
-   chain filters. This strength does not become immediately visible because
-   the <literal>random</literal>, <literal>roundrobin</literal> and
-   <literal>user</literal> filters  are supposed to output no more than one server.
-   If a filter reduces the list of candidates for running a statement to
-   only one server, it  makes little sense to use that one server as
-   input for another filter for  further reduction of the list of candidates.
-  </para>
-  <para>
-   An example filter sequence that will fail:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Statement to be executed: <literal>SELECT 1 FROM DUAL</literal>. Passed to all filters.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      All configured nodes are passed as input to the first filter.
-      Master nodes: <literal>master_0</literal>.
-      Slave nodes:<literal>slave_0</literal>, <literal>slave_1</literal>
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Filter: <literal>random</literal>, argument <literal>sticky=1</literal>.
-      Picks a random slave once to be used for the rest of the PHP request.
-      Output: <literal>slave_0</literal>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Output of <literal>slave_0</literal> and the statement to be executed
-      is passed as input to the next filter. Here: <literal>roundrobin</literal>,
-      server list passed to filter is: <literal>slave_0</literal>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Filter: <literal>roundrobin</literal>. Server list consists of
-      one server only, round robin will always return the same server.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-   If trying to use such a filter sequence,
-   the plugin may emit a warning like <literal>(mysqlnd_ms) Error while creating
-   filter '%s' . Non-multi filter '%s' already created. Stopping in %s on
-   line %d</literal>. Furthermore, an appropriate error on the connection handle
-   may be set.
-  </para>
-  <para>
-   A second type of filter exists: multi filter. A multi filter emits zero, one or multiple
-   servers after processing. The <literal>quality_of_service</literal> filter
-   is an example. If the service quality requested sets an upper limit for the slave
-   lag and more than one slave is lagging behind less than the allowed number of seconds,
-   the filter returns more than one cluster node. A multi filter must be followed by other
-   to further reduce the list of candidates for statement execution until a candidate
-   is found.
-  </para>
-  <para>
-   A filter sequence with the <literal>quality_of_service</literal>
-   multi filter followed by a load balancing filter.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Statement to be executed: <literal>SELECT sum(price) FROM orders WHERE order_id = 1</literal>.
-      Passed to all filters.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      All configured nodes are passed as input to the first filter.
-      Master nodes: <literal>master_0</literal>.
-      Slave nodes: <literal>slave_0</literal>, <literal>slave_1</literal>,
-      <literal>slave_2</literal>, <literal>slave_3</literal>
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Filter: <literal>quality_of_service</literal>, rule set: session_consistency (read-your-writes)
-      Output: <literal>master_0</literal>
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Output of <literal>master_0</literal>
-      and the statement to be executed
-      is passed as input to the next filter, which is <literal>roundrobin</literal>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Filter: <literal>roundrobin</literal>. Server list consists of
-      one server. Round robin selects <literal>master_0</literal>.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   A filter sequence must not end with a multi filter. If trying to use
-   a filter sequence which ends with a multi filter the plugin may emit a
-   warning like <literal>(mysqlnd_ms) Error in configuration. Last filter is multi
-   filter. Needs to be non-multi one. Stopping in %s on line %d</literal>.
-   Furthermore, an appropriate error on the connection handle
-   may be set.
-  </para>
-  <para>
-   <note>
-   <title>Speculation towards the future: MySQL replication filtering</title>
-   <para>
-    In future versions, there may be additional multi filters.
-    For example, there may be a <literal>table</literal>
-    filter to support MySQL replication filtering. This would allow
-    you to define rules for which database or table is to be replicated to which
-    node of a replication cluster. Assume your replication cluster
-    consists of four slaves (<literal>slave_0</literal>, <literal>slave_1</literal>,
-    <literal>slave_2</literal>, <literal>slave_3</literal>) two of which replicate a database named
-    <literal>sales</literal> (<literal>slave_0</literal>, <literal>slave_1</literal>).
-    If the application queries the database <literal>slaves</literal>, the
-    hypothetical <literal>table</literal> filter reduces the list of possible
-    servers to <literal>slave_0</literal> and <literal>slave_1</literal>. Because
-    the output and list of candidates consists of more than one server, it is
-    necessary and possible to add additional filters to the candidate list, for example, using
-    a load balancing filter to identify a server for statement execution.
-   </para>
-  </note>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.qos-consistency">
-  <title>Service level and consistency</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    Service levels have been introduced in mysqlnd_ms version 1.2.0-alpha.
-    <function>mysqlnd_ms_set_qos</function>
-    requires PHP 5.4.0 or newer.
-   </para>
-  </note>
-  <para>
-   The plugin can be used with different kinds of MySQL database clusters.
-   Different clusters can deliver different levels of service to applications.
-   The service levels can be grouped by the data consistency levels that
-   can be achieved. The plugin knows about:
-   <itemizedlist>
-    <listitem>
-     <simpara>eventual consistency</simpara>
-    </listitem>
-    <listitem>
-     <simpara>session consistency</simpara>
-    </listitem>
-    <listitem>
-     <simpara>strong consistency</simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Depending how a cluster is used it may be possible to achieve higher service
-   levels than the default one. For example, a read from an asynchronous
-   MySQL replication slave is eventual consistent. Thus, one may say the default
-   consistency level of a MySQL replication cluster is eventual consistency.
-   However, if the master only is used by a client for reading and writing during a
-   session, session consistency (read your writes) is given. PECL mysqlnd 1.2.0
-   abstracts the details of choosing an appropriate node for any of the above
-   service levels from the user.
-  </para>
-  <para>
-   Service levels can be set through the qualify-of-service filter in the
-   <link linkend="mysqlnd-ms.plugin-ini-json">plugins configuration file</link>
-   and at runtime using the function
-   <function>mysqlnd_ms_set_qos</function>.
-  </para>
-  <para>
-   The plugin defines the different service levels as follows.
-  </para>
-  <para>
-   Eventual consistency is the default service provided by an asynchronous
-   cluster, such as classical MySQL replication. A read operation executed
-   on an arbitrary node may or may not return stale data. The applications
-   view of the data is eventual consistent.
-  </para>
-  <para>
-   Session consistency is given if a client can always read its own writes.
-   An asynchronous MySQL replication cluster can deliver session consistency if clients
-   always use the master after the first write or never query a slave which has
-   not yet replicated the clients write operation.
-  </para>
-  <para>
-   The plugins understanding of strong consistency is that all clients always
-   see the committed writes of all other clients. This is the default when
-   using MySQL Cluster or any other cluster offering
-   synchronous data distribution.
-  </para>
-  <para>
-   <emphasis role="bold">Service level parameters</emphasis>
-  </para>
-  <para>
-   Eventual consistency and session consistency service level accept parameters.
-  </para>
-  <para>
-   Eventual consistency is the service provided by classical MySQL replication.
-   By default, all nodes qualify for read requests. An optional <literal>age</literal>
-   parameter can be given to filter out nodes which lag more than a certain number of
-   seconds behind the master. The plugin is using <literal>SHOW SLAVE STATUS</literal>
-   to measure the lag. Please, see the MySQL reference manual to learn about accuracy and
-   reliability of the <literal>SHOW SLAVE STATUS</literal> command.
-  </para>
-  <para>
-   Session consistency (read your writes) accepts an optional <literal>GTID</literal>
-   parameter to consider reading not only from the master but also from slaves
-   which already have replicated a certain write described by its transaction identifier.
-   This way, when using asynchronous MySQL replication, read requests may be load balanced
-   over slaves while still ensuring session consistency.
-  </para>
-  <para>
-   The latter requires the use of
-   <link linkend="mysqlnd-ms.gtid">client-side global transaction id injection</link>.
-  </para>
-  <para>
-   <emphasis role="bold">Advantages of the new approach</emphasis>
-  </para>
-  <para>
-   The new approach supersedes the use of SQL hints and the configuration option
-   <literal>master_on_write</literal> in some respects. If an application
-   running on top of an asynchronous MySQL replication cluster cannot accept stale
-   data for certain reads, it is easier to tell the plugin to choose appropriate
-   nodes than prefixing all read statements in question with the SQL hint
-   to enforce the use of the master. Furthermore, the plugin may be able to
-   use selected slaves for reading.
-  </para>
-  <para>
-   The <literal>master_on_write</literal> configuration option makes the plugin
-   use the master after the first write (session consistency, read your writes).
-   In some cases, session consistency may not be needed for the rest of the session
-   but only for some, few read operations. Thus, <literal>master_on_write</literal>
-   may result in more read load on the master than necessary. In those cases it
-   is better to request a higher than default service level only for those reads
-   that actually need it. Once the reads are done, the application can return to
-   default service level. Switching between service levels is only possible
-   using <function>mysqlnd_ms_set_qos</function>.
-  </para>
-  <para>
-   <emphasis role="bold">Performance considerations</emphasis>
-  </para>
-  <para>
-   A MySQL replication cluster cannot tell clients which slaves are capable
-   of delivering which level of service. Thus, in some cases,
-   clients need to query the slaves to check their status.
-   PECL mysqlnd_ms transparently runs the necessary SQL in the
-   background. However, this is an expensive and slow operation. SQL statements
-   are run if eventual consistency is combined with an age (slave lag) limit and
-   if session consistency is combined with a global transaction ID.
-  </para>
-  <para>
-   If eventual consistency is combined with an maximum age (slave lag), the plugin
-   selects candidates for statement execution and load balancing for each statement
-   as follows. If the statement is a write all masters are considered as candidates. Slaves
-   are not checked and not considered as candidates. If the statement is a read, the
-   plugin transparently executes <literal>SHOW SLAVE STATUS</literal> on every slaves
-   connection. It will loop over all connections, send the statement and then start
-   checking for results. Usually, this is slightly faster than a loop over all connections
-   in which for every connection a query is send and the plugin waits for its results.
-   A slave is considered a candidate if <literal>SHOW SLAVE STATUS</literal> reports
-   <literal>Slave_IO_Running=Yes</literal>,
-   <literal>Slave_SQL_Running=Yes</literal> and
-   <literal>Seconds_Behind_Master</literal> is less or equal than the allowed maximum age.
-   In case of an SQL error, the plugin emits a warning but does not set an error on
-   the connection. The error is not set to make it possible to use the plugin as a drop-in.
-  </para>
-  <para>
-   If session consistency is combined with a global transaction ID, the plugin executes
-   the SQL statement set with the <literal>fetch_last_gtid</literal> entry of the
-   <literal>global_transaction_id_injection</literal> section from the plugins configuration file.
-   Further details are identical to those described above.
-  </para>
-  <para>
-   In version 1.2.0 no additional optimizations are done for executing background queries.
-   Future versions may contain optimizations, depending on user demand.
-  </para>
-  <para>
-   If no parameters and options are set, no SQL is needed. In that case,
-   the plugin consider all nodes of the type shown below.
-   <itemizedlist>
-    <listitem>
-     <simpara>eventual consistency, no further options set: all masters, all slaves</simpara>
-    </listitem>
-    <listitem>
-     <simpara>session consistency, no further options set: all masters</simpara>
-    </listitem>
-    <listitem>
-     <simpara>strong consistency (no options allowed): all masters</simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-    <emphasis role="bold">Throttling</emphasis>
-  </para>
-  <para>
-   The quality of service filter can be combined with
-   <link linkend="mysqlnd-ms.gtid">Global transaction IDs</link> to
-   throttle clients. Throttling does reduce the write load on the master
-   by slowing down clients. If session consistency is requested and
-   global transactions identifier are used to check the status of
-   a slave, the check can be done in two ways. By default a slave
-   is checked and skipped immediately if it does not match
-   the criteria for session consistency. Alternatively, the
-   plugin can wait for a slave to catch up to the master until
-   session consistency is possible. To enable the throttling,
-   you have to set
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.gtid">wait_for_gtid_timeout</link>
-   configuration option.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.gtid">
-  <title>Global transaction IDs</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    Client side global transaction ID injection exists as of mysqlnd_ms version 1.2.0-alpha.
-    Transaction boundaries are detected by monitoring API calls. This is possible
-    as of PHP 5.4.0. Please, see also <link linkend="mysqlnd-ms.transaction">Transaction handling</link>.
-   </para>
-   <para>
-    As of MySQL 5.6.5-m8 the MySQL server features built-in global transaction identifiers.
-    The MySQL built-in global transaction ID feature is supported by
-    <literal>PECL/mysqlnd_ms</literal> 1.3.0-alpha or
-    later. Neither are client-side transaction boundary monitoring nor any setup
-    activities required if using the server feature.
-   </para>
-   <para>
-     Please note, all MySQL 5.6 production versions do not provide
-     clients with enough information to use GTIDs for enforcing session consistency.
-     In the worst case, the plugin will choose the master only.
-   </para>
-  </note>
-  <para>
-   <emphasis role="bold">Idea and client-side emulation</emphasis>
-  </para>
-  <para>
-   <literal>PECL/mysqlnd_ms</literal> can do client-side transparent global transaction ID injection.
-   In its most basic form, a global transaction identifier is a counter which is
-   incremented for every transaction executed on the master. The counter is held
-   in a table on the master. Slaves replicate the counter table.
-  </para>
-  <para>
-   In case of a master failure a database administrator can easily identify the
-   most recent slave for promoting it as a new master. The most recent slave has
-   the highest transaction identifier.
-  </para>
-  <para>
-   Application developers can ask the plugin for the global transaction identifier
-   (GTID) for their last successful write operation. The plugin will return
-   an identifier that refers to an transaction no older than that of the clients last
-   write operation. Then, the GTID can be passed as a parameter
-   to the quality of service (QoS) filter as an option for session consistency.
-   Session consistency ensures read your writes. The filter ensures that all
-   reads are either directed to a master or a slave which has replicated the write
-   referenced by the GTID.
-  </para>
-  <para>
-   <emphasis role="bold">When injection is done</emphasis>
-  </para>
-  <para>
-   The plugin transparently maintains the GTID table on the master.
-   In autocommit mode the plugin injects an <literal>UPDATE</literal> statement
-   before executing the users statement for every master use. In manual
-   transaction mode, the injection is done before the application calls
-   <literal>commit()</literal> to close a transaction. The configuration option
-   <literal>report_error</literal> of the GTID section in the plugins configuration
-   file is used to control whether a failed injection shall abort the current
-   operation or be ignored silently (default).
-  </para>
-  <para>
-   Please note, the
-   PHP version requirements for
-   <link linkend="mysqlnd-ms.transaction">transaction boundary monitoring</link>
-   and their limits.
-  </para>
-  <para>
-   <emphasis role="bold">Limitations</emphasis>
-  </para>
-  <para>
-   Client-side global transaction ID injection has shortcomings. The potential
-   issues are not specific to <literal>PECL/mysqlnd_ms</literal>
-   but are rather of general nature.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Global transaction ID tables must be deployed on all masters and replicas.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      The GTID can have holes. Only PHP clients using the plugin will
-      maintain the table. Other clients will not.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Client-side transaction boundary detection is based on API calls only.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Client-side transaction boundary detection does not take implicit
-      commit into account. Some MySQL SQL statements cause an implicit
-      commit and cannot be rolled back.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-    <emphasis role="bold">Using server-side global transaction identifier</emphasis>
-  </para>
-  <para>
-   Starting with <literal>PECL/mysqlnd_ms</literal> 1.3.0-alpha
-   the MySQL 5.6.5-m8 or newer built-in global
-   transaction identifier feature is supported. Use of the server feature lifts
-   all of the above listed limitations. Please, see the MySQL Reference Manual
-   for limitations and preconditions for using server built-in global transaction
-   identifiers.
-  </para>
-  <para>
-   Whether to use the client-side emulation or the server built-in
-   functionality is a question not directly related to the plugin, thus it is not
-   discussed in depth. There are no plans to remove the client-side emulation and
-   you can continue to use it, if the server-side solution is no option. This may
-   be the case in heterogenous environments with old MySQL server or, if any of the
-   server-side solution limitations is not acceptable.
-  </para>
-  <para>
-   From an applications perspective there is hardly a difference in using one or the
-   other approach. The following properties differ.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Client-side emulation, as shown in the manual, is using an easy to compare sequence number
-      for global transactions. Multi-master is not handled to keep the manual examples easy.
-     </simpara>
-     <simpara>
-      Server-side built-in feature is using a combination of a server identifier
-      and a sequence number as a global transaction identifier. Comparison cannot
-      use numeric algebra. Instead a SQL function must be used. Please,
-      see the MySQL Reference Manual for details.
-     </simpara>
-     <simpara>
-      Server-side built-in feature of MySQL 5.6 cannot be used to ensure session consistency
-      under all circumstances. Do not use it for the quality-of-service feature. Here is a simple
-      example why it will not give reliable results. There are more edge cases that cannot
-      be covered with limited functionality exported by the server. Currently, clients can
-      ask a MySQL replication master for a list of all executed global transaction IDs only.
-      If a slave is configured not to replicate all transactions, for example, because replication
-      filters are set, then the slave will never show the same set of executed global transaction
-      IDs. Albeit the slave may have replicated a clients writes and it may be a candidate
-      for a consistent read, it will never be considered by the plugin. Upon write the plugin
-      learns from the master that the servers complete transaction history consists of GTID=1..3.
-      There is no way for the plugin to ask for the GTID of the write transaction itself, say GTID=3.
-      Assume that a slave does not replicate the transactions GTID=1..2 but only GTID=3 because of
-      a replication feature. Then, the slaves transaction history is GTID=3. However, the plugin tries
-      to find a node which has a transaction history of GITD=1...3. Albeit the slave has replicated
-      the clients write and session consistency may be achieved when reading from the slave, it
-      will not be considered by the plugin. This is not a fault of the plugin implementation but
-      a feature gap on the server side. Please note, this is a trivial case to illustrate the
-      issue there are other issues. In sum you are asked not to attempt  using MySQL 5.6 built-in GTIDs
-      for enforcing session consistency. Sooner or later the load balancing will stop working properly
-      and the plugin will direct all session consistency requests to the master.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Plugin global transaction ID statistics are only available with client-side
-      emulation because they monitor the emulation.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <note>
-   <title>Global transaction identifiers in distributed systems</title>
-   <para>
-    Global transaction identifiers can serve multiple purposes in the context of distributed
-    systems, such as a database cluster. Global transaction identifiers can
-    be used for, for example, system wide identification of transactions,
-    global ordering of transactions, heartbeat mechanism and
-    for checking the replication status of replicas. <literal>PECL/mysqlnd_ms</literal>, a clientside
-    driver based software, does focus on using GTIDs for tasks that can be
-    handled at the client, such as checking the replication status of replicas
-    for asynchronous replication setups.
-   </para>
-  </note>
- </section>
-
- <section xml:id="mysqlnd-ms.concept_cache">
-  <title>Cache integration</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    The feature requires use of <literal>PECL/mysqlnd_ms</literal> 1.3.0-beta or later,
-    and <literal>PECL/mysqlnd_qc</literal> 1.1.0-alpha or newer.
-    <literal>PECL/mysqlnd_ms</literal> must be
-    compiled to support the feature. PHP 5.4.0 or newer is required.
-   </para>
-  </note>
-  <note>
-   <title>Setup: extension load order</title>
-   <para>
-    <literal>PECL/mysqlnd_ms</literal> must be loaded before
-    <literal>PECL/mysqlnd_qc</literal>, when using shared
-    extensions.
-   </para>
-  </note>
-  <note>
-   <title>Feature stability</title>
-   <para>
-    The cache integration is of beta quality.
-   </para>
-  </note>
-  <note>
-   <title>Suitable MySQL clusters</title>
-   <para>
-    The feature is targeted for use with MySQL Replication (primary copy).
-    Currently, no other kinds of MySQL clusters are supported. Users
-    of such cluster must control PECL/mysqlnd_qc manually if they are
-    interested in client-side query caching.
-   </para>
-  </note>
-  <para>
-   Support for MySQL replication clusters (asynchronous primary copy) is the
-   main focus of <literal>PECL/mysqlnd_ms</literal>.
-   The slaves of a MySQL replication cluster
-   may or may not reflect the latest updates from the master.
-   Slaves are asynchronous and can lag behind the master. A read from a slave
-   is eventual consistent from a cluster-wide perspective.
-  </para>
-  <para>
-   The same level of consistency is offered by a local cache using time-to-live (TTL)
-   invalidation strategy. Current data or stale data may be served. Eventually, data
-   searched for in the cache is not available and the source of the cache needs to
-   be accessed.
-  </para>
-  <para>
-   Given that both a MySQL Replication slave (asynchronous secondary) and a local
-   TTL-driven cache deliver the same level of service it is possible to transparently
-   replace a remote database access with a local cache access to gain better possibility.
-  </para>
-  <para>
-   As of <literal>PECL/mysqlnd_ms</literal> 1.3.0-beta the plugin is
-   capable of transparently controlling  <literal>PECL/mysqlnd_ms</literal> 1.1.0-alpha
-   or newer to cache a read-only query if explicitly allowed by setting an
-   appropriate quality of service through <function>mysqlnd_ms_set_qos</function>. P
-   lease, see the
-   <link linkend="mysqlnd-ms.quickstart.cache">quickstart</link> for a code example.
-   Both plugins must be installed, <literal>PECL/mysqlnd_ms</literal>
-   must be compiled to support the cache feature and PHP 5.4.0 or newer has to be used.
-  </para>
-  <para>
-   Applications have full control of cache usage and can request fresh data
-   at any time, if need be. The cache usage can be enabled and disabled
-   time during the execution of a script. The cache will be used
-   if <function>mysqlnd_ms_set_qos</function> sets the quality of service
-   to eventual consistency and enables cache usage. Cache usage is disabled by
-   requesting higher consistency levels, for example,
-   session consistency (read your writes). Once the quality of service has been
-   relaxed to eventual consistency the cache can be used again.
-  </para>
-  <para>
-   If caching is enabled for a read-only statement, <literal>PECL/mysqlnd_ms</literal> may inject
-   <link linkend="mysqlnd-qc.quickstart.caching">SQL hints to control caching</link>
-   by PECL/mysqlnd_qc. It may modify the SQL statement it got from the application.
-   Subsequent SQL processors are supposed to ignore the SQL hints. A SQL hint is a
-   SQL comment. Comments must not be ignored, for example, by the database server.
-  </para>
-  <para>
-   The TTL of a cache entry is computed on a per statement basis. Applications
-   set an maximum age for the data they want to retrieve using
-   <function>mysqlnd_ms_set_qos</function>. The age sets an approximate upper limit
-   of how many seconds the data returned may lag behind the master.
-  </para>
-  <para>
-   The following logic is used to compute the actual TTL if caching is enabled.
-   The logic takes the estimated slave lag into account for choosing a TTL. If,
-   for example, there are two slaves lagging 5 and 10 seconds behind and the maximum
-   age allowed is 60 seconds, the TTL is set to 50 seconds. Please note, the
-   age setting is no more than an estimated guess.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Check whether the statement is read-only. If not, don't cache.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      If caching is enabled, check the slave lag of all configured slaves.
-      Establish slave connections if none exist so far and lazy connections are
-      used.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Send <literal>SHOW SLAVE STATUS</literal> to all slaves. Do not wait
-      for the first slave to reply before sending to the second slave. Clients
-      often wait long for replies, thus we send out all requests in a burst before
-      fetching in a second stage.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Loop over all slaves. For every slave wait for its reply. Do not start
-      checking another slave before the currently waited for slave has replied.
-      Check for <literal>Slave_IO_Running=Yes</literal> and <literal>Slave_SQL_Running=Yes</literal>.
-      If both conditions hold true, fetch the value of <literal>Seconds_Behind_Master</literal>.
-      In case of any errors or if conditions fail, set an error on the slave connection.
-      Skip any such slave connection for the rest of connection filtering.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Search for the maximum value of <literal>Seconds_Behind_Master</literal> from
-      all slaves that passed the previous conditions. Subtract the value from
-      the maximum age provided by the user with <function>mysqlnd_ms_set_qos</function>.
-      Use the result as a TTL.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      The filtering may sort out all slaves. If so, the maximum age is used as
-      TTL, because the maximum lag found equals zero. It is perfectly valid to
-      sort out all slaves. In the following it is up to subsequent filter
-      to decide what to do. The built-in load balancing filter will pick the
-      master.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Inject the appropriate SQL hints to enable caching by <literal>PECL/mysqlnd_qc</literal>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Proceed with the connection filtering, e.g. apply load balancing rules to
-      pick a slave.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>PECL/mysqlnd_qc</literal> is loaded after
-      <literal>PECL/mysqlnd_ms</literal> by PHP. Thus, it will see
-      all query modifications of <literal>PECL/mysqlnd_ms</literal> and cache
-      the query if instructed to do so.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The algorithm may seem expensive. <literal>SHOW SLAVE STATUS</literal> is a very
-   fast operation. Given a sufficient number of requests and cache hits per second the cost of
-   checking the slaves lag can easily outweigh the costs of the cache decision.
-  </para>
-  <para>
-   Suggestions on a better algorithm are always welcome.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.supportedclusters">
-  <title>Supported clusters</title>
-  <para>
-   Any application using any kind of MySQL cluster is faced with the same tasks:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Identify nodes capable of executing a given statement with
-      the required service level
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-       Load balance requests within the list of candidates
-     </simpara>
-   </listitem>
-   <listitem>
-     <simpara>
-       Automatic fail over within candidates, if needed
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The plugin is optimized for fulfilling these tasks in the context of a classical
-   asynchronous MySQL replication cluster consisting of a single master and
-   many slaves (primary copy).  When using classical, asynchronous MySQL replication
-   all of the above listed tasks need to be mastered at the client side.
-  </para>
-  <para>
-   Other types of MySQL cluster may have lower requirements on the application side.
-   For example, if all nodes in the cluster can answer read and write requests, no
-   read-write splitting needs to be done (multi-master, update-all).
-   If all nodes in the cluster are synchronous, they automatically provide the
-   highest possible quality of service which makes choosing a node easier.
-   In this case, the plugin may serve the application after some reconfiguration
-   to disable certain features, such as built-in read-write splitting.
-  </para>
-  <note>
-   <title>Documentation focus</title>
-   <para>
-    The documentation focusses describing the use of the plugin with classical
-    asynchronous MySQL replication clusters (primary copy). Support for this
-    kind of cluster has been the original development goal. Use of other
-    clusters is briefly described below. Please note, that
-    this is still work in progress.
-   </para>
-  </note>
-  <para>
-    <emphasis role="bold">Primary copy (MySQL Replication)</emphasis>
-  </para>
-  <para>
-   This is the primary use case of the plugin. Follow the hints given in the descriptions of each feature.
-  </para>
-  <para>
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Configure one master and one or more slaves.
-      <link linkend="mysqlnd-ms.plugin-ini-json.server-list-syntax">Server configuration details</link>
-      are given in the setup section.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Use random load balancing policy together with the
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-random">sticky</link> flag.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      If you do not plan to use the
-      <link linkend="mysqlnd-ms.quickstart.qos-consistency">service level</link> API calls,
-      add the <link linkend="ini.mysqlnd-ms-plugin-config-v2.master-on-write">master on write</link>
-      flag.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Please, make yourself aware of the properties of automatic failover before
-      adding a <link linkend="ini.mysqlnd-ms-plugin-config-v2.failover">failover</link> directive.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-       Consider the use of <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">trx_stickiness</link>
-       to execute transactions on the primary only. Please, read carefully how it works
-       before you rely on it.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   <example>
-    <title>Enabling the plugin (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.config_file=/path/to/mysqlnd_ms_plugin.ini
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   <example>
-    <title>Basic plugin configuration (mysqlnd_ms_plugin.ini) for MySQL Replication</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-  "myapp": {
-    "master": {
-      "master_1": {
-        "host": "localhost",
-        "socket": "\/tmp\/mysql57.sock"
-      }
-    },
-    "slave": {
-      "slave_0": {
-        "host": "127.0.0.1",
-        "port": 3308
-      },
-      "slave_1": {
-        "host": "192.168.2.28",
-        "port": 3306
-      }
-    },
-    "filters": {
-      "random": {
-        "sticky": "1"
-      }
-    }
-  }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-    <emphasis role="bold">Primary copy with multi primaries (MMM - MySQL Multi Master)</emphasis>
-  </para>
-  <para>
-   MySQL Replication allows you to create cluster topologies with multiple masters (primaries).
-   Write-write conflicts are not handled by the replication system. This is no update anywhere setup.
-   Thus, data must be partitioned manually and clients must redirected in accordance
-   to the partitioning rules. The recommended setup is equal to the sharding setup below.
-  </para>
-  <para>
-    <emphasis role="bold">Manual sharding, possibly combined with primary copy and multiple primaries</emphasis>
-  </para>
-  <para>
-   Use SQL hints and the node group filter for clusters that use data partitioning
-   but leave query redirection to the client. The example configuration shows a multi master
-   setup with two shards.
-  </para>
-  <para>
-   <example>
-    <title>Multiple primaries - multi master (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.config_file=/path/to/mysqlnd_ms_plugin.ini
-mysqlnd_ms.multi_master=1
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   <example>
-    <title>Primary copy with multiple primaries and paritioning</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-  "myapp": {
-    "master": {
-      "master_1": {
-        "host": "localhost",
-        "socket": "\/tmp\/mysql57.sock"
-      }
-      "master_2": {
-        "host": "192.168.2.27",
-        "socket": "3306"
-      }
-    },
-    "slave": {
-      "slave_1": {
-        "host": "127.0.0.1",
-        "port": 3308
-      },
-      "slave_2": {
-        "host": "192.168.2.28",
-        "port": 3306
-      }
-    },
-    "filters": {
-      "node_groups": {
-        "Partition_A" : {
-          "master": ["master_1"],
-          "slave": ["slave_1"]
-        },
-        "Partition_B" : {
-          "master": ["master_2"],
-          "slave": ["slave_2"]
-        }
-      },
-      "roundrobin": []
-    }
-  }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   The plugin can also be used with a loose collection of unrelated shards. For
-   such a cluster, configure masters only and disable read write splitting. The nodes of
-   such a cluster are called masters in the plugin configuration as they accept
-   both reads and writes for their partition.
-  </para>
-  <para>
-   <emphasis role="bold">Using synchronous update everywhere clusters such as MySQL Cluster</emphasis>
-  </para>
-  <para>
-   MySQL Cluster is a synchronous cluster solution. All cluster nodes accept
-   read and write requests. In the context of the plugin, all nodes shall
-   be considered as masters.
-  </para>
-  <para>
-   Use the load balancing and fail over features only.
-  </para>
-  <para>
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Disable the plugins <link linkend="mysqlnd-ms.rwsplit">built-in read-write splitting</link>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Configure masters only.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Consider random once load balancing strategy, which is the plugins default.
-      If random once is used, only masters are configured and no SQL hints are used
-      to force using a certain node, no connection switches will happen for the
-      duration of a web request. Thus, no special handling is required
-      for transactions. The plugin will pick one master at the beginning of the
-      PHP script and use it until the script terminates.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Do not set the quality of service. All nodes have all the data. This
-      automatically gives you the highest possible service quality (strong consistency).
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Do not enable client-side global transaction injection. It is neither
-      required to help with server-side fail over nor to assist the quality of service
-      filter choosing an appropriate node.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Disabling built-in read-write splitting.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Set
-      <link linkend="mysqlnd-ms.configuration"><literal>mysqlnd_ms.disable_rw_split=1</literal></link>
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Do not use <link linkend="mysqlnd-ms.rwsplit">SQL hints</link>
-      to enforce the use of slaves
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Configure masters only.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Set
-      <link linkend="mysqlnd-ms.configuration"><literal>mysqlnd_ms.multi_master=1</literal>.</link>
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>Do not configure any slaves.</simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Set
-      <literal><link linkend="mysqlnd-ms.plugin-ini-json">failover=loop_before_master</link></literal>
-      in the plugins configuration file to avoid warnings about the empty slave list
-      and to make the failover logic loop over all configured masters before emitting an error.
-     </simpara>
-     <simpara>
-      Please, note the warnings about automatic failover given in the previous sections.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   <example>
-    <title>Multiple primaries - multi master (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.config_file=/path/to/mysqlnd_ms_plugin.ini
-mysqlnd_ms.multi_master=1
-mysqlnd_ms.disable_rw_split=1
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   <example>
-    <title>Synchronous update anywhere cluster</title>
-    <programlisting role="ini">
-<![CDATA[
-
-  "myapp": {
-    "master": {
-      "master_1": {
-        "host": "localhost",
-        "socket": "\/tmp\/mysql57.sock"
-      },
-      "master_2": {
-        "host": "192.168.2.28",
-        "port": 3306
-      }
-    },
-    "slave": {
-    },
-    "filters": {
-      "roundrobin": {
-      }
-    },
-    "failover": {
-      "strategy": "loop_before_master",
-      "remember_failed": true
-    }
-  }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   If running an update everywhere cluster that has no built-in partitioning to
-   avoid hot spots and high collision rates, consider using the node groups filter
-   to keep updates on a frequently accessed table on one of the nodes. This may
-   help to reduce collision rates and thus improve performance.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.concept_xa_trx">
-  <title>XA/Distributed transactions</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    XA related functions have been introduced in <literal>PECL/mysqlnd_ms</literal> version 1.6.0-alpha.
-   </para>
-  </note>
-  <note>
-   <title>Early adaptors wanted</title>
-   <para>
-    The feature is currently under development. There may be issues and/or
-    feature limitations. Do not use in production environments, although
-    early lab tests indicate reasonable quality.
-   </para>
-   <para>
-     Please, contact the development team if you are interested in this feature.
-     We are looking for real life feedback to complement the feature.
-   </para>
-   <para>
-     Below is a list of some feature restrictions.
-     <itemizedlist>
-      <listitem>
-       <para>The feature is not yet compatible with the MySQL Fabric support . This limitation is soon to be lifted.</para>
-       <para>XA transaction identifier are currently restricted to numbers. This limitation will be lifted upon request, it is a simplification used during the initial implementation.</para>
-      </listitem>
-    </itemizedlist>
-   </para>
-  </note>
-  <note>
-   <title>MySQL server restrictions</title>
-   <para>
-    The XA support by the MySQL server has some restrictions. Most noteably,
-    the servers binary log may lack changes made by XA transactions in case
-    of certain errors. Please, see the MySQL manual for details.
-   </para>
-  </note>
-  <para>
-   XA/Distributed transactions can spawn multiple MySQL servers.
-   Thus, they may seem like a perfect
-   tool for sharded MySQL clusters, for example, clusters managed with MySQL Fabric.
-   <literal>PECL/mysqlnd_ms</literal> hides most of the SQL commands
-   to control XA transactions and performs automatic administrative tasks in cases
-   of errors, to provide the user with a comprehensive API. Users should
-   setup the plugin carefully and be well aware of server restrictions prior
-   to using the feature.
-  </para>
-  <para>
-   <example>
-    <title>General pattern for XA transactions</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-
-/* BEGIN */
-mysqlnd_ms_xa_begin($mysqli, 1 /* xa id */);
-
-/* run queries on various servers */
-$mysqli->query("UPDATE some_table SET col_a = 1");
-...
-
-/* COMMIT */
-mysqlnd_ms_xa_commit($link, 1);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   XA transactions use the two-phase commit protocol. The two-phase commit
-   protocol is a blocking protocol. During the first phase participating servers
-   begin a transaction and the client carries out its work. This phase is followed
-   by a second voting phase. During voting, the servers first make a firm promise
-   that they are ready to commit the work even in case of their possible unexpected
-   failure. Should a server crash in this phase, it will still recall the aborted
-   transaction after recover and wait for the client to decide on whether
-   it shall be committed or rolled back.
-  </para>
-  <para>
-   Should a client that has initiated a global transaction crash after all the
-   participating servers gave their promise to be ready to commit, then the servers
-   must wait for a decision. The servers are not allowed to unilaterally decide on the
-   transaction.
-  </para>
-  <para>
-   A client crash or disconnect from a participant, a server crash or server error
-   during the fist phase of the protocol is uncritical. In most cases, the server
-   will forget about the XA transaction and its work is rolled back. Additionally,
-   the plugin tries to reach out to as many participants as it can to instruct
-   the server to roll back the work immediately. It is not possible to disable this implicit
-   rollback carried out by <literal>PECL/mysqlnd_ms</literal> in case of errors
-   during the first phase of the protocol. This design decision has been made to
-   keep the implementation simple.
-  </para>
-  <para>
-    An error during the second phase of the commit protocol can develop into a
-    more severe situation. The servers will not forget about
-    prepared but unfinished transactions in all cases. The plugin will not
-    attempt to solve these cases immediately but waits for optional background
-    garbage collection to ensure progress of the commit protocol. It is assumed
-    that a solution will take significant time as it may include waiting
-    for a participating server to recover from a crash. This time span may
-    be longer than a developer and end user expects when trying to commit a
-    global transaction with <function>mysqlnd_ms_xa_commit</function>. Thus,
-    the function returns with the unfinished global transaction still
-    requiring attention. Please, be warned that at this point, it is not yet
-    clear whether the global transaction will be committed or rolled back later on.
-  </para>
-  <para>
-    Errors during the second phase can be ignored, handled by yourself or solved
-    by the build-int garbage collection logic. Ignoring them is not recommended
-    as you may experience unfinished global transactions on your servers that block
-    resources virtually indefinitely. Handling the errors requires knowing the
-    participants, checking their state and issuing appropriate SQL commands on them.
-    There are no user API calls to expose this very information. You will have to
-    configure a state store and make the plugin record its actions in it to receive
-    the desired facts.
-  </para>
-  <para>
-    Please, see the
-    <link linkend="mysqlnd-ms.quickstart.xa_transactions">quickstart</link> and
-    related <link linkend="ini.mysqlnd-ms-plugin-config-v2.xa.state-store">plugin
-    configuration file settings</link> for an example how to configure a state.
-    In addition to configuring a state store, you have to setup some SQL tables.
-    The table definitions are given in the description of the plugin configuration
-    settings.
-  </para>
-  <para>
-   Setting up and configuring a state store is also a precondition for using the
-   built-in garbage collection for XA transactions that fail during the
-   second commit phase. Recording information about ongoing XA transactions is
-   an unavoidable extra task. The extra task consists of updating the state
-   store after each and every operation that changes the state of the global transaction
-   itself (started, committed, rolled back, errors and aborts), the addition of
-   participants (host, optionally user and password required to connect) and any
-   changes to a participants state. Please note, depending on configuration and your
-   security policies, these recordings may be considered sensitive.
-   It is therefore recommended to restrict access to the state store. Unless the
-   state store itself becomes overloaded, writing the state information may contribute
-   noteworthy to the runtime but should overall be only a minor factor.
-  </para>
-  <para>
-   It is possible that the effort it takes to implement your own routines for handling
-   XA transactions that failed during the second commit phase exceeds the benefits
-   of using the XA feature of <literal>PECL/mysqlnd_ms</literal> in the first place.
-   Thus, the manual focussed on using the built-on garbage collection only.
-  </para>
-  <para>
-   Garbage collection can be triggered manually or automatically in the background.
-   You may want to call <function>mysqlnd_ms_xa_gc</function> immediately after
-   a commit failure to attempt to solve any failed but still open global transactions
-   as soon as possible. You may also decide to disable the automatic background
-   garbage collection, implement your own rule set for invoking the built-in
-   garbage collection and trigger it when desired.
-  </para>
-  <para>
-   By default the plugin will start the garbage collection with a certain probability
-   in the extensions internal <literal>RSHUTDOWN</literal> method. The request
-   shutdown is called after your script finished. Whether the garbage collection
-   will be triggered is determined by computing a random value between
-   <literal>1...1000</literal> and comparing it with the configuration setting
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.xa.gc"><literal>probability</literal></link>
-   (default: 5). If the setting is
-   greater or equal to the random value, the garbage collection will be triggered.
-  </para>
-  <para>
-    Once started, the garbage collection acts upon up to
-    <literal>max_transactions_per_run</literal> (default: 100) global transactions
-    recorded. Records include successfully finished but also unfinished XA
-    transactions. Records for successful transactions are removed and unfinished
-    transactions are attempted to be solved. There are no statistics that help
-    you finding the right balance between keeping garbage collection runs short
-    by limiting the number of transactions considered per run and preventing the garbage
-    collection to fall behind, resulting in many records.
-  </para>
-  <para>
-    For each failed XA transaction the garbage collection makes
-    <literal>max_retries</literal> (default: 5) attempts to finish it. After that
-    <literal>PECL/mysqlnd_ms</literal> gives up. There are two possible reasons for this. Either
-    a participating server crashed and has not become accessible again within
-    <literal>max_retries</literal> invocations of the garbage collection, or there
-    is a situation that the built-in garbage collection cannot cope with. Likely, the
-    latter would be considered a bug. However, you can manually force more
-    garbage collection runs calling <function>mysqlnd_ms_xa_gc</function> with the
-    appropriate parameter set. Should even those function runs fail to solve
-    the situation, then the problem must be solved by an operator.
-  </para>
-  <para>
-    The function <function>mysqlnd_ms_get_stats</function>
-    provides some statistics on how many XA transactions have been started,
-    committed, failed or rolled back.
-  </para>
-
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/configure.xml b/reference/mysqlnd_ms/configure.xml
deleted file mode 100644
index 06a73b3730..0000000000
--- a/reference/mysqlnd_ms/configure.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-ms.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.moved;
- </para>
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mysqlnd_ms">&url.pecl.package;mysqlnd_ms</link>
- </para>
-
- <para>
-  &pecl.windows.download;
- </para>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/constants.xml b/reference/mysqlnd_ms/constants.xml
deleted file mode 100644
index fa77dbc60d..0000000000
--- a/reference/mysqlnd_ms/constants.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mysqlnd-ms.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
-
- <para>
-  <emphasis role="bold">SQL hint related</emphasis>
- </para>
- <para>
-  <example>
-   <title>Example demonstrating the usage of mysqlnd_ms constants</title>
-   <para>
-    The mysqlnd replication and load balancing plugin (<literal>mysqlnd_ms</literal>)
-    performs read/write splitting. This directs write queries to a MySQL
-    master server, and read-only queries to the MySQL slave servers.
-    The plugin has a built-in read/write split logic.
-    All queries which start with <literal>SELECT</literal> are considered read-only
-    queries, which are then sent to a MySQL slave server that is listed in
-    the plugin configuration file. All other queries are directed to the
-    MySQL master server that is also specified in the plugin configuration file.
-   </para>
-   <para>
-    User supplied SQL hints can be used to overrule automatic read/write splitting,
-    to gain full control on the process. SQL hints are standards compliant
-    SQL comments. The plugin will scan the beginning of a query string for
-    an SQL comment for certain commands, which then control query redirection.
-    Other systems involved in the query processing are unaffected by the
-    SQL hints because other systems will ignore the SQL comments.
-   </para>
-   <para>
-    The plugin supports three SQL hints to direct queries to either the MySQL slave
-    servers, the MySQL master server, or the last used MySQL server. SQL hints
-    must be placed at the beginning of a query to be recognized by the plugin.
-   </para>
-   <para>
-    For better portability, it is recommended to use the string constants
-    <constant>MYSQLND_MS_MASTER_SWITCH</constant>,
-    <constant>MYSQLND_MS_SLAVE_SWITCH</constant> and
-    <constant>MYSQLND_MS_LAST_USED_SWITCH</constant> instead of their literal
-    values.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Use constants for maximum portability */
-$master_query = "/*" . MYSQLND_MS_MASTER_SWITCH . "*/SELECT id FROM test";
-
-/* Valid but less portable: using literal instead of constant */
-$slave_query = "/*ms=slave*/SHOW TABLES";
-
-printf("master_query = '%s'\n", $master_query);
-printf("slave_query = '%s'\n", $slave_query);
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-master_query = /*ms=master*/SELECT id FROM test
-slave_query = /*ms=slave*/SHOW TABLES
-]]>
-   </screen>
-  </example>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-ms-master-switch">
-    <term>
-     <constant>MYSQLND_MS_MASTER_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SQL hint used to send a query to the MySQL replication master server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-slave-switch">
-    <term>
-     <constant>MYSQLND_MS_SLAVE_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SQL hint used to send a query to one of the MySQL replication slave servers.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-last-used-switch">
-    <term>
-     <constant>MYSQLND_MS_LAST_USED_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SQL hint used to send a query to the last used MySQL server. The last
-      used MySQL server can either be a master or a slave server in a
-      MySQL replication setup.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <function>mysqlnd_ms_query_is_select</function>
-  related
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-ms-query-use-master">
-    <term>
-     <constant>MYSQLND_MS_QUERY_USE_MASTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     If <function>mysqlnd_ms_is_select</function> returns
-     <constant>MYSQLND_MS_QUERY_USE_MASTER</constant> for a given query, the
-     built-in read/write split mechanism recommends sending the query to
-     a MySQL replication master server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-query-use-slave">
-    <term>
-     <constant>MYSQLND_MS_QUERY_USE_SLAVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      If <function>mysqlnd_ms_is_select</function> returns
-      <constant>MYSQLND_MS_QUERY_USE_SLAVE</constant> for a given query, the
-      built-in read/write split mechanism recommends sending the query to
-      a MySQL replication slave server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-query-use-last-used">
-    <term>
-     <constant>MYSQLND_MS_QUERY_USE_LAST_USED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      If <function>mysqlnd_ms_is_select</function> returns
-      <constant>MYSQLND_MS_QUERY_USE_LAST_USED</constant> for a given query, the
-      built-in read/write split mechanism recommends sending the query to
-      the last used server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <function>mysqlnd_ms_set_qos</function>,
-  quality of service filter and service level related
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-ms-qos-consistency-eventual">
-    <term>
-     <constant>MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use to request the service level eventual consistency from the
-      <function>mysqlnd_ms_set_qos</function>. Eventual consistency is the
-      default quality of service when reading from an asynchronous MySQL
-      replication slave. Data returned in this service level may or may not
-      be stale, depending on whether the selected slaves happen to have replicated
-      the latest changes from the MySQL replication master or not.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-qos-consistency-session">
-    <term>
-     <constant>MYSQLND_MS_QOS_CONSISTENCY_SESSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use to request the service level session consistency from the
-      <function>mysqlnd_ms_set_qos</function>. Session consistency
-      is defined as read your writes. The client is guaranteed to see his
-      latest changes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-qos-consistency-strong">
-    <term>
-     <constant>MYSQLND_MS_QOS_CONSISTENCY_STRONG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use to request the service level strong consistency from the
-      <function>mysqlnd_ms_set_qos</function>. Strong consistency
-      is used to ensure all clients see each others changes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-qos-option-gtid">
-    <term>
-     <constant>MYSQLND_MS_QOS_OPTION_GTID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Used as a service level option with
-      <function>mysqlnd_ms_set_qos</function> to parameterize session
-      consistency.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-qos-option-age">
-    <term>
-     <constant>MYSQLND_MS_QOS_OPTION_AGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Used as a service level option with
-      <function>mysqlnd_ms_set_qos</function> to parameterize eventual
-      consistency.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <emphasis role="bold">Other</emphasis>
- </para>
- <para>
-  The plugins version number can be obtained using
-  <constant>MYSQLND_MS_VERSION</constant> or
-  <constant>MYSQLND_MS_VERSION_ID</constant>.
-  <constant>MYSQLND_MS_VERSION</constant>
-  is the string representation of the numerical version number
-  <constant>MYSQLND_MS_VERSION_ID</constant>, which is an integer such as 10000.
-  Developers can calculate the version number as follows.
- </para>
- <para>
-   <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Version (part)</entry>
-      <entry>Example</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Major*10000</entry>
-      <entry>1*10000 = 10000</entry>
-     </row>
-     <row>
-      <entry>Minor*100</entry>
-      <entry>0*100 = 0</entry>
-     </row>
-     <row>
-      <entry>Patch</entry>
-      <entry>0 = 0</entry>
-     </row>
-     <row>
-      <entry>MYSQLND_MS_VERSION_ID</entry>
-      <entry>10000</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-ms-version">
-    <term>
-     <constant>MYSQLND_MS_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version string, for example, <quote>1.0.0-prototype</quote>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-ms-version-id">
-    <term>
-     <constant>MYSQLND_MS_VERSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version number, for example, 10000.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-dump-servers.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-dump-servers.xml
deleted file mode 100644
index 0fe21e2629..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-dump-servers.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-dump-servers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_dump_servers</refname>
-  <refpurpose>Returns a list of currently configured servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_ms_dump_servers</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns a list of currently configured servers.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &false; on error. Otherwise, returns an array with two entries
-   <literal>masters</literal> and <literal>slaves</literal> each of which contains
-   an array listing all corresponding servers.
-  </para>
-  <para>
-   The function can be used to check and debug the list of servers currently
-   used by the plugin. It is mostly useful when the list of servers changes at
-   runtime, for example, when using MySQL Fabric.
-  </para>
-  <para>
-   <literal>masters</literal> and <literal>slaves</literal> server entries
-  </para>
-  <informaltable>
-   <tgroup cols="3">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="7*"/>
-    <colspec colwidth="2*"/>
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Description</entry>
-      <entry>Version</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>name_from_config</literal>
-      </entry>
-      <entry>
-       <para>
-         Server entry name from config, if appliciable. NULL if no
-         configuration name is available.
-       </para>
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>hostname</literal>
-      </entry>
-      <entry>
-       <para>
-         Host name of the server.
-       </para>
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>user</literal>
-      </entry>
-      <entry>
-       <para>
-         Database user used to authenticate against the server.
-       </para>
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>port</literal>
-      </entry>
-      <entry>
-       <para>
-         TCP/IP port of the server.
-       </para>
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-       <row>
-      <entry>
-       <literal>socket</literal>
-      </entry>
-      <entry>
-       <para>
-         Unix domain socket of the server.
-       </para>
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_dump_servers</function> requires
-    PECL mysqlnd_ms &gt;> 1.6.0.
-   </para>
-  </note>
- </refsect1>
-
-  <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_dump_servers</function> example</title>
-     <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master1": {
-                "host":"master1_host",
-                "port":"master1_port",
-                "socket":"master1_socket",
-                "db":"master1_db",
-                "user":"master1_user",
-                "password":"master1_pw"
-            }
-        },
-        "slave": {
-             "slave_0": {
-                 "host":"slave0_host",
-                 "port":"slave0_port",
-                 "socket":"slave0_socket",
-                 "db":"slave0_db",
-                 "user":"slave0_user",
-                 "password":"slave0_pw"
-             },
-             "slave_1": {
-                 "host":"slave1_host"
-             }
-        }
-    }
-}
-]]>
-    </programlisting>
- <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysqli_connect("myapp", "global_user", "global_pass", "global_db", 1234, "global_socket");
-var_dump(mysqlnd_ms_dump_servers($link);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["masters"]=>
-  array(1) {
-    [0]=>
-    array(5) {
-      ["name_from_config"]=>
-      string(7) "master1"
-      ["hostname"]=>
-      string(12) "master1_host"
-      ["user"]=>
-      string(12) "master1_user"
-      ["port"]=>
-      int(3306)
-      ["socket"]=>
-      string(14) "master1_socket"
-    }
-  }
-  ["slaves"]=>
-  array(2) {
-    [0]=>
-    array(5) {
-      ["name_from_config"]=>
-      string(7) "slave_0"
-      ["hostname"]=>
-      string(11) "slave0_host"
-      ["user"]=>
-      string(11) "slave0_user"
-      ["port"]=>
-      int(3306)
-      ["socket"]=>
-      string(13) "slave0_socket"
-    }
-    [1]=>
-    array(5) {
-      ["name_from_config"]=>
-      string(7) "slave_1"
-      ["hostname"]=>
-      string(11) "slave1_host"
-      ["user"]=>
-      string(12) "gloabal_user"
-      ["port"]=>
-      int(1234)
-      ["socket"]=>
-      string(13) "global_socket"
-    }
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-fabric-select-shard.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-fabric-select-shard.xml
deleted file mode 100644
index 8bdf8c6e91..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-fabric-select-shard.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-fabric-select-shard" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_fabric_select_shard</refname>
-  <refpurpose>Switch to shard</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_ms_fabric_select_shard</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>table_name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>shard_key</parameter></methodparam>
-  </methodsynopsis>
-
-  &warn.undocumented.func;
-
-  <para>
-    MySQL Fabric related.
-  </para>
-  <para>
-    Switch the connection to the shards responsible for the
-    given table name and shard key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <para>
-      The table name to ask Fabric about.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>shard_key</parameter></term>
-    <listitem>
-     <para>
-      The shard key to ask Fabric about.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &false; on error. Otherwise, &true;
-  </para>
- </refsect1>
-
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_fabric_select_shard</function> requires
-    PECL mysqlnd_ms &gt;> 1.6.0.
-   </para>
-  </note>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-get-last-gtid.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-get-last-gtid.xml
deleted file mode 100644
index 5bf9bf9588..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-get-last-gtid.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-get-last-gtid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_get_last_gtid</refname>
-  <refpurpose>Returns the latest global transaction ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type>
-   <methodname>mysqlnd_ms_get_last_gtid</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a global transaction identifier which belongs to a write operation no
-   older than the last write performed by the client. It is not guaranteed that
-   the global transaction identifier is identical to that one created for the
-   last write transaction performed by the client.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A PECL/mysqlnd_ms connection handle to a MySQL server of the type
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link>, <link linkend="book.mysqli">mysqli</link>> or
-      <link linkend="book.mysql">ext/mysql</link>.
-      The connection handle is obtained when opening a connection with
-      a host name that matches a mysqlnd_ms configuration file
-      entry using any of the above three MySQL driver extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a global transaction ID (GTID) on success.
-   Otherwise, returns &false;.
-  </para>
-  <para>
-   The function <function>mysqlnd_ms_get_last_gtid</function> returns the
-   GTID obtained when executing the SQL statement from
-   the <literal>fetch_last_gtid</literal> entry of the
-   <literal>global_transaction_id_injection</literal> section from
-   the plugins configuration file.
-  </para>
-  <para>
-   The function may be called after the GTID has been incremented.
-  </para>
- </refsect1>
-
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_get_last_gtid</function> requires
-    PHP &gt;= 5.4.0 and PECL mysqlnd_ms &gt;= 1.2.0. Internally, it is using
-    a <literal>mysqlnd</literal> library C functionality not available with PHP 5.3.
-   </para>
-   <para>
-     Please note, all MySQL 5.6 production versions do not provide
-     clients with enough information to use GTIDs for enforcing session consistency.
-     In the worst case, the plugin will choose the master only.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_get_last_gtid</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Open mysqlnd_ms connection using mysqli, PDO_MySQL or mysql extension */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli)
-  /* Of course, your error handling is nicer... */
-  die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("DROP TABLE IF EXISTS test"))
-  die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-
-printf("GTID after transaction %s\n", mysqlnd_ms_get_last_gtid($mysqli));
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("CREATE TABLE test(id INT)"))
-  die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-
-printf("GTID after transaction %s\n", mysqlnd_ms_get_last_gtid($mysqli));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.gtid">Global Transaction IDs</link>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-get-last-used-connection.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-get-last-used-connection.xml
deleted file mode 100644
index e48104432c..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-get-last-used-connection.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-get-last-used-connection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_get_last_used_connection</refname>
-  <refpurpose>Returns an array which describes the last used connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_ms_get_last_used_connection</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an array which describes the last used connection from the plugins
-   connection pool currently pointed to by the user connection handle. If using the
-   plugin, a user connection handle represents a pool of database connections.
-   It is not possible to tell from the user connection handles properties to which
-   database server from the pool the user connection handle points.
-  </para>
-  <para>
-   The function can be used to debug or monitor PECL mysqlnd_ms.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &false; on error. Otherwise, an
-   array which describes the connection used to
-   execute the last statement on.
-  </para>
-  <para>
-   Array which describes the connection.
-  </para>
-  <informaltable>
-   <tgroup cols="3">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="7*"/>
-    <colspec colwidth="2*"/>
-    <thead>
-     <row>
-      <entry>Property</entry>
-      <entry>Description</entry>
-      <entry>Version</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>scheme</literal>
-      </entry>
-      <entry>
-       Connection scheme. Either <literal>tcp://host:port</literal>
-       or <literal>unix://host:socket</literal>. If you want to
-       distinguish connections from each other use a combination
-       of <literal>scheme</literal> and <literal>thread_id</literal> as a unique
-       key. Neither <literal>scheme</literal> nor <literal>thread_id</literal>
-       alone are sufficient to distinguish two connections from each other.
-       Two servers may assign the same <literal>thread_id</literal> to two
-       different connections. Thus, connections in the pool may have the same
-       <literal>thread_id</literal>. Also, do not rely on uniqueness of
-       <literal>scheme</literal> in a pool. Your QA engineers may use the
-       same MySQL server instance for two distinct logical roles and add it
-       multiple times to the pool. This hack is used, for example,
-       in the test suite.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>host</literal>
-      </entry>
-      <entry>
-       Database server host used with the connection.
-       The host is only set with TCP/IP connections.
-       It is empty with Unix domain or Windows named pipe connections,
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>host_info</literal>
-      </entry>
-      <entry>
-        A character string representing the server hostname and the connection type.
-      </entry>
-      <entry>Since 1.1.2.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>port</literal>
-      </entry>
-      <entry>
-       Database server port used with the connection.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>socket_or_pipe</literal>
-      </entry>
-      <entry>
-       Unix domain socket or Windows named pipe used with the connection.
-       The value is empty for TCP/IP connections.
-      </entry>
-      <entry>Since 1.1.2.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>thread_id</literal>
-      </entry>
-      <entry>
-       Connection thread id.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>last_message</literal>
-      </entry>
-      <entry>
-       Info message obtained from the
-       MySQL C API function mysql_info(). Please, see
-       <function>mysqli_info</function> for
-       a description.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>errno</literal>
-      </entry>
-      <entry>
-       Error code.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>error</literal>
-      </entry>
-      <entry>
-       Error message.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>sqlstate</literal>
-      </entry>
-      <entry>
-       Error SQLstate code.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_get_last_used_connection</function> requires
-    PHP &gt;= 5.4.0 and PECL mysqlnd_ms &gt;> 1.1.0. Internally, it is using
-    a <literal>mysqlnd</literal> library C call not available with PHP 5.3.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-  The example assumes that <literal>myapp</literal> refers to a
-  plugin configuration file section and represents a connection pool.
-  </para>
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_get_last_used_connection</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$link = new mysqli("myapp", "user", "password", "database");
-$res = $link->query("SELECT 1 FROM DUAL");
-var_dump(mysqlnd_ms_get_last_used_connection($link));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(10) {
-  ["scheme"]=>
-  string(22) "unix:///tmp/mysql.sock"
-  ["host_info"]=>
-  string(25) "Localhost via UNIX socket"
-  ["host"]=>
-  string(0) ""
-  ["port"]=>
-  int(3306)
-  ["socket_or_pipe"]=>
-  string(15) "/tmp/mysql.sock"
-  ["thread_id"]=>
-  int(46253)
-  ["last_message"]=>
-  string(0) ""
-  ["errno"]=>
-  int(0)
-  ["error"]=>
-  string(0) ""
-  ["sqlstate"]=>
-  string(5) "00000"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-get-stats.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-get-stats.xml
deleted file mode 100644
index 18f0185a59..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-get-stats.xml
+++ /dev/null
@@ -1,792 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-get-stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_get_stats</refname>
-  <refpurpose>Returns query distribution and connection statistics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_ms_get_stats</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of statistics collected by the replication
-   and load balancing plugin.
-  </para>
-  <para>
-   The PHP configuration setting
-   <literal><link linkend="ini.mysqlnd-ms.collect-statistics">mysqlnd_ms.collect_statistics</link></literal>
-   controls the collection of statistics. The collection of statistics
-   is disabled by default for performance reasons.
-  </para>
-  <para>
-   The scope of the statistics is the
-   <literal>PHP</literal> process.
-   Depending on your deployment model a
-   <literal>PHP</literal> process may handle one or multiple requests.
-  </para>
-  <para>
-   Statistics are aggregated for all connections and all storage handler. It is not possible
-   to tell how much queries originating from
-   <literal>mysqli</literal>,
-   <literal>PDO_MySQL</literal> or
-   <literal>mysql</literal> API calls have
-   contributed to the aggregated data values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-<refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &null; if
-   the PHP configuration directive
-   <link linkend="ini.mysqlnd-ms.enable"><literal>mysqlnd_ms.enable</literal></link>
-   has disabled the plugin. Otherwise, returns array of statistics.
-  </para>
-  <para>
-   Array of statistics
-  </para>
-  <informaltable>
-   <tgroup cols="3">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="7*"/>
-    <colspec colwidth="2*"/>
-    <thead>
-     <row>
-      <entry>Statistic</entry>
-      <entry>Description</entry>
-      <entry>Version</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>use_slave</literal>
-      </entry>
-      <entry>
-       <para>
-         The semantics of this statistic has changed between 1.0.1 - 1.1.0.
-       </para>
-       <para>
-         The meaning for version 1.0.1 is as follows.
-         Number of statements considered as read-only by the built-in query analyzer.
-         Neither statements which begin with a SQL hint to force
-         use of slave nor statements directed to a slave by an user-defined
-         callback are included. The total number of statements sent to the slaves is
-         <literal>use_slave</literal> + <literal>use_slave_sql_hint</literal> +
-         <literal>use_slave_callback</literal>.
-        </para>
-        <para>
-         PECL/mysqlnd_ms 1.1.0 introduces a new concept of chained filters. The
-         statistics is now set by the internal load balancing filter. With
-         version 1.1.0 the load balancing filter is always the last in the
-         filter chain, if used. In future versions a load balancing filter may be
-         followed by other filters causing another change in the meaning of
-         the statistic. If, in the future, a load balancing filter is followed
-         by another filter it is no longer guaranteed that the statement, which
-         increments <literal>use_slave</literal>, will be executed on the slaves.
-        </para>
-        <para>
-         The meaning for version 1.1.0 is as follows. Number of statements
-         sent to the slaves. Statements directed to a slave by the user filter
-         (an user-defined callback) are not included. The latter are counted by
-         <literal>use_slave_callback</literal>.
-        </para>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_master</literal>
-      </entry>
-      <entry>
-       <para>
-         The semantics of this statistic has changed between 1.0.1 - 1.1.0.
-       </para>
-       <para>
-        The meaning for version 1.0.1 is as follows.
-        Number of statements not considered as read-only by the built-in query analyzer.
-        Neither statements which begin with a SQL hint to force
-        use of master nor statements directed to a master by an user-defined
-        callback are included. The total number of statements sent to the master is
-        <literal>use_master</literal> + <literal>use_master_sql_hint</literal> +
-        <literal>use_master_callback</literal>.
-       </para>
-       <para>
-         PECL/mysqlnd_ms 1.1.0 introduces a new concept of chained filters. The
-         statictics is now set by the internal load balancing filter. With
-         version 1.1.0 the load balancing filter is always the last in the
-         filter chain, if used. In future versions a load balancing filter may be
-         followed by other filters causing another change in the meaning of
-         the statistic. If, in the future, a load balancing filter is followed
-         by another filter it is no longer guaranteed that the statement, which
-         increments <literal>use_master</literal>, will be executed on the slaves.
-        </para>
-        <para>
-         The meaning for version 1.1.0 is as follows. Number of statements
-         sent to the masters. Statements directed to a master by the user filter
-         (an user-defined callback) are not included. The latter are counted by
-         <literal>use_master_callback</literal>.
-        </para>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_slave_guess</literal>
-      </entry>
-      <entry>
-       Number of statements the built-in query analyzer recommends sending to
-       a slave because they contain no SQL hint to force use of a
-       certain server. The recommendation may be overruled in the following.
-       It is not guaranteed whether the statement will be executed on a slave
-       or not. This is how often the internal <literal>is_select</literal>
-       function has guessed that a slave shall be used. Please, see also the
-       user space function <function>mysqlnd_ms_query_is_select</function>.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_master_guess</literal>
-      </entry>
-      <entry>
-       Number of statements the built-in query analyzer recommends sending to
-       a master because they contain no SQL hint to force use of a
-       certain server. The recommendation may be overruled in the following.
-       It is not guaranteed whether the statement will be executed on a slave
-       or not. This is how often the internal <literal>is_select</literal>
-       function has guessed that a master shall be used. Please, see also the
-       user space function <function>mysqlnd_ms_query_is_select</function>.
-      </entry>
-      <entry>Since 1.1.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_slave_sql_hint</literal>
-      </entry>
-      <entry>
-       Number of statements sent to a slave because statement begins with
-       the SQL hint to force use of slave.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_master_sql_hint</literal>
-      </entry>
-      <entry>
-       Number of statements sent to a master because statement begins with
-       the SQL hint to force use of master.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_last_used_sql_hint</literal>
-      </entry>
-      <entry>
-       Number of statements sent to server which has run the previous statement,
-       because statement begins with the SQL hint to force use of previously
-       used server.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_slave_callback</literal>
-      </entry>
-      <entry>
-       Number of statements sent to a slave because an user-defined callback
-       has chosen a slave server for statement execution.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>use_master_callback</literal>
-      </entry>
-      <entry>
-       Number of statements sent to a master because an user-defined callback
-       has chosen a master server for statement execution.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>non_lazy_connections_slave_success</literal>
-      </entry>
-      <entry>
-       Number of successfully opened slave connections from
-       configurations not using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-       The total number of successfully opened slave connections
-       is <literal>non_lazy_connections_slave_success</literal> +
-       <literal>lazy_connections_slave_success</literal>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>non_lazy_connections_slave_failure</literal>
-      </entry>
-      <entry>
-       Number of failed slave connection attempts from
-       configurations not using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-       The total number of failed slave connection attempts
-       is <literal>non_lazy_connections_slave_failure</literal> +
-       <literal>lazy_connections_slave_failure</literal>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>non_lazy_connections_master_success</literal>
-      </entry>
-      <entry>
-       Number of successfully opened master connections from
-       configurations not using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-       The total number of successfully opened master connections
-       is <literal>non_lazy_connections_master_success</literal> +
-       <literal>lazy_connections_master_success</literal>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>non_lazy_connections_master_failure</literal>
-      </entry>
-      <entry>
-       Number of failed master connection attempts from
-       configurations not using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-       The total number of failed master connection attempts
-       is <literal>non_lazy_connections_master_failure</literal> +
-       <literal>lazy_connections_master_failure</literal>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>lazy_connections_slave_success</literal>
-      </entry>
-      <entry>
-       Number of successfully opened slave connections from
-       configurations using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>lazy_connections_slave_failure</literal>
-      </entry>
-      <entry>
-       Number of failed slave connection attempts from
-       configurations using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>lazy_connections_master_success</literal>
-      </entry>
-      <entry>
-       Number of successfully opened master connections from
-       configurations using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>lazy_connections_master_failure</literal>
-      </entry>
-      <entry>
-       Number of failed master connection attempts from
-       configurations using
-       <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">lazy connections</link></literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>trx_autocommit_on</literal>
-      </entry>
-      <entry>
-       Number of <literal>autocommit</literal> mode activations via API calls.
-       This figure may be used to monitor activity related to the plugin configuration
-       setting
-       <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness"><literal>trx_stickiness</literal></link>.
-       If, for example, you want to know if a certain API call invokes the
-       <literal>mysqlnd</literal> library function <literal>trx_autocommit()</literal>,
-       which is a requirement for
-       <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness"><literal>trx_stickiness</literal></link>,
-       you may call the user API function in question and check if the
-       statistic has changed. The statistic is modified only by the
-       plugins internal subclassed <literal>trx_autocommit()</literal>
-       method.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>trx_autocommit_off</literal>
-      </entry>
-      <entry>
-       Number of <literal>autocommit</literal> mode deactivations via API calls.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>trx_master_forced</literal>
-      </entry>
-      <entry>
-       Number of statements redirected to the master while
-       <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness"><literal>trx_stickiness=master</literal></link>
-       and <literal>autocommit</literal> mode is disabled.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>gtid_autocommit_injections_success</literal>
-      </entry>
-      <entry>
-       Number of successful SQL injections in autocommit mode as part
-       of the plugins client-side
-       <link linkend="mysqlnd-ms.gtid">global transaction id emulation</link>.
-      </entry>
-      <entry>Since 1.2.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>gtid_autocommit_injections_failure</literal>
-      </entry>
-      <entry>
-       Number of failed SQL injections in autocommit mode as part
-       of the plugins client-side
-       <link linkend="mysqlnd-ms.gtid">global transaction id emulation</link>.
-      </entry>
-      <entry>Since 1.2.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>gtid_commit_injections_success</literal>
-      </entry>
-      <entry>
-       Number of successful SQL injections in commit mode as part
-       of the plugins client-side
-       <link linkend="mysqlnd-ms.gtid">global transaction id emulation</link>.
-      </entry>
-      <entry>Since 1.2.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>gtid_commit_injections_failure</literal>
-      </entry>
-      <entry>
-       Number of failed SQL injections in commit mode as part
-       of the plugins client-side
-       <link linkend="mysqlnd-ms.gtid">global transaction id emulation</link>.
-      </entry>
-      <entry>Since 1.2.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>gtid_implicit_commit_injections_success</literal>
-      </entry>
-      <entry>
-       Number of successful SQL injections when implicit commit is detected as part
-       of the plugins client-side
-       <link linkend="mysqlnd-ms.gtid">global transaction id emulation</link>.
-       Implicit commit happens, for example, when autocommit has been turned
-       off, a query is executed and autocommit is enabled again. In that case,
-       the statement will be committed by the server and SQL to maintain is
-       injected before the autocommit is re-enabled. Another sequence
-       causing an implicit commit is <literal>begin()</literal>,
-       <literal>query()</literal>, <literal>begin()</literal>. The second call
-       to <literal>begin()</literal> will implicitly commit the transaction
-       started by the first call to <literal>begin()</literal>.
-       <literal>begin()</literal> refers to internal library calls not actual
-       PHP user API calls.
-      </entry>
-      <entry>Since 1.2.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>gtid_implicit_commit_injections_failure</literal>
-      </entry>
-      <entry>
-       Number of failed SQL injections when implicit commit is detected as part
-       of the plugins client-side
-       <link linkend="mysqlnd-ms.gtid">global transaction id emulation</link>.
-       Implicit commit happens, for example, when autocommit has been turned
-       off, a query is executed and autocommit is enabled again. In that case,
-       the statement will be committed by the server and SQL to maintain is
-       injected before the autocommit is re-enabled.
-      </entry>
-      <entry>Since 1.2.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>transient_error_retries</literal>
-      </entry>
-      <entry>
-       How often an operation has been retried when a transient error was
-       detected. See also,
-       <link linkend="ini.mysqlnd-ms-plugin-config-v2.transient_error"><literal>transient_error</literal></link>
-       plugin configuration file setting.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>fabric_sharding_lookup_servers_success</literal>
-      </entry>
-      <entry>
-       Number of successful <literal>sharding.lookup_servers</literal>
-       remote procedure calls to MySQL Fabric.
-       A call is considered successful if the plugin could reach MySQL
-       Fabric and got any reply. The reply itself may or may not be
-       understood by the plugin. Success refers to the network transport
-       only. If the reply was not understood or indicates a valid error condition,
-       <literal>fabric_sharding_lookup_servers_xml_failure</literal>
-       gets incremented.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>fabric_sharding_lookup_servers_failure</literal>
-      </entry>
-      <entry>
-       Number of failed <literal>sharding.lookup_servers</literal>
-       remote procedure calls to MySQL Fabric.
-       A remote procedure call is considered failed if there was a
-       network error in connecting to, writing to or reading from
-       MySQL Fabric.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>fabric_sharding_lookup_servers_time_total</literal>
-      </entry>
-      <entry>
-       Time spent connecting to,writing to and reading from MySQL
-       Fabrich during the <literal>sharding.lookup_servers</literal>
-       remote procedure call. The value is aggregated for all calls. Time is
-       measured in microseconds.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>fabric_sharding_lookup_servers_bytes_total</literal>
-      </entry>
-      <entry>
-       Total number of bytes received from MySQL Fabric in reply to
-       <literal>sharding.lookup_servers</literal> calls.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>fabric_sharding_lookup_servers_xml_failure</literal>
-      </entry>
-      <entry>
-       How often a reply from MySQL Fabric to
-       <literal>sharding.lookup_servers</literal> calls was not understood.
-       Please note, the current experimental implementation does not
-       distinguish between valid errors returned and malformed replies.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_begin</literal>
-      </entry>
-      <entry>
-       How many XA/distributed transactions have been started
-       using <function>mysqlnd_ms_xa_begin</function>.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_commit_success</literal>
-      </entry>
-      <entry>
-       How many XA/distributed transactions have been successfully committed
-       using <function>mysqlnd_ms_xa_commit</function>.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_commit_failure</literal>
-      </entry>
-      <entry>
-       How many XA/distributed transactions failed to commit
-       during <function>mysqlnd_ms_xa_commit</function>.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_rollback_success</literal>
-      </entry>
-      <entry>
-       How many XA/distributed transactions have been successfully rolled back
-       using <function>mysqlnd_ms_xa_rollback</function>. The figure does
-       not include implict rollbacks performed as a result of
-       <function>mysqlnd_ms_xa_commit</function> failure.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_rollback_failure</literal>
-      </entry>
-      <entry>
-       How many XA/distributed transactions could not be rolled back.
-       This includes failures of <function>mysqlnd_ms_xa_rollback</function>
-       but also failured during rollback when closing a connection, if
-       <literal>rollback_on_close</literal> is set. Please, see also
-       <literal>xa_rollback_on_close</literal> below.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_participants</literal>
-      </entry>
-      <entry>
-       Total number of participants in any XA transaction started with
-       <function>mysqlnd_ms_xa_begin</function>.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>xa_rollback_on_close</literal>
-      </entry>
-      <entry>
-       How many XA transactions have been rolled back implicitly when
-       a connection was close and <literal>rollback_on_close</literal> is set.
-       Depending on your coding policies, this may hint a flaw in your code as
-       you may prefer to explicitly clean up resources.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>pool_masters_total</literal>
-      </entry>
-      <entry>
-       Number of master servers (connections) in the internal connection pool.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>pool_slaves_total</literal>
-      </entry>
-      <entry>
-       Number of slave servers (connections) in the internal connection pool.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>pool_masters_active</literal>
-      </entry>
-      <entry>
-       Number of master servers (connections) from the internal connection pool
-       which are currently used for picking a connection.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>pool_slaves_active</literal>
-      </entry>
-      <entry>
-       Number of slave servers (connections) from the internal connection pool
-       which are currently used for picking a connection.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-       <row>
-      <entry>
-       <literal>pool_updates</literal>
-      </entry>
-      <entry>
-       How often the active connection list has been replaced and a
-       new set of master and slave servers had been installed.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>pool_master_reactivated</literal>
-      </entry>
-      <entry>
-       How often a master connection has been reused after being
-       flushed from the active list.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>pool_slave_reactivated</literal>
-      </entry>
-      <entry>
-       How often a slave connection has been reused after being
-       flushed from the active list.
-      </entry>
-      <entry>Since 1.6.0.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_get_stats</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-printf("mysqlnd_ms.enable = %d\n", ini_get("mysqlnd_ms.enable"));
-printf("mysqlnd_ms.collect_statistics = %d\n", ini_get("mysqlnd_ms.collect_statistics"));
-var_dump(mysqlnd_ms_get_stats());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-mysqlnd_ms.enable = 1
-mysqlnd_ms.collect_statistics = 1
-array(26) {
-  ["use_slave"]=>
-  string(1) "0"
-  ["use_master"]=>
-  string(1) "0"
-  ["use_slave_guess"]=>
-  string(1) "0"
-  ["use_master_guess"]=>
-  string(1) "0"
-  ["use_slave_sql_hint"]=>
-  string(1) "0"
-  ["use_master_sql_hint"]=>
-  string(1) "0"
-  ["use_last_used_sql_hint"]=>
-  string(1) "0"
-  ["use_slave_callback"]=>
-  string(1) "0"
-  ["use_master_callback"]=>
-  string(1) "0"
-  ["non_lazy_connections_slave_success"]=>
-  string(1) "0"
-  ["non_lazy_connections_slave_failure"]=>
-  string(1) "0"
-  ["non_lazy_connections_master_success"]=>
-  string(1) "0"
-  ["non_lazy_connections_master_failure"]=>
-  string(1) "0"
-  ["lazy_connections_slave_success"]=>
-  string(1) "0"
-  ["lazy_connections_slave_failure"]=>
-  string(1) "0"
-  ["lazy_connections_master_success"]=>
-  string(1) "0"
-  ["lazy_connections_master_failure"]=>
-  string(1) "0"
-  ["trx_autocommit_on"]=>
-  string(1) "0"
-  ["trx_autocommit_off"]=>
-  string(1) "0"
-  ["trx_master_forced"]=>
-  string(1) "0"
-  ["gtid_autocommit_injections_success"]=>
-  string(1) "0"
-  ["gtid_autocommit_injections_failure"]=>
-  string(1) "0"
-  ["gtid_commit_injections_success"]=>
-  string(1) "0"
-  ["gtid_commit_injections_failure"]=>
-  string(1) "0"
-  ["gtid_implicit_commit_injections_success"]=>
-  string(1) "0"
-  ["gtid_implicit_commit_injections_failure"]=>
-  string(1) "0"
-  ["transient_error_retries"]=>
-  string(1) "0"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-ms.collect-statistics">mysqlnd_ms.collect_statistics</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-ms.enable">mysqlnd_ms.enable</link>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.monitoring">Monitoring</link>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-match-wild.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-match-wild.xml
deleted file mode 100644
index d1a3fdbbc6..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-match-wild.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-match-wild" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_match_wild</refname>
-  <refpurpose>Finds whether a table name matches a wildcard pattern or not</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_ms_match_wild</methodname>
-   <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>wildcard</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Finds whether a table name matches a wildcard pattern or not.
-  </para>
-  <para>
-   This function is not of much practical relevance with PECL mysqlnd_ms 1.1.0
-   because the plugin does not support MySQL replication table filtering yet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <para>
-      The table name to check if it is matched by the wildcard.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>wildcard</parameter></term>
-    <listitem>
-     <para>
-      The wildcard pattern to check against the table name.
-      The wildcard pattern supports the same placeholders as
-      MySQL replication filters do.
-     </para>
-     <para>
-      MySQL replication filters
-      can be configured by using the MySQL Server configuration
-      options <literal>--replicate-wild-do-table</literal> and
-      <literal>--replicate-wild-do-db</literal>. Please, consult
-      the MySQL Reference Manual to learn more about this MySQL
-      Server feature.
-     </para>
-     <para>
-      The supported placeholders are:
-      <itemizedlist>
-       <listitem>
-        <simpara>
-         <literal>%</literal> - zero or more literals
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>_</literal> - one literal
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-     <para>
-      Placeholders can be escaped using <literal>\</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-<refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; <literal>table_name</literal> is
-   matched by <literal>wildcard</literal>.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_match_wild</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(mysqlnd_ms_match_wild("schema_name.table_name", "schema%"));
-var_dump(mysqlnd_ms_match_wild("abc", "_"));
-var_dump(mysqlnd_ms_match_wild("table1", "table_"));
-var_dump(mysqlnd_ms_match_wild("asia_customers", "%customers"));
-var_dump(mysqlnd_ms_match_wild("funny%table","funny\%table"));
-var_dump(mysqlnd_ms_match_wild("funnytable", "funny%table"));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-query-is-select.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-query-is-select.xml
deleted file mode 100644
index 2281dd7a6b..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-query-is-select.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-query-is-select" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_query_is_select</refname>
-  <refpurpose>Find whether to send the query to the master, the slave or the last used MySQL server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>mysqlnd_ms_query_is_select</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Finds whether to send the query to the master, the slave or the
-   last used MySQL server.
-  </para>
-  <para>
-   The plugins built-in read/write split mechanism
-   will be used to analyze the query string to make a recommendation where
-   to send the query. The built-in read/write split mechanism is very
-   basic and simple. The plugin will recommend sending all queries to the
-   MySQL replication master server but those which begin with
-   <literal>SELECT</literal>, or begin with a SQL hint which
-   enforces sending the query to a slave server. Due to the basic
-   but fast algorithm the plugin may propose to run some read-only
-   statements such as <literal>SHOW TABLES</literal> on the replication master.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-     Query string to test.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A return value of <constant>MYSQLND_MS_QUERY_USE_MASTER</constant>
-   indicates that the query should be send to the MySQL replication
-   master server. The function returns a value of
-   <constant>MYSQLND_MS_QUERY_USE_SLAVE</constant> if the query can be run
-   on a slave because it is considered read-only. A value of
-   <constant>MYSQLND_MS_QUERY_USE_LAST_USED</constant> is returned to recommend
-   running the query on the last used server. This can either be a MySQL
-   replication master server or a MySQL replication slave server.
-  </para>
-  <para>
-   If read write splitting has been disabled by setting
-   <literal>mysqlnd_ms.disable_rw_split</literal>, the function will
-   always return <constant>MYSQLND_MS_QUERY_USE_MASTER</constant> or
-   <constant>MYSQLND_MS_QUERY_USE_LAST_USED</constant>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_query_is_select</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function is_select($query)
-{
- switch (mysqlnd_ms_query_is_select($query))
- {
-  case MYSQLND_MS_QUERY_USE_MASTER:
-   printf("'%s' should be run on the master.\n", $query);
-   break;
-  case MYSQLND_MS_QUERY_USE_SLAVE:
-   printf("'%s' should be run on a slave.\n", $query);
-   break;
-  case MYSQLND_MS_QUERY_USE_LAST_USED:
-   printf("'%s' should be run on the server that has run the previous query\n", $query);
-   break;
-  default:
-   printf("No suggestion where to run the '%s', fallback to master recommended\n", $query);
-   break;
- }
-}
-
-is_select("INSERT INTO test(id) VALUES (1)");
-is_select("SELECT 1 FROM DUAL");
-is_select("/*" . MYSQLND_MS_LAST_USED_SWITCH . "*/SELECT 2 FROM DUAL");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-INSERT INTO test(id) VALUES (1) should be run on the master.
-SELECT 1 FROM DUAL should be run on a slave.
-/*ms=last_used*/SELECT 2 FROM DUAL should be run on the server that has run the previous query
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.constants">Predefined Constants</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-user"><literal>user</literal></link> filter
-    </member>
-   </simplelist>
-      <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-ms.disable-rw-split">mysqlnd_ms.disable_rw_split</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-ms.enable">mysqlnd_ms.enable</link>
-    </member>
-   </simplelist>
-
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-set-qos.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-set-qos.xml
deleted file mode 100644
index 44e5721ebe..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-set-qos.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-set-qos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_set_qos</refname>
-  <refpurpose>Sets the quality of service needed from the cluster</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_ms_set_qos</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>service_level</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>service_level_option</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>option_value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the quality of service needed from the cluster. A database cluster delivers
-   a certain quality of service to the user depending on its architecture. A major
-   aspect of the quality of service is the consistency level the cluster can offer.
-   An asynchronous MySQL replication cluster defaults to eventual consistency for
-   slave reads: a slave may serve stale data, current data, or it may have not the
-   requested data at all, because it is not synchronous to the master. In a
-   MySQL replication cluster, only master accesses can give strong consistency, which
-   promises that all clients see each others changes.
-  </para>
-  <para>
-   PECL/mysqlnd_ms hides the complexity of choosing appropriate nodes to achieve
-   a certain level of service from the cluster. The
-   "Quality of Service" filter implements the necessary logic. The filter can either
-   be configured in the plugins configuration file, or at runtime using
-   <function>mysqlnd_ms_set_qos</function>.
-  </para>
-  <para>
-   Similar results can be achieved with PECL mysqlnd_ms &lt; 1.2.0, if using
-   SQL hints to force the use of a certain type of node or using the
-   <literal>master_on_write</literal> plugin configuration option. The first
-   requires more code and causes more work on the application side.
-   The latter is less refined than using the quality of service filter.
-   Settings made through the function call can be reversed, as shown in the example
-   below. The example temporarily switches to a higher service level
-   (session consistency, read your writes) and returns
-   back to the clusters default after it has performed all operations that require the
-   better service. This way, read load on the master can be minimized compared to
-   using <literal>master_on_write</literal>, which would continue using the master
-   after the first write.
-  </para>
-  <para>
-   Since 1.5.0 calls will fail when done in the middle of a transaction if
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">transaction stickiness</link>
-   is enabled and transaction boundaries have been detected.
-   properly.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A PECL/mysqlnd_ms connection handle to a MySQL server of the type
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link>, <link linkend="book.mysqli">mysqli</link> or
-      <link linkend="book.mysql">ext/mysql</link> for which a service level is to be set.
-      The connection handle is obtained when opening a connection with
-      a host name that matches a mysqlnd_ms configuration file
-      entry using any of the above three MySQL driver extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>service_level</parameter></term>
-    <listitem>
-     <para>
-      The requested service level: <constant>MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL</constant>,
-      <constant>MYSQLND_MS_QOS_CONSISTENCY_SESSION</constant> or
-      <constant>MYSQLND_MS_QOS_CONSISTENCY_STRONG</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>service_level_option</parameter></term>
-    <listitem>
-     <para>
-      An option to parameterize the requested service level.
-      The option can either be <constant>MYSQLND_MS_QOS_OPTION_GTID</constant>
-      or <constant>MYSQLND_MS_QOS_OPTION_AGE</constant>.
-     </para>
-     <para>
-       The option <constant>MYSQLND_MS_QOS_OPTION_GTID</constant> can be used
-       to refine the service level <constant>MYSQLND_MS_QOS_CONSISTENCY_SESSION</constant>.
-       It must be combined with a fourth function parameter, the
-       <parameter>option_value</parameter>. The <parameter>option_value</parameter>
-       shall be a global transaction ID obtained from
-       <function>mysqlnd_ms_get_last_gtid</function>. If set, the
-       plugin considers both master servers and asynchronous slaves for session
-       consistency (read your writes). Otherwise, only masters are
-       used to achieve session consistency. A slave is considered up-to-date and
-       checked if it has already replicated the global transaction ID from
-       <parameter>option_value</parameter>. Please note, searching appropriate slaves
-       is an expensive and slow operation. Use the feature sparsely, if the
-       master cannot handle the read load alone.
-     </para>
-     <para>
-       The <constant>MYSQLND_MS_QOS_OPTION_AGE</constant> option can be combined
-       with the <constant>MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL</constant>
-       service level, to filter out asynchronous slaves that lag more seconds behind
-       the master than <parameter>option_value</parameter>. If set, the plugin
-       will only consider slaves for reading if
-       <literal>SHOW SLAVE STATUS</literal> reports
-       <literal>Slave_IO_Running=Yes</literal>,
-       <literal>Slave_SQL_Running=Yes</literal> and
-       <literal>Seconds_Behind_Master &lt;= option_value</literal>. Please note,
-       searching appropriate slaves is an expensive and slow operation.
-       Use the feature sparsely in version 1.2.0. Future versions may improve the
-       algorithm used to identify candidates. Please, see the MySQL reference
-       manual about the precision, accuracy and limitations of the MySQL administrative
-       command <literal>SHOW SLAVE STATUS</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>option_value</parameter></term>
-    <listitem>
-     <para>
-      Parameter value for the service level option. See also the
-      <parameter>service_level_option</parameter> parameter.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the connections service level
-   has been switched to the requested. Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_set_qos</function> requires
-    PHP &gt;= 5.4.0 and PECL mysqlnd_ms &gt;= 1.2.0. Internally, it is using
-    a <literal>mysqlnd</literal> library C functionality not available with PHP 5.3.
-   </para>
-   <para>
-Please note, all MySQL 5.6 production versions do not provide
-     clients with enough information to use GTIDs for enforcing session consistency.
-     In the worst case, the plugin will choose the master only.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_set_qos</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Open mysqlnd_ms connection using mysqli, PDO_MySQL or mysql extension */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli)
-  /* Of course, your error handling is nicer... */
-  die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-
-/* Session consistency: read your writes */
-$ret = mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_SESSION);
-if (!$ret)
-  die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-
-/* Will use master and return fresh data, client can see his last write */
-if (!$res = $mysqli->query("SELECT item, price FROM orders WHERE order_id = 1"))
-  die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-
-/* Back to default: use of all slaves and masters permitted, stale data can happen */
-if (!mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL))
-  die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_ms_get_last_gtid</function>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.qos-consistency">Service level and consistency concept</link>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.filter">Filter concept</link>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-set-user-pick-server.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-set-user-pick-server.xml
deleted file mode 100644
index 6cec75740e..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-set-user-pick-server.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-set-user-pick-server" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_set_user_pick_server</refname>
-  <refpurpose>Sets a callback for user-defined read/write splitting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_ms_set_user_pick_server</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a callback for user-defined read/write splitting. The plugin will
-   call the callback only if <literal>pick[]=user</literal> is the default
-   rule for server picking in the relevant section of the plugins configuration
-   file.
-  </para>
-  <para>
-   The plugins built-in read/write query split mechanism decisions can be
-   overwritten in two ways. The easiest way is to prepend the query string
-   with the SQL hints <constant>MYSQLND_MS_MASTER_SWITCH</constant>,
-   <constant>MYSQLND_MS_SLAVE_SWITCH</constant> or
-   <constant>MYSQLND_MS_LAST_USED_SWITCH</constant>. Using SQL hints one can
-   control, for example, whether a query shall be send to the MySQL replication
-   master server or one of the slave servers. By help of SQL hints it is
-   not possible to pick a certain slave server for query execution.
-  </para>
-  <para>
-   Full control on server selection can be gained using a callback function.
-   Use of a callback is recommended to expert users only because the callback
-   has to cover all cases otherwise handled by the plugin.
-  </para>
-  <para>
-   The plugin will invoke the callback function for selecting a server from the
-   lists of configured master and slave servers. The callback function
-   inspects the query to run and picks a server for query execution by returning
-   the hosts URI, as found in the master and slave list.
-  </para>
-  <para>
-   If the lazy connections are enabled and the callback chooses a slave server for
-   which no connection has been established so far and establishing the connection
-   to the slave fails, the plugin will return an error upon the next action
-   on the failed connection, for example, when running a query. It is the
-   responsibility of the application developer to handle the error. For example,
-   the application can re-run the query to trigger a new server selection and
-   callback invocation. If so, the callback must make sure to select
-   a different slave, or check slave availability, before returning to
-   the plugin to prevent an endless loop.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The function to be called. Class methods may also be invoked
-      statically using this function by passing
-      <literal>array($classname, $methodname)</literal> to this parameter.
-      Additionally class methods of an object instance may be called by passing
-      <literal>array($objectinstance, $methodname)</literal> to this parameter.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Host to run the query on. The host URI is to be taken from the
-   master and slave connection lists passed to the callback function.
-   If callback returns a value neither found in the master nor in the slave
-   connection lists the plugin will fallback to the second pick method configured
-   via the <literal>pick[]</literal> setting in the plugin configuration file.
-   If not second pick method is given, the plugin falls back to the build-in
-   default pick method for server selection.
-  </para>
- </refsect1>
-
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_set_user_pick_server</function> is available
-    with PECL mysqlnd_ms &lt; 1.1.0.  It has been replaced by the
-    <literal>user</literal> filter. Please, check the
-    <link linkend="mysqlnd-ms.changes-one-one">Change History</link>
-    for upgrade notes.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_ms_set_user_pick_server</function> example</title>
-    <programlisting role="ini">
-<![CDATA[
-[myapp]
-master[] = localhost
-slave[] = 192.168.2.27:3306
-slave[] = 192.168.78.136:3306
-pick[] = user
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-function pick_server($connected, $query, $master, $slaves, $last_used)
-{
- static $slave_idx = 0;
- static $num_slaves = NULL;
- if (is_null($num_slaves))
-  $num_slaves = count($slaves);
-
- /* default: fallback to the plugins build-in logic */
- $ret = NULL;
-
- printf("User has connected to '%s'...\n", $connected);
- printf("... deciding where to run '%s'\n", $query);
-
- $where = mysqlnd_ms_query_is_select($query);
- switch ($where)
- {
-  case MYSQLND_MS_QUERY_USE_MASTER:
-   printf("... using master\n");
-   $ret = $master[0];
-   break;
-  case MYSQLND_MS_QUERY_USE_SLAVE:
-   /* SELECT or SQL hint for using slave */
-   if (stristr($query, "FROM table_on_slave_a_only"))
-   {
-    /* a table which is only on the first configured slave  */
-    printf("... access to table available only on slave A detected\n");
-    $ret = $slaves[0];
-   }
-   else
-   {
-    /* round robin */
-    printf("... some read-only query for a slave\n");
-    $ret = $slaves[$slave_idx++ % $num_slaves];
-   }
-   break;
-  case MYSQLND_MS_QUERY_LAST_USED:
-   printf("... using last used server\n");
-   $ret = $last_used;
-   break;
- }
-
- printf("... ret = '%s'\n", $ret);
- return $ret;
-}
-
-mysqlnd_ms_set_user_pick_server("pick_server");
-
-$mysqli = new mysqli("myapp", "root", "root", "test");
-
-if (!($res = $mysqli->query("SELECT 1 FROM DUAL")))
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-else
- $res->close();
-
-if (!($res = $mysqli->query("SELECT 2 FROM DUAL")))
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-else
- $res->close();
-
-
-if (!($res = $mysqli->query("SELECT * FROM table_on_slave_a_only")))
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-else
- $res->close();
-
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-User has connected to 'myapp'...
-... deciding where to run 'SELECT 1 FROM DUAL'
-... some read-only query for a slave
-... ret = 'tcp://192.168.2.27:3306'
-User has connected to 'myapp'...
-... deciding where to run 'SELECT 2 FROM DUAL'
-... some read-only query for a slave
-... ret = 'tcp://192.168.78.136:3306'
-User has connected to 'myapp'...
-... deciding where to run 'SELECT * FROM table_on_slave_a_only'
-... access to table available only on slave A detected
-... ret = 'tcp://192.168.2.27:3306'
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_ms_query_is_select</function>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.filter">Filter concept</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-user"><literal>user</literal></link> filter
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-begin.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-begin.xml
deleted file mode 100644
index bb96c09af2..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-begin.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-xa-begin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_xa_begin</refname>
-  <refpurpose>Starts a distributed/XA transaction among MySQL servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>mysqlnd_ms_xa_begin</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>gtrid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Starts a XA transaction among MySQL servers. PECL/mysqlnd_ms acts as a transaction
-   coordinator the distributed transaction.
-  </para>
-  <para>
-   Once a global transaction has been started, the plugin injects appropriate
-   <literal>XA BEGIN</literal> SQL statements on all MySQL servers used in the following.
-   The global transaction is either ended by calling <function>mysqlnd_ms_xa_commit</function>,
-   <function>mysqlnd_ms_xa_rollback</function> or by an implicit rollback in case
-   of an error.
-  </para>
-  <para>
-   During a global transaction, the plugin tracks all server switches,
-   for example, when switching from one MySQL shard to another MySQL shard.
-   Immediately before a query is run on a server that has not been participating
-   in the global transaction yet, <literal>XA BEGIN</literal> is executed on
-   the server. From a users perspective the injection happens during a call to a
-   query execution function such as  <function>mysqli_query</function>. Should
-   the injection fail an error is reported to the caller of the query execution
-   function. The failing server does not become a participant in the global
-   transaction. The user may retry executing a query on the server and hereby retry
-   injecting <literal>XA BEGIN</literal>, abort the global transaction because
-   not all required servers can participate, or ignore and continue the global without
-   the failed server.
-  </para>
-  <para>
-   Reasons to fail executing <literal>XA BEGIN</literal> include but are not limited to
-   a server being unreachable or the server having an open, concurrent
-   XA transaction using the same xid.
-  </para>
-  <para>
-   Please note, global and local transactions
-   are mutually exclusive. You cannot start a XA transaction when you have a local
-   transaction open. The local transaction must be ended first. The plugin tries
-   to detect this conflict as early as possible. It monitors API calls for controlling
-   local transactions to learn about the current state. However, if using
-   SQL statements for local transactions such as <literal>BEGIN</literal>, the
-   plugin may not know the current state and the conflict is not detected
-   before <literal>XA BEGIN</literal> is injected and executed.
-  </para>
-  <para>
-   The use of other XA resources but MySQL servers is not supported by
-   the function. To carry out a global transaction among, for example,
-   a MySQL server and another vendors database system, you should issue
-   the systems SQL commands yourself.
-  </para>
-  <note>
-   <title>Experimental</title>
-   <para>
-    The feature is currently under development. There may be issues and/or
-    feature limitations. Do not use in production environments.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gtrid</parameter></term>
-    <listitem>
-     <para>
-      Global transaction identifier (gtrid). The gtrid is a binary string
-      up to 64 bytes long. Please note, depending on your character set settings,
-      64 characters may require more than 64 bytes to store.
-     </para>
-     <para>
-     In accordance with the MySQL SQL syntax,
-     XA transactions use identifiers made of three parts. An xid consists of a
-     global transaction identifier (gtrid), a branch qualifier (bqual) and a
-     format identifier (formatID). Only the global transaction identifier can
-     and needs to be set.
-     </para>
-     <para>
-     The branch qualifier and format identifier are set automatically. The details
-     should be considered implementation dependent, which may change without
-     prior notice. In version 1.6 the branch qualifier is consecutive number
-     which is incremented whenever a participant joins the global transaction.
-     </para>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      Timeout in seconds. The default value is 60 seconds.
-     </para>
-     <para>
-      The timeout is a hint to the garbage collection. If a transaction is recorded
-      to take longer than expected, the garbage collection begins checking the
-      transactions status.
-     </para>
-     <para>
-       Setting a low value may make the garbage collection check the progress
-       too often. Please note, checking the status of a global transaction may
-       involve connecting to all recorded participants and possibly issuing
-       queries on the servers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-   <para>
-   Returns &true; if there is no open local or global transaction and a new global
-   transaction can be started. Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.quickstart.xa_transactions">Quickstart XA/Distributed transactions</link>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <function>mysqlnd_ms_get_stats</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-commit.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-commit.xml
deleted file mode 100644
index adb179c7e1..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-commit.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-xa-commit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_xa_commit</refname>
-  <refpurpose>Commits a distributed/XA transaction among MySQL servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_ms_xa_commit</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>gtrid</parameter></methodparam>
-
-  </methodsynopsis>
-  <para>
-   Commits a global transaction among MySQL servers started by
-   <function>mysqlnd_ms_xa_begin</function>.
-  </para>
-  <para>
-    If any of the global transaction participants fails to commit
-    an implicit rollback is performed. It may happen that not
-    all cases can be handled during the rollback. For example,
-    no attempts will be made to reconnect to a participant after
-    the connection to the participant has been lost. Solving
-    cases that cannot easily be rolled back is left to the
-    garbage collection.
-  </para>
-  <note>
-   <title>Experimental</title>
-   <para>
-    The feature is currently under development. There may be issues and/or
-    feature limitations. Do not use in production environments.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gtrid</parameter></term>
-    <listitem>
-     <para>
-      Global transaction identifier (gtrid).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-   <para>
-   Returns &true; if the global transaction has been committed. Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.quickstart.xa_transactions">Quickstart XA/Distributed transactions</link>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <function>mysqlnd_ms_get_stats</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-gc.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-gc.xml
deleted file mode 100644
index 6f32f117df..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-gc.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-xa-gc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_xa_gc</refname>
-  <refpurpose>Garbage collects unfinished XA transactions after severe errors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>mysqlnd_ms_xa_gc</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>gtrid</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>ignore_max_retries</parameter></methodparam>
-
-
-  </methodsynopsis>
-  <para>
-   Garbage collects unfinished XA transactions.
-  </para>
-  <para>
-    The XA protocol is a blocking protocol. There exist cases when servers
-    participating in a global transaction cannot make progress when the transaction
-    coordinator crashes or disconnects. In such a case, the MySQL servers
-    keep waiting for instructions to finish the XA transaction in question.
-    Because transactions occupy resources, transactions should always be
-    terminated properly.
-  </para>
-  <para>
-    Garbage collection requires configuring a state store to track global
-    transactions. Should a PHP client crash in the middle of a transaction
-    and a new PHP client be started, then the built-in garbage collection
-    can learn about the aborted global transaction and terminate it. If you
-    do not configure a state store, the garbage collection cannot perform
-    any cleanup tasks.
-  </para>
-  <para>
-    The state store should be crash-safe and be highly available to survive
-    its own crash. Currently, only MySQL is supported as a state store.
-  </para>
-  <para>
-    Garbage collection can also be performed automatically in the background.
-    See the plugin configuration directive <literal>garbage_collection</literal>
-    for details.
-  </para>
-  <note>
-   <title>Experimental</title>
-   <para>
-    The feature is currently under development. There may be issues and/or
-    feature limitations. Do not use in production environments.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gtrid</parameter></term>
-    <listitem>
-     <para>
-      Global transaction identifier (gtrid). If given, the garbage
-      collection considers the transaction only. Otherwise,
-      the state store is scanned for any unfinished transaction.
-     </para>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-    <term><parameter>ignore_max_retries</parameter></term>
-    <listitem>
-     <para>
-      Whether to ignore the plugin configuration <literal>max_retries</literal> setting.
-      If garbage collection continuously fails and the <literal>max_retries</literal>
-      limit is reached prior to finishing the failed global transaction,
-      you can attempt further runs prior to investigating the cause
-      and solving the issue manually by issuing appropriate SQL statements
-      on the participants. Setting the parameter has the same effect
-      as temporarily setting <literal>max_retries = 0</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-   <para>
-   Returns &true; if garbage collection was successful. Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.quickstart.xa_transactions">Quickstart XA/Distributed transactions</link>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.configuration">Runtime configuration</link>
-    </member>
-    <member>
-      <link linkend="ini.mysqlnd-ms-plugin-config-v2.xa">State store configuration</link>
-    </member>
-    <member>
-     <function>mysqlnd_ms_get_stats</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-rollback.xml b/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-rollback.xml
deleted file mode 100644
index f4b9530737..0000000000
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-xa-rollback.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-ms-xa-rollback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_ms_xa_rollback</refname>
-  <refpurpose>Rolls back a distributed/XA transaction among MySQL servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>mysqlnd_ms_xa_rollback</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>gtrid</parameter></methodparam>
-
-  </methodsynopsis>
-  <para>
-   Rolls back a global transaction among MySQL servers started by
-   <function>mysqlnd_ms_xa_begin</function>.
-  </para>
-  <para>
-    If any of the global transaction participants fails to rollback
-    the situation is left to be solved by the garbage collection.
-  </para>
-  <note>
-   <title>Experimental</title>
-   <para>
-    The feature is currently under development. There may be issues and/or
-    feature limitations. Do not use in production environments.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gtrid</parameter></term>
-    <listitem>
-     <para>
-      Global transaction identifier (gtrid).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-   <para>
-   Returns &true; if the global transaction has been rolled back. Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-ms.quickstart.xa_transactions">Quickstart XA/Distributed transactions</link>
-    </member>
-    <member>
-     <link linkend="mysqlnd-ms.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <function>mysqlnd_ms_get_stats</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/ini.xml b/reference/mysqlnd_ms/ini.xml
deleted file mode 100644
index 681b199446..0000000000
--- a/reference/mysqlnd_ms/ini.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-ms.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Mysqlnd_ms &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mysqlnd-ms.configuration.list">
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.enable">mysqlnd_ms.enable</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.force-config-usage">mysqlnd_ms.force_config_usage</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.ini-file">mysqlnd_ms.ini_file</link></entry>
-      <entry>""</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.config-file">mysqlnd_ms.config_file</link></entry>
-      <entry>""</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.collect-statistics">mysqlnd_ms.collect_statistics</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.multi-master">mysqlnd_ms.multi_master</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-ms.disable-rw-split">mysqlnd_ms.disable_rw_split</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.enable">
-    <term>
-     <parameter>mysqlnd_ms.enable</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables the plugin. If disabled, the extension will not plug
-      into
-      <link linkend="book.mysqlnd">mysqlnd</link> to proxy internal
-      <link linkend="book.mysqlnd">mysqlnd</link> C API calls.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.force-config-usage">
-    <term>
-     <parameter>mysqlnd_ms.force_config_usage</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      If enabled, the plugin checks if the host (server) parameters value of any
-      MySQL connection attempt, matches a section name from the plugin configuration
-      file. If not, the connection attempt is blocked.
-     </para>
-     <para>
-      This setting is not only useful to restrict PHP to certain servers but also
-      to debug configuration file problems. The configuration file validity is checked
-      at two different stages. The first check is performed when PHP begins to
-      handle a web request. At this point the plugin reads and decodes the configuration
-      file. Errors thrown at this early stage in an extensions life cycle may not be
-      shown properly to the user. Thus, the plugin buffers the errors, if any, and
-      additionally displays them when establishing a connection to MySQL.
-      By default a buffered startup error will emit an error of type
-      <literal>E_WARNING</literal>.  If <literal>force_config_usage</literal> is set,
-      the error type used is <literal>E_RECOVERABLE_ERROR</literal>.
-     </para>
-     <para>
-      Please, see also <link linkend="mysqlnd-ms.plugin-ini-json.debug_config">configuration
-      file debugging notes</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.ini-file">
-    <term>
-     <parameter>mysqlnd_ms.ini_file</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Plugin specific configuration file. This setting has been
-      renamed to <literal>mysqlnd_ms.config_file</literal> in version 1.4.0.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.config-file">
-    <term>
-     <parameter>mysqlnd_ms.config_file</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Plugin specific configuration file. This setting superseeds
-      <literal>mysqlnd_ms.ini_file</literal> since 1.4.0.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.collect-statistics">
-    <term>
-     <parameter>mysqlnd_ms.collect_statistics</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables the collection of statistics. The collection of
-      statistics is disabled by default for performance reasons.
-      Statistics are returned by the function
-      <function>mysqlnd_ms_get_stats</function>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.multi-master">
-    <term>
-     <parameter>mysqlnd_ms.multi_master</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables support of MySQL multi master replication setups.
-      Please, see also <link linkend="mysqlnd-ms.supportedclusters">supported clusters</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.mysqlnd-ms.disable-rw-split">
-    <term>
-     <parameter>mysqlnd_ms.disable_rw_split</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables built-in read write splitting.
-     </para>
-     <para>
-      Controls whether load balancing and lazy connection functionality can
-      be used independently of read write splitting. If read write splitting
-      is disabled, only servers from the master list will be used for
-      statement execution. All configured slave servers will be ignored.
-     </para>
-     <para>
-      The SQL hint <literal>MYSQLND_MS_USE_SLAVE</literal> will not be recognized.
-      If found, the statement will be redirected to a master.
-     </para>
-     <para>
-      Disabling read write splitting impacts the return value of
-      <function>mysqlnd_ms_query_is_select</function>.
-      The function will no longer propose query execution on slave servers.
-     </para>
-     <note>
-      <title>Multiple master servers</title>
-      <para>
-       Setting <literal>mysqlnd_ms.multi_master=1</literal> allows the plugin
-       to use multiple master servers, instead of only the first master server
-       of the master list.
-      </para>
-      <para>
-       Please, see also <link linkend="mysqlnd-ms.supportedclusters">supported clusters</link>.
-      </para>
-     </note>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/quickstart.xml b/reference/mysqlnd_ms/quickstart.xml
deleted file mode 100644
index 2d17778e52..0000000000
--- a/reference/mysqlnd_ms/quickstart.xml
+++ /dev/null
@@ -1,2384 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="mysqlnd-ms.quickstart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Quickstart and Examples</title>
- <para>
-  The mysqlnd replication load balancing plugin is easy to use.
-  This quickstart will demo typical use-cases, and provide practical advice on getting
-  started.
- </para>
- <para>
-  It is strongly recommended to read the reference sections in addition to the
-  quickstart. The quickstart tries to avoid discussing theoretical concepts
-  and limitations. Instead, it will link to the reference sections. It is safe
-  to begin with the quickstart. However, before using the plugin in mission critical
-  environments we urge you to read additionally the background information from the
-  reference sections.
- </para>
- <para>
-  The focus is on using PECL mysqlnd_ms for work with an asynchronous MySQL cluster,
-  namely MySQL replication. Generally speaking an asynchronous cluster is more
-  difficult to use than a synchronous one. Thus, users of, for example, MySQL Cluster
-  will find more information than needed.
- </para>
- <section xml:id="mysqlnd-ms.quickstart.configuration">
-  <title>Setup</title>
-  <para>
-   The plugin is implemented as a PHP extension. See also the
-   <link linkend="mysqlnd-ms.installation">installation instructions</link> to
-   install the
-   <link xlink:href="&url.pecl.package;mysqlnd_ms">PECL/mysqlnd_ms</link> extension.
-  </para>
-  <para>
-   Compile or configure the PHP MySQL extension (API) (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>,
-   <link linkend="ref.mysql">mysql</link>) that you plan to use with support
-   for the <link linkend="book.mysqlnd">mysqlnd</link> library. PECL/mysqlnd_ms
-   is a plugin for the mysqlnd library. To use the plugin with any of the PHP
-   MySQL extensions, the extension has to use the mysqlnd library.
-  </para>
-  <para>
-   Then, load the extension into PHP and activate the plugin in the PHP configuration
-   file using the PHP configuration directive named
-   <link linkend="ini.mysqlnd-ms.enable">mysqlnd_ms.enable</link>.
-  </para>
-  <para>
-   <example>
-    <title>Enabling the plugin (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.config_file=/path/to/mysqlnd_ms_plugin.ini
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   The plugin uses its own configuration file. Use the PHP
-   configuration directive
-   <link linkend="ini.mysqlnd-ms.config-file">mysqlnd_ms.config_file</link>
-   to set the full file path to the plugin-specific configuration file.
-   This file must be readable by PHP (e.g., the web server user).
-   Please note, the configuration directive <link linkend="ini.mysqlnd-ms.config-file">mysqlnd_ms.config_file</link>
-   superseeds <link linkend="ini.mysqlnd-ms.ini-file">mysqlnd_ms.ini_file</link>
-   since 1.4.0. It is a common pitfall to use the old, no longer available
-   configuration directive.
-  </para>
-  <para>
-   Create a plugin-specific configuration file. Save the file to the path
-   set by the PHP configuration directive
-   <link linkend="ini.mysqlnd-ms.config-file">mysqlnd_ms.config_file</link>.
-  </para>
-  <para>
-   The plugins <link linkend="mysqlnd-ms.plugin-ini-json">configuration file</link>
-   is <acronym>JSON</acronym> based. It is divided into one or more sections.
-   Each section has a name, for example, <literal>myapp</literal>. Every section
-   makes its own set of configuration settings.
-  </para>
-  <para>
-    A section must, at a minimum, list the MySQL replication master server, and set
-    a list of slaves. The plugin supports using only one master server per section.
-    Multi-master MySQL replication setups are not yet fully supported.
-    Use the configuration setting
-    <link linkend="ini.mysqlnd-ms-plugin-config-v2.master">master</link>
-    to set the hostname, and the port or socket of the MySQL master server.
-    MySQL slave servers are configured using the
-    <link linkend="ini.mysqlnd-ms-plugin-config-v2.slave">slave</link>
-    keyword.
-  </para>
-  <para>
-   <example>
-    <title>Minimal plugin-specific configuration file (mysqlnd_ms_plugin.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": [
-
-        ]
-    }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   Configuring a MySQL slave server list is required, although it may
-   contain an empty list. It is recommended to always configure at
-   least one slave server.
-  </para>
-  <para>
-   Server lists can use <link linkend="mysqlnd-ms.plugin-ini-json.server-list-syntax">
-   anonymous or non-anonymous syntax</link>. Non-anonymous
-   lists include alias names for the servers, such as <literal>master_0</literal>
-   for the master in the above example. The quickstart uses the
-   more verbose non-anonymous syntax.
-  </para>
-  <para>
-   <example>
-    <title>Recommended minimal plugin-specific config (mysqlnd_ms_plugin.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   If there are
-   at least two servers in total, the plugin can start to load balance and switch
-   connections. Switching connections is not always transparent and can cause
-   issues in certain cases. The reference sections about
-   <link linkend="mysqlnd-ms.pooling">connection pooling and switching</link>,
-   <link linkend="mysqlnd-ms.transaction">transaction handling</link>,
-   <link linkend="mysqlnd-ms.failover">fail over</link>
-   <link linkend="mysqlnd-ms.loadbalancing">load balancing</link> and
-   <link linkend="mysqlnd-ms.rwsplit">read-write splitting</link> all provide
-   more details. And potential pitfalls are described later in this guide.
-  </para>
-  <para>
-   It is the responsibility of the application to handle potential issues caused
-   by connection switches, by configuring a master with at least one slave
-   server, which allows switching to work therefore related problems can be found.
-  </para>
-  <para>
-   The MySQL master and MySQL slave servers, which you configure, do not need to
-   be part of MySQL replication setup. For testing purpose you can use single
-   MySQL server and make it known to the plugin as a master and slave server
-   as shown below. This could help you to detect many potential issues with
-   connection switches. However, such a setup will not be prone to the issues
-   caused by replication lag.
-  </para>
-  <para>
-   <example>
-    <title>Using one server as a master and as a slave (testing only!)</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   The plugin attempts to notify you of invalid configurations. Since 1.5.0 it
-   will throw a warning during PHP startup if the configuration file cannot be read,
-   is empty or parsing the JSON failed. Depending on your PHP settings those
-   errors may appear in some log files only. Further validation is done when a connection
-   is to be established and the configuration file is searched for valid sections.
-   Setting <link linkend="ini.mysqlnd-ms.force-config-usage">mysqlnd_ms.force_config_usage</link>
-   may help debugging a faulty setup. Please, see also
-   <link linkend="mysqlnd-ms.plugin-ini-json.debug_config">configuration file debugging notes</link>.
-  </para>
-
- </section>
-
- <section xml:id="mysqlnd-ms.quickstart.usage">
-  <title>Running statements</title>
-  <para>
-   The plugin can be used with any PHP MySQL extension
-   (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>, and
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>) that is
-   compiled to use the <link linkend="book.mysqlnd">mysqlnd</link> library.
-   <literal>PECL/mysqlnd_ms</literal> plugs into the <link linkend="book.mysqlnd">mysqlnd</link> library.
-   It does not change the API or behavior of those extensions.
-  </para>
-  <para>
-   Whenever a connection to MySQL is being opened, the plugin compares the host
-   parameter value of the connect call, with the section names
-   from the plugin specific configuration file. If, for example, the
-   plugin specific configuration file has a section <literal>myapp</literal> then
-   the section should be referenced by opening a MySQL connection to the
-   host <literal>myapp</literal>
-  </para>
-  <para>
-   <example>
-    <title>Plugin specific configuration file (mysqlnd_ms_plugin.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Opening a load balanced connection</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Load balanced following "myapp" section rules from the plugins config file */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-$pdo = new PDO('mysql:host=myapp;dbname=database', 'username', 'password');
-$mysql = mysql_connect("myapp", "username", "password");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The connection examples above will be load balanced.
-   The plugin will send read-only statements to the MySQL slave server with the
-   IP <literal>192.168.2.27</literal> and will listen on port <literal>3306</literal>
-   for the MySQL client connection. All other statements will be directed to the
-   MySQL master server running on the host <literal>localhost</literal>. If on Unix like
-   operating systems, the master on <literal>localhost</literal> will be accepting
-   MySQL client connections on the Unix domain socket <literal>/tmp/mysql.sock</literal>,
-   while TCP/IP is the default port on Windows.
-   The plugin will use the user name <literal>username</literal> and the password
-   <literal>password</literal> to connect to any of the MySQL servers listed in
-   the section <literal>myapp</literal> of the plugins configuration file. Upon
-   connect, the plugin will select <literal>database</literal> as the current
-   schemata.
-  </para>
-  <para>
-   The username, password and schema name are taken from the connect
-   API calls and used for all servers. In other words: you must use the same
-   username and password for every MySQL server listed in a plugin configuration
-   file section. The is not a general limitation. As of <literal>PECL/mysqlnd_ms</literal> 1.1.0,
-   it is possible to set the
-   <link linkend="mysqlnd-ms.plugin-ini-json.server-config-keywords">username</link> and
-   <link linkend="mysqlnd-ms.plugin-ini-json.server-config-keywords">password</link> for any server in the
-   plugins configuration file, to be used instead of the credentials passed
-   to the API call.
-  </para>
-  <para>
-   The plugin does not change the API for running statements.
-   <link linkend="mysqlnd-ms.rwsplit">Read-write splitting</link>
-   works out of the box. The following example assumes that there is no
-   significant replication lag between the master and the slave.
-  </para>
-  <para>
-   <example>
-    <title>Executing statements</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Load balanced following "myapp" section rules from the plugins config file */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (mysqli_connect_errno()) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Statements will be run on the master */
-if (!$mysqli->query("DROP TABLE IF EXISTS test")) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-if (!$mysqli->query("CREATE TABLE test(id INT)")) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-if (!$mysqli->query("INSERT INTO test(id) VALUES (1)")) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-/* read-only: statement will be run on a slave */
-if (!($res = $mysqli->query("SELECT id FROM test"))) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-} else {
-    $row = $res->fetch_assoc();
-    $res->close();
-    printf("Slave returns id = '%s'\n", $row['id']);
-}
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Slave returns id = '1'
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.quickstart.connectionpooling">
-  <title>Connection state</title>
-  <para>
-   The plugin changes the semantics of a PHP MySQL connection handle.
-   A new connection handle represents a connection pool, instead of a
-   single MySQL client-server network connection. The connection pool consists
-   of a master connection, and optionally any number of slave connections.
-  </para>
-  <para>
-   Every connection from the connection pool has its own state. For example,
-   SQL user variables, temporary tables and transactions are part of the state.
-   For a complete list of items that belong to the state of a connection, see the
-   <link linkend="mysqlnd-ms.pooling">connection pooling and switching</link>
-   concepts documentation.
-   If the plugin decides to switch connections for load balancing, the
-   application could be given a connection which has a different state.
-   Applications must be made aware of this.
-  </para>
-  <para>
-   <example>
-    <title>Plugin config with one slave and one master</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Pitfall: connection state and SQL user variables</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Connection 1, connection bound SQL user variable, no SELECT thus run on master */
-if (!$mysqli->query("SET @myrole='master'")) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-/* Connection 2, run on slave because SELECT */
-if (!($res = $mysqli->query("SELECT @myrole AS _role"))) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-} else {
-    $row = $res->fetch_assoc();
-    $res->close();
-    printf("@myrole = '%s'\n", $row['_role']);
-}
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-@myrole = ''
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   The example opens a load balanced connection and executes two statements.
-   The first statement <literal>SET @myrole='master'</literal> does not begin
-   with the string <literal>SELECT</literal>. Therefore the plugin does not
-   recognize it as a read-only query which shall be run on a slave. The
-   plugin runs the statement on the connection to the master. The statement
-   sets a SQL user variable which is bound to the master connection. The
-   state of the master connection has been changed.
-  </para>
-  <para>
-   The next statement is <literal>SELECT @myrole AS _role</literal>.
-   The plugin does recognize it as a read-only query and sends it to
-   the slave. The statement is run on a connection to the slave. This
-   second connection does not have any SQL user variables bound to it.
-   It has a different state than the first connection to the master.
-   The requested SQL user variable is not set. The example script prints
-   <literal>@myrole = ''</literal>.
-  </para>
-  <para>
-   It is the responsibility of the application developer to take care
-   of the connection state. The plugin does not monitor all
-   connection state changing activities. Monitoring all possible cases would
-   be a very CPU intensive task, if it could be done at all.
-  </para>
-  <para>
-   The pitfalls can easily be worked around using SQL hints.
-  </para>
-  </section>
-
- <section xml:id="mysqlnd-ms.quickstart.sqlhints">
-  <title>SQL Hints</title>
-  <para>
-   SQL hints can force a query to choose a specific server from the connection pool.
-   It gives the plugin a hint to use a designated server, which can solve
-   issues caused by connection switches and connection state.
-  </para>
-  <para>
-   SQL hints are standard compliant SQL comments. Because
-   SQL comments are supposed to be ignored by SQL processing systems, they
-   do not interfere with other programs such as the MySQL Server, the MySQL Proxy,
-   or a firewall.
-  </para>
-  <para>
-   Three SQL hints are supported by the plugin: The
-   <constant>MYSQLND_MS_MASTER_SWITCH</constant> hint makes the plugin run a
-   statement on the master, <constant>MYSQLND_MS_SLAVE_SWITCH</constant>
-   enforces the use of the slave, and
-   <constant>MYSQLND_MS_LAST_USED_SWITCH</constant> will run a statement on
-   the same server that was used for the previous statement.
-  </para>
-  <para>
-   The plugin scans the beginning of a statement for the existence of an SQL
-   hint. SQL hints are only recognized if they appear at the beginning of
-   the statement.
-  </para>
-   <para>
-   <example>
-    <title>Plugin config with one slave and one master</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>SQL hints to prevent connection switches</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (mysqli_connect_errno()) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Connection 1, connection bound SQL user variable, no SELECT thus run on master */
-if (!$mysqli->query("SET @myrole='master'")) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-
-/* Connection 1, run on master because of SQL hint */
-if (!($res = $mysqli->query(sprintf("/*%s*/SELECT @myrole AS _role", MYSQLND_MS_LAST_USED_SWITCH)))) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-} else {
-    $row = $res->fetch_assoc();
-    $res->close();
-    printf("@myrole = '%s'\n", $row['_role']);
-}
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-@myrole = 'master'
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   In the above example, using <constant>MYSQLND_MS_LAST_USED_SWITCH</constant> prevents
-   session switching from the master to a slave when running the <literal>SELECT</literal>
-   statement.
-  </para>
-  <para>
-   SQL hints can also be used to run <literal>SELECT</literal> statements
-   on the MySQL master server. This may be desired if the MySQL slave servers
-   are typically behind the master, but you need current data from the cluster.
-  </para>
-  <para>
-   In version 1.2.0 the concept of a service level has been introduced to address
-   cases when current data is required. Using a service level requires less attention
-   and removes the need of using SQL hints for this use case. Please, find more
-   information below in the service level and consistency section.
-  </para>
-  <para>
-   <example>
-    <title>Fighting replication lag</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Force use of master, master has always fresh and current data */
-if (!$mysqli->query(sprintf("/*%s*/SELECT critical_data FROM important_table", MYSQLND_MS_MASTER_SWITCH))) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   A use case may include the creation of tables on a slave.
-   If an SQL hint is not given, then the plugin will send <literal>CREATE</literal>
-   and <literal>INSERT</literal> statements to the master. Use the
-   SQL hint <constant>MYSQLND_MS_SLAVE_SWITCH</constant> if you want to
-   run any such statement on a slave, for example, to build temporary
-   reporting tables.
-  </para>
-  <para>
-   <example>
-    <title>Table creation on a slave</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Force use of slave */
-if (!$mysqli->query(sprintf("/*%s*/CREATE TABLE slave_reporting(id INT)", MYSQLND_MS_SLAVE_SWITCH))) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-/* Continue using this particular slave connection */
-if (!$mysqli->query(sprintf("/*%s*/INSERT INTO slave_reporting(id) VALUES (1), (2), (3)", MYSQLND_MS_LAST_USED_SWITCH))) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-/* Don't use MYSQLND_MS_SLAVE_SWITCH which would allow switching to another slave! */
-if ($res = $mysqli->query(sprintf("/*%s*/SELECT COUNT(*) AS _num FROM slave_reporting", MYSQLND_MS_LAST_USED_SWITCH))) {
-    $row = $res->fetch_assoc();
-    $res->close();
-    printf("There are %d rows in the table 'slave_reporting'", $row['_num']);
-} else {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The SQL hint <constant>MYSQLND_MS_LAST_USED</constant> forbids switching a
-   connection, and forces use of the previously used connection.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.quickstart.transactions">
-  <title>Local transactions</title>
-  <para>
-   The current version of the plugin is not transaction safe by default,
-   because it is not aware of running transactions in all cases. SQL transactions are
-   units of work to be run on a single server. The plugin does not always know
-   when the unit of work starts and when it ends. Therefore, the plugin may
-   decide to switch connections in the middle of a transaction.
-  </para>
-  <para>
-   No kind of MySQL load balancer can detect transaction boundaries without any
-   kind of hint from the application.
-  </para>
-  <para>
-   You can either use SQL hints to work around this limitation. Alternatively,
-   you can activate transaction API call monitoring. In the latter case you
-   must use API calls only to control transactions, see below.
-  </para>
-  <para>
-   <example>
-    <title>Plugin config with one slave and one master</title>
-    <programlisting role="ini">
-<![CDATA[
-[myapp]
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Using SQL hints for transactions</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Not a SELECT, will use master */
-if (!$mysqli->query("START TRANSACTION")) {
-    /* Please use better error handling in your code */
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Prevent connection switch! */
-if (!$mysqli->query(sprintf("/*%s*/INSERT INTO test(id) VALUES (1)", MYSQLND_MS_LAST_USED_SWITCH))) {
-    /* Please do proper ROLLBACK in your code, don't just die */
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-if ($res = $mysqli->query(sprintf("/*%s*/SELECT COUNT(*) AS _num FROM test", MYSQLND_MS_LAST_USED_SWITCH))) {
-    $row = $res->fetch_assoc();
-    $res->close();
-    if ($row['_num'] > 1000) {
-        if (!$mysqli->query(sprintf("/*%s*/INSERT INTO events(task) VALUES ('cleanup')", MYSQLND_MS_LAST_USED_SWITCH))) {
-            die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-        }
-    }
-} else {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-if (!$mysqli->query(sprintf("/*%s*/UPDATE log SET last_update = NOW()", MYSQLND_MS_LAST_USED_SWITCH))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-if (!$mysqli->query(sprintf("/*%s*/COMMIT", MYSQLND_MS_LAST_USED_SWITCH))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Starting with PHP 5.4.0, the <literal>mysqlnd</literal> library allows the
-   plugin to monitor the status of the <literal>autocommit</literal> mode, if
-   the mode is set by API calls instead of using SQL statements such as
-   <literal>SET AUTOCOMMIT=0</literal>. This makes it possible for the plugin to
-   become transaction aware. In this case, you do not need to use SQL hints.
-  </para>
-  <para>
-    If using PHP 5.4.0 or newer, API calls that enable <literal>autocommit</literal> mode,
-    and when setting the plugin configuration option
-    <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">trx_stickiness=master</link>,
-    the plugin can automatically disable load balancing and connection switches
-    for SQL transactions. In this configuration, the plugin stops load balancing
-    if <literal>autocommit</literal> is disabled and directs all statements to
-    the master. This prevents connection switches in the middle of
-    a transaction. Once <literal>autocommit</literal> is re-enabled, the plugin
-    starts to load balance statements again.
-  </para>
-   <para>
-   API based transaction boundary detection has been improved with PHP 5.5.0 and
-   <literal>PECL/mysqlnd_ms</literal> 1.5.0 to cover not only calls to <function>mysqli_autocommit</function>
-   but also <function>mysqli_begin</function>,
-   <function>mysqli_commit</function> and <function>mysqli_rollback</function>.
-  </para>
-  <para>
-   <example>
-    <title>Transaction aware load balancing: trx_stickiness setting</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-        "trx_stickiness": "master"
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Transaction aware</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Disable autocommit, plugin will run all statements on the master */
-$mysqli->autocommit(false);
-
-if (!$mysqli->query("INSERT INTO test(id) VALUES (1)")) {
-    /* Please do proper ROLLBACK in your code, don't just die */
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-if ($res = $mysqli->query("SELECT COUNT(*) AS _num FROM test")) {
-    $row = $res->fetch_assoc();
-    $res->close();
-    if ($row['_num'] > 1000) {
-        if (!$mysqli->query("INSERT INTO events(task) VALUES ('cleanup')")) {
-            die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-        }
-    }
-} else {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-if (!$mysqli->query("UPDATE log SET last_update = NOW()")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-if (!$mysqli->commit()) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Plugin assumes that the transaction has ended and starts load balancing again */
-$mysqli->autocommit(true);
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    The plugin configuration option
-    <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">trx_stickiness=master</link>
-    requires PHP 5.4.0 or newer.
-   </para>
-  </note>
-  <para>
-   Please note the restrictions outlined in the
-   <link linkend="mysqlnd-ms.transaction">transaction handling</link> concepts
-   section.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.quickstart.xa_transactions">
-  <title>XA/Distributed Transactions</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    XA related functions have been introduced in PECL mysqlnd_ms version 1.6.0-alpha.
-   </para>
-  </note>
-  <note>
-   <title>Early adaptors wanted</title>
-   <para>
-    The feature is currently under development. There may be issues and/or
-    feature limitations. Do not use in production environments, although
-    early lab tests indicate reasonable quality.
-   </para>
-   <para>
-     Please, contact the development team if you are interested in this feature.
-     We are looking for real life feedback to complement the feature.
-   </para>
-  </note>
-  <para>
-   XA transactions are a standardized method for executing transactions across
-   multiple resources. Those resources can be databases or other transactional
-   systems. The MySQL server supports XA SQL statements which allows users
-   to carry out a distributed SQL transaction that spawns multiple database servers
-   or any kind as long as they support the SQL statements too. In such a scenario
-   it is in the responsibility of the user to coordinate the participating
-   servers.
-  </para>
-  <para>
-   <literal>PECL/mysqlnd_ms</literal> can act as a transaction coordinator for a global (distributed, XA)
-   transaction carried out on MySQL servers only. As a transaction coordinator, the plugin
-   tracks all servers involved in a global transaction and transparently issues
-   appropriate SQL statements on the participants. The global transactions are controlled with
-   <function>mysqlnd_ms_xa_begin</function>, <function>mysqlnd_ms_xa_commit</function>
-   and <function>mysqlnd_ms_xa_rollback</function>. SQL details are mostly hidden from
-   the application as is the need to track and coordinate participants.
-  </para>
-  <para>
-   <example>
-    <title>General pattern for XA transactions</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* start a global transaction */
-$gtrid_id = "12345";
-if (!mysqlnd_ms_xa_begin($mysqli, $gtrid_id)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* run queries as usual: XA BEGIN will be injected upon running a query */
-if (!$mysqli->query("INSERT INTO orders(order_id, item) VALUES (1, 'christmas tree, 1.8m')")) {
-    /* Either INSERT failed or the injected XA BEGIN failed */
-    if ('XA' == substr($mysqli->sqlstate, 0, 2)) {
-        printf("Global transaction/XA related failure, [%d] %s\n", $mysqli->errno, $mysqli->error);
-    } else {
-        printf("INSERT failed, [%d] %s\n", $mysqli->errno, $mysqli->error);
-    }
-    /* rollback global transaction */
-    mysqlnd_ms_xa_rollback($mysqli, $xid);
-    die("Stopping.");
-}
-
-/* continue carrying out queries on other servers, e.g. other shards */
-
-/* commit the global transaction */
-if (!mysqlnd_ms_xa_commit($mysqli, $xa_id)) {
-    printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Unlike with local transactions, which are carried out on a single server,
-   XA transactions have an identifier (xid) associated with them.
-   The XA transaction identifier is  composed of a global transaction
-   identifier (gtrid), a branch qualifier (bqual)
-   a format identifier (formatID). Only the global transaction identifier can
-   and must be given when calling any of the plugins XA functions.
-  </para>
-  <para>
-   Once a global transaction has been started, the plugin begins tracking servers
-   until the global transaction ends. When a server is picked for query execution,
-   the plugin injects the SQL statement <literal>XA BEGIN</literal> prior to
-   executing the actual SQL statement on the server. <literal>XA BEGIN</literal>
-   makes the server participate in the global transaction. If the injected
-   SQL statement fails, the plugin will report the issue in reply to the query
-   execution function that was used. In the above example,
-   <literal>$mysqli->query("INSERT INTO orders(order_id, item) VALUES (1, 'christmas tree, 1.8m')")</literal>
-   would indicate such an error. You may want to check the errors SQL state code to
-   determine whether the actual query (here: <literal>INSERT</literal>) has failed
-   or the error is related to the global transaction. It is up to you to ignore the
-   failure to start the global transaction on a server and continue execution
-   without having the server participate in the global transaction.
-  </para>
-  <para>
-   <example>
-    <title>Local and global transactions are mutually exclusive</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* start a local transaction */
-if (!$mysqli->begin_transaction()) {
-    die(sprintf("[%d/%s] %s\n", $mysqli->errno, $mysqli->sqlstate, $mysqli->error));
-}
-
-/* cannot start global transaction now - must end local transaction first */
-$gtrid_id = "12345";
-if (!mysqlnd_ms_xa_begin($mysqli, $gtrid_id)) {
-    die(sprintf("[%d/%s] %s\n", $mysqli->errno, $mysqli->sqlstate, $mysqli->error));
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-
-Warning: mysqlnd_ms_xa_begin(): (mysqlnd_ms) Some work is done outside global transaction. You must end the active local transaction first in ... on line ...
-[1400/XAE09] (mysqlnd_ms) Some work is done outside global transaction. You must end the active local transaction first
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   A global transaction cannot be started when a local transaction is active.
-   The plugin tries to detect this situation as early as possible, that is when
-   <function>mysqlnd_ms_xa_begin</function> is called. If using API calls only to
-   control transactions, the plugin will know that a local transaction is open and
-   return an error for <function>mysqlnd_ms_xa_begin</function>. However, note the
-   plugins <link linkend="mysqlnd-ms.transaction">limitations on detecting
-   transaction boundaries.</link>. In the worst case, if using direct SQL
-   for local transactions (<literal>BEGIN</literal>,
-   <literal>COMMIT</literal>, ...), it may happen that an error is delayed
-   until some SQL is executed on a server.
-  </para>
-  <para>
-   To end a global transaction invoke <function>mysqlnd_ms_xa_commit</function> or
-   <function>mysqlnd_ms_xa_rollback</function>. When a global transaction is ended
-   all participants must be informed of the end. Therefore, PECL/mysqlnd_ms
-   transparently issues appropriate XA related SQL statements
-   on some or all of them. Any failure during this phase will cause an implicit
-   rollback. The XA related API is intentionally kept simple here. A more
-   complex API that gave more control would bare few, if any, advantages over
-   a user implementation that issues all lower level XA SQL statements itself.
-  </para>
-  <para>
-   XA transactions use the two-phase commit protocol. The two-phase commit
-   protocol is a blocking protocol. There are cases when no progress can
-   be made, not even when using timeouts. Transaction coordinators
-   should survive their own failure, be able to detect blockades and break ties.
-   <literal>PECL/mysqlnd_ms</literal> takes the role of a transaction coordinator and can be
-   configured to survive its own crash to avoid issues with blocked MySQL servers.
-   Therefore, the plugin can and should be configured to use a persistent and crash-safe state
-   to allow garbage collection of unfinished, aborted global transactions.
-   A global transaction can be aborted in an open state if either the plugin fails (crashes)
-   or a connection from the plugin to a global transaction participant fails.
-  </para>
-  <para>
-   <example>
-    <title>Transaction coordinator state store</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "xa": {
-            "state_store": {
-                "participant_localhost_ip": "192.168.2.12",
-                "mysql": {
-                    "host": "192.168.2.13",
-                    "user": "root",
-                    "password": "",
-                    "db": "test",
-                    "port": "3312",
-                    "socket": null
-                }
-            }
-        },
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.14",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Currently, <literal>PECL/mysqlnd_ms</literal> supports only using MySQL database tables
-   as a state store. The SQL definitions of the tables are given in the
-   <link linkend="ini.mysqlnd-ms-plugin-config-v2.xa">plugin configuration section.</link>
-   Please, make sure to use a transactional and crash-safe
-   storage engine for the tables, such as InnoDB. InnoDB is the default
-   table engine in recent versions of the MySQL server. Make also sure
-   the database server itself is highly available.
-  </para>
-  <para>
-   If a state store has been configured, the plugin can perform a garbage collection.
-   During garbage collection it may be necessary to connect to a participant
-   of a failed global transaction. Thus, the state store holds a list of participants
-   and, among others, their host names. If the garbage collection is run
-   on another host but the one that has written a participant entry with the
-   host name <literal>localhost</literal>, then <literal>localhost</literal>
-   resolves to different machines. There are two solutions to the problem.
-   Either you do not configure any servers with the host name <literal>localhost</literal> but
-   configure an IP address (and port) or, you hint the garbage collection.
-   In the above example, <literal>localhost</literal> is used for
-   <literal>master_0</literal>, hence it may not resolve to the correct
-   host during garbage collection. However, <literal>participant_localhost_ip</literal>
-   is also set to hint the garbage collection that <literal>localhost</literal>
-   stands for the IP <literal>192.168.2.12</literal>.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.quickstart.qos-consistency">
-  <title>Service level and consistency</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    Service levels have been introduced in PECL mysqlnd_ms version 1.2.0-alpha.
-    <function>mysqlnd_ms_set_qos</function>
-    is available with PHP 5.4.0 or newer.
-   </para>
-  </note>
-  <para>
-   Different types of MySQL cluster solutions offer different service and
-   data consistency levels to their users. An asynchronous MySQL replication cluster
-   offers eventual consistency by default. A read executed on an asynchronous slave
-   may return current, stale or no data at all, depending on whether the slave
-   has replayed all changesets from the master or not.
-  </para>
-  <para>
-   Applications using an MySQL replication cluster need to be designed to work
-   correctly with eventual consistent data. In some cases, however, stale data
-   is not acceptable. In those cases only certain slaves or even only master accesses are
-   allowed to achieve the required quality of service from the cluster.
-  </para>
-  <para>
-   As of PECL mysqlnd_ms 1.2.0 the plugin is capable of selecting
-   MySQL replication nodes automatically that deliver session consistency or
-   strong consistency. Session consistency means that one client can read its writes.
-   Other clients may or may not see the clients' write. Strong consistency means
-   that all clients will see all writes from the client.
-  </para>
-  <para>
-   <example>
-    <title>Session consistency: read your writes</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Requesting session consistency</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* read-write splitting: master used */
-if (!$mysqli->query("INSERT INTO orders(order_id, item) VALUES (1, 'christmas tree, 1.8m')")) {
-    /* Please use better error handling in your code */
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Request session consistency: read your writes */
-if (!mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_SESSION)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Plugin picks a node which has the changes, here: master */
-if (!$res = $mysqli->query("SELECT item FROM orders WHERE order_id = 1")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-var_dump($res->fetch_assoc());
-
-/* Back to eventual consistency: stale data allowed */
-if (!mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Plugin picks any slave, stale data is allowed */
-if (!$res = $mysqli->query("SELECT item, price FROM specials")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Service levels can be set in the plugins configuration file and at runtime
-   using <function>mysqlnd_ms_set_qos</function>.
-   In the example the function is used to enforce
-   session consistency (read your writes) for all future statements until further notice.
-   The <literal>SELECT</literal> statement on the <literal>orders</literal> table
-   is run on the master to ensure the previous write can be seen by the client.
-   Read-write splitting logic has been adapted to fulfill the service level.
-  </para>
-  <para>
-   After the application has read its changes from the <literal>orders</literal> table
-   it returns to the default service level, which is eventual consistency. Eventual
-   consistency puts no restrictions on choosing a node for statement execution.
-   Thus, the <literal>SELECT</literal> statement on the <literal>specials</literal>
-   table is executed on a slave.
-  </para>
-  <para>
-   The new functionality supersedes the use of SQL hints and the
-   <literal>master_on_write</literal> configuration option. In many cases
-   <function>mysqlnd_ms_set_qos</function> is easier to use, more powerful
-   improves portability.
-  </para>
-  <para>
-   <example>
-    <title>Maximum age/slave lag</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-        "failover" : "master"
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Limiting slave lag</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Read from slaves lagging no more than four seconds */
-$ret = mysqlnd_ms_set_qos(
-    $mysqli,
-    MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL,
-    MYSQLND_MS_QOS_OPTION_AGE,
-    4
-);
-
-if (!$ret) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Plugin picks any slave, which may or may not have the changes */
-if (!$res = $mysqli->query("SELECT item, price FROM daytrade")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Back to default: use of all slaves and masters permitted */
-if (!mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The eventual consistency service level can be used with an optional
-   parameter to set a maximum slave lag for choosing slaves. If set,
-   the plugin checks <literal>SHOW SLAVE STATUS</literal> for all
-   configured slaves. In case of the example, only slaves
-   for which <literal>Slave_IO_Running=Yes</literal>,
-   <literal>Slave_SQL_Running=Yes</literal> and
-   <literal>Seconds_Behind_Master &lt;= 4</literal>
-   is true are considered for executing the statement
-   <literal>SELECT item, price FROM daytrade</literal>.
-  </para>
-  <para>
-   Checking <literal>SHOW SLAVE STATUS</literal> is done transparently from
-   an applications perspective. Errors, if any, are reported as
-   warnings. No error will be set on the connection handle. Even if all
-   <literal>SHOW SLAVE STATUS</literal> SQL statements executed by
-   the plugin fail, the execution of the users statement is not stopped, given
-   that master fail over is enabled. Thus, no application changes are required.
-  </para>
-  <note>
-   <title>Expensive and slow operation</title>
-   <para>
-    Checking <literal>SHOW SLAVE STATUS</literal> for all slaves adds overhead
-    to the application. It is an expensive and slow background operation.
-    Try to minimize the use of it. Unfortunately, a MySQL replication cluster
-    does not give clients the possibility to request a list of candidates
-    from a central instance.
-    Thus, a more efficient way of checking the slaves lag is not available.
-   </para>
-   <para>
-    Please, note the limitations and properties of <literal>SHOW SLAVE STATUS</literal>
-    as explained in the MySQL reference manual.
-   </para>
-  </note>
-  <para>
-   To prevent mysqlnd_ms from emitting a warning if no slaves can be found
-   that lag no more than the defined number of seconds behind the master,
-   it is necessary to enable master fail over in the plugins configuration file.
-   If no slaves  can be found and fail over is turned on, the plugin
-   picks a master for  executing the statement.
-  </para>
-  <para>
-   If no slave can be found and fail over is turned off, the plugin emits
-   a warning, it does not execute the statement and it sets an error
-   on the connection.
-  </para>
-  <para>
-   <example>
-    <title>Fail over not set</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>No slave within time limit</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Read from slaves lagging no more than four seconds */
-$ret = mysqlnd_ms_set_qos(
-    $mysqli,
-    MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL,
-    MYSQLND_MS_QOS_OPTION_AGE,
-    4
-);
-
-if (!$ret) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Plugin picks any slave, which may or may not have the changes */
-if (!$res = $mysqli->query("SELECT item, price FROM daytrade")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-
-/* Back to default: use of all slaves and masters permitted */
-if (!mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-PHP Warning:  mysqli::query(): (mysqlnd_ms) Couldn't find the appropriate slave connection. 0 slaves to choose from. Something is wrong in %s on line %d
-PHP Warning:  mysqli::query(): (mysqlnd_ms) No connection selected by the last filter in %s on line %d
-[2000] (mysqlnd_ms) No connection selected by the last filter
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
- <section xml:id="mysqlnd-ms.quickstart.gtid">
-  <title>Global transaction IDs</title>
-  <note>
-   <title>Version requirement</title>
-   <para>
-    A client-side global transaction ID injection has been introduced in mysqlnd_ms version 1.2.0-alpha.
-    The feature is not required for synchronous clusters, such as MySQL Cluster.
-    Use it with asynchronous clusters such as classical MySQL replication.
-   </para>
-   <para>
-    As of MySQL 5.6.5-m8 release candidate the MySQL server features built-in global transaction identifiers.
-    The MySQL built-in global transaction ID feature is supported by <literal>PECL/mysqlnd_ms</literal> 1.3.0-alpha or
-    later. However, the final feature set found in MySQL 5.6 production releases to date is not
-    sufficient to support the ideas discussed below in all cases. Please, see also the
-    <link linkend="mysqlnd-ms.gtid">concepts section</link>.
-   </para>
-  </note>
-  <para>
-   <literal>PECL/mysqlnd_ms</literal> can either use its own global transaction ID emulation or the
-   global transaction ID feature built-in to MySQL 5.6.5-m8 or later. From a developer
-   perspective the client-side and server-side approach offer the same features with
-   regards to service levels provided by PECL/mysqlnd_ms. Their differences
-   are discussed in the <link linkend="mysqlnd-ms.gtid">concepts section</link>.
-  </para>
-  <para>
-   The quickstart first demonstrates the use of the client-side global transaction ID emulation
-   built-in to <literal>PECL/mysqlnd_ms</literal> before its show how to use the server-side counterpart.
-   The order ensures that the underlying idea is discussed first.
-  </para>
-  <para>
-   <emphasis role="bold">Idea and client-side emulation</emphasis>
-  </para>
-  <para>
-   In its most basic form a global transaction ID (GTID) is a counter in a table on the
-   master. The counter is incremented whenever a transaction is committed on the master.
-   Slaves replicate the table. The counter serves two purposes. In case of a
-   master failure, it helps the database administrator to identify the most recent slave
-   for promoting it to the new master. The most recent slave is the one with the
-   highest counter value. Applications can use the global transaction ID to search
-   for slaves which have replicated a certain write (identified by a global transaction ID)
-   already.
-  </para>
-  <para>
-   <literal>PECL/mysqlnd_ms</literal> can inject SQL for every committed transaction to increment a GTID counter.
-   The so created GTID is accessible by the application to identify an applications
-   write operation. This enables the plugin to deliver session consistency (read your writes)
-   service level by not only querying masters but also slaves which have replicated
-   the change already. Read load is taken away from the master.
-  </para>
-  <para>
-   Client-side global transaction ID emulation has some limitations. Please,
-   read the <link linkend="mysqlnd-ms.gtid">concepts section</link>
-   carefully to fully understand the principles and ideas
-   behind it, before using in production environments. The background knowledge
-   is not required to continue with the quickstart.
-  </para>
-  <para>
-   First, create a counter table on your master server and insert a record into it.
-   The plugin does not assist creating the table.
-   Database administrators must make sure it exists. Depending on the error
-   reporting mode, the plugin will silently ignore the lack of the table or bail out.
-  </para>
-  <para>
-   <example>
-    <title>Create counter table on master</title>
-    <programlisting role="sql">
-<![CDATA[
-CREATE TABLE `trx` (
-  `trx_id` int(11) DEFAULT NULL,
-  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-INSERT INTO `trx`(`trx_id`) VALUES (1);
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   In the plugins configuration file set the SQL to update the
-   global transaction ID table using <literal>on_commit</literal>
-   from the <literal>global_transaction_id_injection</literal>
-   section. Make sure the table name used for the <literal>UPDATE</literal>
-   statement is fully qualified. In the example,
-   <literal>test.trx</literal> is used to refer to table <literal>trx</literal>
-   in the schema (database) <literal>test</literal>. Use the table that was created in
-   the previous step. It is important to set the fully qualified table name
-   because the connection on which the injection is done may use a different
-   default database. Make sure the user that opens the connection
-   is allowed to execute the <literal>UPDATE</literal>.
-  </para>
-  <para>
-   Enable reporting of errors that may occur when mysqlnd_ms does global
-   transaction ID injection.
-  </para>
-  <para>
-   <example>
-    <title>Plugin config: SQL for client-side GTID injection</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-        "global_transaction_id_injection":{
-            "on_commit":"UPDATE test.trx SET trx_id = trx_id + 1",
-            "report_error":true
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Transparent global transaction ID injection</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("DROP TABLE IF EXISTS test")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("CREATE TABLE test(id INT)")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("INSERT INTO test(id) VALUES (1)")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* auto commit mode, read on slave, no increment */
-if (!($res = $mysqli->query("SELECT id FROM test"))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   The example runs three statements in auto commit mode on the master, causing
-   three transactions on the master. For every such statement, the plugin will
-   inject the configured <literal>UPDATE</literal> transparently before executing
-   the users SQL statement. When the script ends the global
-   transaction ID counter on the master has been incremented by three.
-  </para>
-  <para>
-   The fourth SQL statement executed in the example, a <literal>SELECT</literal>,
-   does not trigger an increment. Only transactions (writes) executed on a master
-   shall increment the GTID counter.
-  </para>
-  <note>
-   <title>SQL for global transaction ID: efficient solution wanted!</title>
-   <para>
-    The SQL used for the client-side global transaction ID emulation is inefficient.
-    It is optimized for clearity not for performance. Do not use it for production
-    environments. Please, help finding an efficient solution for inclusion in the manual.
-    We appreciate your input.
-   </para>
-  </note>
-  <para>
-   <example>
-    <title>Plugin config: SQL for fetching GTID</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-        "global_transaction_id_injection":{
-            "on_commit":"UPDATE test.trx SET trx_id = trx_id + 1",
-            "fetch_last_gtid" : "SELECT MAX(trx_id) FROM test.trx",
-            "report_error":true
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Obtaining GTID after injection</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("DROP TABLE IF EXISTS test")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-printf("GTID after transaction %s\n", mysqlnd_ms_get_last_gtid($mysqli));
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (!$mysqli->query("CREATE TABLE test(id INT)")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-printf("GTID after transaction %s\n", mysqlnd_ms_get_last_gtid($mysqli));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-GTID after transaction 7
-GTID after transaction 8
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   Applications can ask PECL mysqlnd_ms for a global transaction ID which
-   belongs to the last write operation performed by the application.
-   The function <function>mysqlnd_ms_get_last_gtid</function> returns the
-   GTID obtained when executing the SQL statement from
-   the <literal>fetch_last_gtid</literal> entry of the
-   <literal>global_transaction_id_injection</literal> section from
-   the plugins configuration file. The function may be called
-   after the GTID has been incremented.
-  </para>
-  <para>
-   Applications are adviced not to run the SQL
-   statement themselves as this bares the risk of accidentally causing an implicit
-   GTID increment. Also, if the function is used, it is easy to migrate
-   an application from one SQL statement for fetching a transaction ID to another,
-   for example, if any MySQL server ever features built-in global transaction ID support.
-  </para>
-  <para>
-   The quickstart shows a SQL statement which will return a GTID equal or greater
-   to that created for the previous statement. It is exactly the GTID created
-   for the previous statement if no other clients have incremented the GTID in the
-   time span between the statement execution and the <literal>SELECT</literal>
-   to fetch the GTID. Otherwise, it is greater.
-  </para>
-  <para>
-   <example>
-    <title>Plugin config: Checking for a certain GTID</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-        "global_transaction_id_injection":{
-            "on_commit":"UPDATE test.trx SET trx_id = trx_id + 1",
-            "fetch_last_gtid" : "SELECT MAX(trx_id) FROM test.trx",
-            "check_for_gtid" : "SELECT trx_id FROM test.trx WHERE trx_id >= #GTID",
-            "report_error":true
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Session consistency service level and GTID combined</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* auto commit mode, transaction on master, GTID must be incremented */
-if (   !$mysqli->query("DROP TABLE IF EXISTS test")
-    || !$mysqli->query("CREATE TABLE test(id INT)")
-    || !$mysqli->query("INSERT INTO test(id) VALUES (1)")
-) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* GTID as an identifier for the last write */
-$gtid = mysqlnd_ms_get_last_gtid($mysqli);
-
-/* Session consistency (read your writes): try to read from slaves not only master */
-if (false == mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_SESSION, MYSQLND_MS_QOS_OPTION_GTID, $gtid)) {
-    die(sprintf("[006] [%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Either run on master or a slave which has replicated the INSERT */
-if (!($res = $mysqli->query("SELECT id FROM test"))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   A GTID returned from <function>mysqlnd_ms_get_last_gtid</function>
-   can be used as an option for the session consistency service level.
-   Session consistency delivers read your writes. Session consistency can
-   be requested by calling
-   <function>mysqlnd_ms_set_qos</function>.
-   In the example, the plugin will execute the <literal>SELECT</literal>
-   statement either on the master or on a slave which has replicated
-   the previous <literal>INSERT</literal> already.
-  </para>
-  <para>
-   PECL mysqlnd_ms will transparently check every configured slave if
-   it has replicated the <literal>INSERT</literal> by checking the slaves
-   GTID table. The check is done running the SQL set with the
-   <literal>check_for_gtid</literal> option from the
-   <literal>global_transaction_id_injection</literal> section of
-   the plugins configuration file. Please note, that this is a slow and
-   expensive procedure. Applications should try to use it sparsely and only
-   if read load on the master becomes to high otherwise.
-  </para>
-  <para>
-   <emphasis role="bold">Use of the server-side global transaction ID feature</emphasis>
-  </para>
-  <note>
-   <title>Insufficient server support in MySQL 5.6</title>
-   <para>
-    The plugin has been developed against a pre-production version of MySQL 5.6.
-    It turns out that all released production versions of MySQL 5.6 do not provide
-    clients with enough information to enforce session consistency based on GTIDs.
-    Please, read the <link linkend="mysqlnd-ms.gtid">concepts section</link>
-    for details.
-   </para>
-  </note>
-  <para>
-   Starting with MySQL 5.6.5-m8 the MySQL Replication system features server-side
-   global transaction IDs. Transaction identifiers are automatically generated and
-   maintained by the server. Users do not need to take care of maintaining them.
-   There is no need to setup any tables in advance, or for setting
-   <literal>on_commit</literal>. A client-side emulation is no longer needed.
-  </para>
-  <para>
-    Clients can continue to use global transaction identifier to achieve
-    session consistency when reading from MySQL Replication slaves in some cases but not all!
-    The algorithm  works as described above. Different SQL statements must be configured for
-    <literal>fetch_last_gtid</literal> and <literal>check_for_gtid</literal>.
-    The statements are given below. Please note, MySQL 5.6.5-m8 is a development
-    version. Details of the server implementation may change in the future and require
-    adoption of the SQL statements shown.
-  </para>
-  <para>
-    Using the following configuration any of the above described functionality can
-    be used together with the server-side global transaction ID feature.
-    <function>mysqlnd_ms_get_last_gtid</function> and <function>mysqlnd_ms_set_qos</function>
-    continue to work as described above. The only difference is that the server
-    does not use a simple sequence number but a string containing of a server identifier
-    and a sequence number. Thus, users cannot easily derive an order from GTIDs returned
-    by <function>mysqlnd_ms_get_last_gtid</function>.
-  </para>
-  <para>
-   <example>
-    <title>Plugin config: using MySQL 5.6.5-m8 built-in GTID feature</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-        "global_transaction_id_injection":{
-            "fetch_last_gtid" : "SELECT @@GLOBAL.GTID_DONE AS trx_id FROM DUAL",
-            "check_for_gtid" : "SELECT GTID_SUBSET('#GTID', @@GLOBAL.GTID_DONE) AS trx_id FROM DUAL",
-            "report_error":true
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
- </section>
- <section xml:id="mysqlnd-ms.quickstart.cache">
-  <title>Cache integration</title>
-  <note>
-   <title>Version requirement, dependencies and status</title>
-   <para>
-    Please, find more about version requirements, extension load order dependencies and the current status
-    in the <link linkend="mysqlnd-ms.concept_cache">concepts section</link>!
-   </para>
-  </note>
-  <para>
-   Databases clusters can deliver different levels of consistency. As of
-   <literal>PECL/mysqlnd_ms</literal> 1.2.0 it is possible to advice the plugin to consider only
-   cluster nodes that can deliver the consistency level requested. For example,
-   if using asynchronous MySQL Replication with its cluster-wide eventual
-   consistency, it is possible to request session consistency (read your writes)
-   at any time using <function>mysqlnd_ms_set_quos</function>. Please, see also the
-   <link linkend="mysqlnd-ms.quickstart.qos-consistency">service level and consistency</link>
-   introduction.
-  </para>
-  <para>
-   <example>
-    <title>Recap: quality of service to request read your writes</title>
-    <programlisting role="php">
-/* Request session consistency: read your writes */
-if (!mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_SESSION))
-  die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-     </programlisting>
-   </example>
-  </para>
-  <para>
-   Assuming PECL/mysqlnd has been explicitly told to deliver no consistency level
-   higher than eventual consistency, it is possible to replace a database node
-   read access with a client-side cache using time-to-live (TTL) as its invalidation
-   strategy. Both the database node and the cache may or may not serve
-   current data as this is what eventual consistency defines.
-  </para>
-  <para>
-   Replacing a database node read access with a local cache access can improve
-   overall performance and lower the database load. If the cache entry is every
-   reused by other clients than the one creating the cache entry,
-   a database access is saved and thus database load is lowered. Furthermore,
-   system performance can become better if computation and delivery
-   of a database query is slower than a local cache access.
-  </para>
-  <para>
-   <example>
-    <title>Plugin config: no special entries for caching</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "127.0.0.1",
-                "port": "3306"
-            }
-        },
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Caching a slave request</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-if (   !$mysqli->query("DROP TABLE IF EXISTS test")
-    || !$mysqli->query("CREATE TABLE test(id INT)")
-    || !$mysqli->query("INSERT INTO test(id) VALUES (1)")
-) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Explicitly allow eventual consistency and caching (TTL <= 60 seconds) */
-if (false == mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL, MYSQLND_MS_QOS_OPTION_CACHE, 60)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* To make this example work, we must wait for a slave to catch up. Brute force style. */
-$attempts = 0;
-do {
-    /* check if slave has the table */
-    if ($res = $mysqli->query("SELECT id FROM test")) {
-        break;
-    } else if ($mysqli->errno) {
-        die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-    }
-    /* wait for slave to catch up */
-    usleep(200000);
-} while ($attempts++ < 10);
-
-/* Query has been run on a slave, result is in the cache */
-assert($res);
-var_dump($res->fetch_assoc());
-
-/* Served from cache */
-$res = $mysqli->query("SELECT id FROM test");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The example shows how to use the cache feature. First, you have to set
-   the quality of service to eventual consistency and explicitly allow for caching.
-   This is done by calling <function>mysqlnd_ms_set_qos</function>.
-   Then, the result set of every read-only statement is cached for upto that
-   many seconds as allowed with <function>mysqlnd_ms_set_qos</function>.
-  </para>
-  <para>
-   The actual TTL is lower or equal to the value set
-   with <function>mysqlnd_ms_set_qos</function>. The value passed to the
-   function sets the maximum age (seconds) of the data delivered. To calculate
-   the actual TTL value the replication lag on a slave is checked and subtracted
-   from the given value. If, for example, the maximum age is set to 60 seconds and
-   the slave reports a lag of 10 seconds the resulting TTL is 50 seconds.
-   The TTL is calculated individually for every cached query.
-  </para>
-  <para>
-   <example>
-    <title>Read your writes and caching combined</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-if (   !$mysqli->query("DROP TABLE IF EXISTS test")
-    || !$mysqli->query("CREATE TABLE test(id INT)")
-    || !$mysqli->query("INSERT INTO test(id) VALUES (1)")
-) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Explicitly allow eventual consistency and caching (TTL <= 60 seconds) */
-if (false == mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_EVENTUAL, MYSQLND_MS_QOS_OPTION_CACHE, 60)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* To make this example work, we must wait for a slave to catch up. Brute force style. */
-$attempts = 0;
-do {
-    /* check if slave has the table */
-    if ($res = $mysqli->query("SELECT id FROM test")) {
-        break;
-    } else if ($mysqli->errno) {
-        die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-    }
-    /* wait for slave to catch up */
-    usleep(200000);
-} while ($attempts++ < 10);
-
-assert($res);
-
-/* Query has been run on a slave, result is in the cache */
-var_dump($res->fetch_assoc());
-
-/* Served from cache */
-if (!($res = $mysqli->query("SELECT id FROM test"))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-var_dump($res->fetch_assoc());
-
-/* Update on master */
-if (!$mysqli->query("UPDATE test SET id = 2")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Read your writes */
-if (false == mysqlnd_ms_set_qos($mysqli, MYSQLND_MS_QOS_CONSISTENCY_SESSION)) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Fetch latest data */
-if (!($res = $mysqli->query("SELECT id FROM test"))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The quality of service can be changed at any time to avoid further cache usage.
-   If needed, you can switch to read your writes (session consistency). In that case,
-   the cache will not be used and fresh data is read.
-  </para>
- </section>
- <section xml:id="mysqlnd-ms.quickstart.failover">
-  <title>Failover</title>
-  <para>
-   By default, the plugin does not attempt to fail over if connecting to a host
-   fails. This prevents pitfalls related to
-   <link linkend="mysqlnd-ms.quickstart.connectionpooling">connection state</link>.
-   It is recommended to manually handle connection errors in a way similar to a failed
-   transaction. You should catch the error, rebuild the connection state and rerun your
-   query as shown below.
-  </para>
-  <para>
-   If connection state is no issue to you, you can alternatively enable automatic
-   and silent failover. Depending on the configuration, the automatic and silent failover
-   will either attempt to fail over to the master before issuing and error or, try to
-   connect to other slaves, given the query allowes for it, before attempting to connect
-   to a master. Because <link linkend="mysqlnd-ms.failover">automatic failover</link> is
-   not fool-proof, it is not discussed in the quickstart. Instead, details are given
-   in the concepts section below.
-  </para>
-  <para>
-   <example>
-    <title>Manual failover, automatic optional</title>
-    <programlisting role="ini">
-<![CDATA[
-  {
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "simulate_slave_failure",
-                "port": "0"
-            },
-            "slave_1": {
-                "host": "127.0.0.1",
-                "port": 3311
-            }
-        },
-       "filters": { "roundrobin": [] }
-    }
- }
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Manual failover</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-$sql = "SELECT 1 FROM DUAL";
-
-/* error handling as it should be done regardless of the plugin */
-if (!($res = $link->query($sql))) {
-    /* plugin specific: check for connection error */
-    switch ($link->errno) {
-    case 2002:
-    case 2003:
-    case 2005:
-        printf("Connection error - trying next slave!\n");
-        /* load balancer will pick next slave */
-        $res = $link->query($sql);
-        break;
-    default:
-        /* no connection error, failover is unlikely to help */
-        die(sprintf("SQL error: [%d] %s", $link->errno, $link->error));
-        break;
-    }
-}
-if ($res) {
-    var_dump($res->fetch_assoc());
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </section>
- <section xml:id="mysqlnd-ms.quickstart.partitioning">
-  <title>Partitioning and Sharding</title>
-  <para>
-   Database clustering is done for various reasons. Clusters can improve availability,
-   fault tolerance, and increase performance by applying a divide and conquer approach
-   as work is distributed over many machines. Clustering is sometimes combined with
-   partitioning and sharding to further break up a large complex task into
-   smaller, more manageable units.
-  </para>
-  <para>
-   The mysqlnd_ms plugin aims to support a wide variety of MySQL database clusters. Some flavors of
-   MySQL database clusters have built-in methods for partitioning and sharding,
-   which could be transparent to use. The plugin supports the two most
-   common approaches: MySQL Replication table filtering, and Sharding
-   (application based partitioning).
-  </para>
-  <para>
-   MySQL Replication supports partitioning as filters that allow you to
-   create slaves that replicate all or specific databases of the master, or tables.
-   It is then in the responsibility of the application
-   to choose a slave according to the filter rules. You can either use the
-   mysqlnd_ms <literal><link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-node-groups">node_groups</link></literal>
-   filter to manually support this, or use the experimental table filter.
- </para>
- <para>
-   Manual partitioning or sharding is supported through the
-   node grouping filter, and SQL hints as of 1.5.0. The node_groups filter
-   lets you assign a symbolic name to a group of master and slave servers.
-   In the example, the master <literal>master_0</literal> and <literal>slave_0</literal>
-   form a group with the name <literal>Partition_A</literal>. It is entirely
-   up to you to decide what makes up a group. For example, you may use node
-   groups for sharding, and use the group names to address shards
-   like <literal>Shard_A_Range_0_100</literal>.
- </para>
- <para>
-   <example>
-    <title>Cluster node groups</title>
-    <programlisting role="ini">
-<![CDATA[
- {
-  "myapp": {
-       "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "simulate_slave_failure",
-                "port": "0"
-            },
-            "slave_1": {
-                "host": "127.0.0.1",
-                "port": 3311
-            }
-        },
-        "filters": {
-            "node_groups": {
-                "Partition_A" : {
-                    "master": ["master_0"],
-                    "slave": ["slave_0"]
-                }
-            },
-           "roundrobin": []
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Manual partitioning using SQL hints</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function select($mysqli, $msg, $hint = '')
-{
-    /* Note: weak test, two connections to two servers may have the same thread id */
-    $sql = sprintf("SELECT CONNECTION_ID() AS _thread, '%s' AS _hint FROM DUAL", $msg);
-    if ($hint) {
-        $sql = $hint . $sql;
-    }
-    if (!($res = $mysqli->query($sql))) {
-        printf("[%d] %s", $mysqli->errno, $mysqli->error);
-        return false;
-    }
-    $row =  $res->fetch_assoc();
-    printf("%d - %s - %s\n", $row['_thread'], $row['_hint'], $sql);
-    return true;
-}
-
-$mysqli = new mysqli("myapp", "user", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* All slaves allowed */
-select($mysqli, "slave_0");
-select($mysqli, "slave_1");
-
-/* only servers of node group "Partition_A" allowed */
-select($mysqli, "slave_1", "/*Partition_A*/");
-select($mysqli, "slave_1", "/*Partition_A*/");
-?>
-]]>
-    </programlisting>
-    <screen>
-<![CDATA[
-6804 - slave_0 - SELECT CONNECTION_ID() AS _thread, 'slave1' AS _hint FROM DUAL
-2442 - slave_1 - SELECT CONNECTION_ID() AS _thread, 'slave2' AS _hint FROM DUAL
-6804 - slave_0 - /*Partition_A*/SELECT CONNECTION_ID() AS _thread, 'slave1' AS _hint FROM DUAL
-6804 - slave_0 - /*Partition_A*/SELECT CONNECTION_ID() AS _thread, 'slave1' AS _hint FROM DUAL
-]]>
-    </screen>
-   </example>
-  </para>
- <para>
-   By default, the plugin will use all configured master and slave servers for
-   query execution. But if a query begins with a SQL hint like
-   <literal>/*node_group*/</literal>, the plugin will only consider the servers
-   listed in the <literal>node_group</literal> for query execution. Thus,
-   <literal>SELECT</literal> queries prefixed with <literal>/*Partition_A*/</literal>
-   will only be executed on <literal>slave_0</literal>.
-  </para>
-
- </section>
-
-
- <section xml:id="mysqlnd-ms.quickstart.mysql_fabric">
-  <title>MySQL Fabric</title>
-  <note>
-   <title>Version requirement and status</title>
-   <para>
-    Work on supporting MySQL Fabric started in version 1.6. Please,
-    consider the support to be of pre-alpha quality. The manual may
-    not list all features or feature limitations. This is work in progress.
-   </para>
-   <para>
-    Sharding is the only use case supported by the plugin to date.
-   </para>
-  </note>
-   <note>
-   <title>MySQL Fabric concepts</title>
-   <para>
-    Please, check the MySQL reference manual for more information about MySQL Fabric
-    and how to set it up. The PHP manual assumes that you are familiar
-    with the basic concepts and ideas of MySQL Fabric.
-   </para>
-  </note>
-  <para>
-   MySQL Fabric is a system for managing farms of MySQL servers to achive
-   High Availability and optionally support sharding. Technically, it is a
-   middleware to manage and monitor MySQL servers.
-  </para>
-  <para>
-   Clients query MySQL Fabric to obtain lists of MySQL servers,
-   their state and their roles. For example, clients can request a list of
-   slaves for a MySQL Replication group and whether they are ready to
-   handle SQL requests. Another example is a cluster of sharded MySQL servers
-   where the client seeks to know which shard to query for a given
-   table and shard key. If configured to use Fabric, the plugin uses XML RCP over HTTP
-   to obtain the list at runtime from a MySQL Fabric host. The XML remote
-   procedure call itself is done in the background and transparent from a
-   developers point of view.
-  </para>
-  <para>
-   Instead of listing MySQL servers directly in the plugins configuration file
-   it contains a list of one or more MySQL Fabric hosts
-  </para>
-    <para>
-   <example>
-    <title>Plugin config: Fabric hosts instead of MySQL servers</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "fabric": {
-            "hosts": [
-                {
-                    "host" : "127.0.0.1",
-                    "port" : 8080
-                }
-            ]
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Users utilize the new functions
-   <function>mysqlnd_ms_fabric_select_shard</function> and
-   <function>mysqlnd_ms_fabric_select_global</function> to switch to
-   the set of servers responsible for a given shard key. Then, the
-   plugin picks an appropriate server for running queries on.
-   When doing so, the plugin takes care of additional
-   load balancing rules set.
-  </para>
-  <para>
-   The below example assumes that MySQL Fabric has been setup
-   to shard the table <literal>test.fabrictest</literal> using
-   the <literal>id</literal> column of the table as a shard key.
-  </para>
-  <para>
-   <example>
-    <title>Manual partitioning using SQL hints</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "user", "password", "database");
-if (!$mysqli) {
-    /* Of course, your error handling is nicer... */
-    die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-}
-
-/* Create a global table - a table available on all shards */
-mysqlnd_ms_fabric_select_global($mysqli, "test.fabrictest");
-if (!$mysqli->query("CREATE TABLE test.fabrictest(id INT NOT NULL PRIMARY KEY)")) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Switch connection to appropriate shard and insert record */
-mysqlnd_ms_fabric_select_shard($mysqli, "test.fabrictest", 10);
-if (!($res = $mysqli->query("INSERT INTO fabrictest(id) VALUES (10)"))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-
-/* Try to read newly inserted record */
-mysqlnd_ms_fabric_select_shard($mysqli, "test.fabrictest", 10);
-if (!($res = $mysqli->query("SELECT id FROM test WHERE id = 10"))) {
-    die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The example creates the sharded table, inserts a record and reads
-   the record thereafter. All SQL data definition language (DDL)
-   operations on a sharded table  must be applied to the so called global server group.
-   Prior to creating or altering a sharded table,
-   <function>mysqlnd_ms_fabric_select_global</function> is called
-   to switch the given connection to the corresponding servers of the global
-   group. Data manipulation (DML) SQL statements must be sent to the shards
-   directly. The <link linkend="function.mysqlnd-ms-fabric-select-shard">
-   <function>mysqlnd_ms_fabric_select_shard</function></link> switches a
-   connection to shards handling a certain shard key.
-  </para>
-
-
- </section>
-</chapter>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/reference.xml b/reference/mysqlnd_ms/reference.xml
deleted file mode 100644
index 3b444a72c4..0000000000
--- a/reference/mysqlnd_ms/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mysqlnd-ms" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd_ms &Functions;</title>
-
- &reference.mysqlnd-ms.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/setup.xml b/reference/mysqlnd_ms/setup.xml
deleted file mode 100644
index e59d2a63ae..0000000000
--- a/reference/mysqlnd_ms/setup.xml
+++ /dev/null
@@ -1,3776 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-ms.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mysqlnd-ms.requirements">
-  &reftitle.required;
-  <para>
-    <literal>PHP 5.3.6</literal> or newer.
-    Some advanced functionality requires <literal>PHP 5.4.0</literal> or newer.
-  </para>
-  <para>
-   The <literal>mysqlnd_ms</literal> replication and load balancing
-   plugin supports all PHP applications and all available PHP MySQL extensions
-   (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>).
-   The PHP MySQL extension must be configured to use
-   <link linkend="book.mysqlnd">mysqlnd</link>  in order to be able
-   to use the <literal>mysqlnd_ms</literal> plugin for
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
- </section>
-
- &reference.mysqlnd-ms.configure;
- &reference.mysqlnd-ms.ini;
-
- <section xml:id="mysqlnd-ms.plugin-ini-json">
-  <title xmlns="http://docbook.org/ns/docbook">Plugin configuration file (&gt;=1.1.x)</title>
-
-  <para>
-   The following documentation applies to PECL/mysqlnd_ms &gt;= 1.1.0-beta.
-   It is not valid for prior versions. For documentation covering earlier
-   versions, see the configuration documentation
-   for <link linkend="mysqlnd-ms.plugin-ini-v1">mysqlnd_ms 1.0.x and below</link>.
-  </para>
-
-  <section xml:id="mysqlnd-ms.plugin-ini-json-introduction">
-   <title>Introduction</title>
-
-
-   <note>
-    <title>Changelog: Feature was added in PECL/mysqlnd_ms 1.1.0-beta</title>
-    <para>
-     The below description applies to PECL/mysqlnd_ms &gt;= 1.1.0-beta.
-     It is not valid for prior versions.
-    </para>
-   </note>
-
-  <para>
-   The plugin uses its own configuration file. The configuration file
-   holds information about the MySQL replication master server,
-   the MySQL replication slave servers, the server pick (load balancing) policy,
-   the failover strategy, and the use of lazy connections.
-  </para>
-  <para>
-   The plugin loads its configuration file at the beginning of a web request.
-   It is then cached in memory and used for the duration of the web request.
-   This way, there is no need to restart PHP after deploying the configuration
-   file. Configuration file changes will become active almost instantly.
-  </para>
-  <para>
-   The PHP configuration directive
-   <link linkend="ini.mysqlnd-ms.config-file"><literal>mysqlnd_ms.config_file</literal></link>
-   is used to set the plugins configuration file. Please note, that
-   the PHP configuration directive may not be evaluated for every web request.
-   Therefore, changing the plugins configuration file name or location may
-   require a PHP restart. However, no restart is required to read changes if
-   an already existing plugin configuration file is updated.
-  </para>
-  <para>
-   Using and parsing <acronym>JSON</acronym> is efficient, and using <acronym>JSON</acronym>
-   makes it easier to express hierarchical data structures than the standard
-   <filename>php.ini</filename> format.
-  </para>
-  <para>
-   <example>
-    <title>Converting a PHP array (hash) into JSON format</title>
-    <para>
-     Or alternatively, a developer may be more familiar with the PHP <type>array</type>
-     syntax, and prefer it. This example demonstrates how a developer might convert a
-     PHP array to <acronym>JSON</acronym>.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-  "myapp" => array(
-    "master" => array(
-      "master_0" => array(
-        "host"   => "localhost",
-        "socket" => "/tmp/mysql.sock",
-      ),
-    ),
-    "slave" => array(),
-  ),
-);
-
-file_put_contents("mysqlnd_ms.ini", json_encode($config, JSON_PRETTY_PRINT));
-printf("mysqlnd_ms.ini file created...\n");
-printf("Dumping file contents...\n");
-printf("%s\n", str_repeat("-", 80));
-echo file_get_contents("mysqlnd_ms.ini");
-printf("\n%s\n", str_repeat("-", 80));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-mysqlnd_ms.ini file created...
-Dumping file contents...
---------------------------------------------------------------------------------
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": [
-
-        ]
-    }
-}
---------------------------------------------------------------------------------
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   A plugin configuration file consists of one or more sections. Sections
-   are represented by the top-level object properties of the
-   object encoded in the <acronym>JSON</acronym> file. Sections could also
-   be called <emphasis>configuration names</emphasis>.
-  </para>
-  <para>
-   Applications reference sections by their name. Applications use section names
-   as the host (server) parameter to the various connect methods of the
-   <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link> and
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions. Upon connect,
-   the <link linkend="book.mysqlnd">mysqlnd</link> plugin compares the hostname
-   with all of the section names from the plugin configuration file. If the hostname and
-   section name match, then the plugin will load the settings for that section.
-  </para>
-  <para xml:id="mysqlnd-ms.plugin-ini-json.using-section">
-   <example>
-    <title>Using section names example</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27"
-            },
-            "slave_1": {
-                "host": "192.168.2.27",
-                "port": 3306
-            }
-        }
-    },
-    "localhost": {
-        "master": [
-            {
-                "host": "localhost",
-                "socket": "\/path\/to\/mysql.sock"
-            }
-        ],
-        "slave": [
-            {
-                "host": "192.168.3.24",
-                "port": "3305"
-            },
-            {
-                "host": "192.168.3.65",
-                "port": "3309"
-            }
-        ]
-    }
-}
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* All of the following connections will be load balanced */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-$pdo = new PDO('mysql:host=myapp;dbname=database', 'username', 'password');
-$mysql = mysql_connect("myapp", "username", "password");
-
-$mysqli = new mysqli("localhost", "username", "password", "database");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Section names are strings. It is valid to use a section name such as
-   <literal>192.168.2.1</literal>, <literal>127.0.0.1</literal> or
-   <literal>localhost</literal>. If, for example, an application
-   connects to <literal>localhost</literal> and a plugin
-   configuration section <literal>localhost</literal> exists, the
-   semantics of the connect operation are changed. The application will
-   no longer only use the MySQL server running on the host
-   <literal>localhost</literal>, but the plugin will start to load balance
-   MySQL queries following the rules from the <literal>localhost</literal>
-   configuration section. This way you can load balance queries from
-   an application without changing the applications source code.
-   Please keep in mind, that such a configuration may not contribute
-   to overall readability of your applications source code. Using section names
-   that can be mixed up with host names should be seen as a last resort.
-  </para>
-  <para xml:id="mysqlnd-ms.plugin-ini-json.server-list-syntax">
-   Each configuration section contains, at a minimum, a list of master servers
-   and a list of slave servers. The master list is configured with the keyword
-   <literal>master</literal>, while the slave list is configured with the
-   <literal>slave</literal> keyword. Failing to provide a slave list will result
-   in a fatal <constant>E_ERROR</constant> level error, although a slave list
-   may be empty. It is possible to allow no slaves. However, this is only recommended
-   with synchronous clusters, please see also
-   <link linkend="mysqlnd-ms.supportedclusters">supported clusters</link>.
-   The main part of the documentation focusses on the use
-   of asynchronous MySQL replication clusters.
-  </para>
-  <para>
-   The master and slave server lists can be optionally indexed by symbolic
-   names for the servers they describe. Alternatively, an array of descriptions
-   for slave and master servers may be used.
-  </para>
-  <para>
-   <example>
-    <title>List of anonymous slaves</title>
-        <programlisting role="ini">
-<![CDATA[
-"slave": [
-    {
-        "host": "192.168.3.24",
-        "port": "3305"
-    },
-    {
-        "host": "192.168.3.65",
-        "port": "3309"
-    }
-]
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   An anonymous server list is encoded by the <literal>JSON array</literal> type.
-   Optionally, symbolic names may be used for indexing the slave or master servers
-   of a server list, and done so using the <literal>JSON object</literal> type.
-  </para>
-  <para>
-   <example>
-    <title>Master list using symbolic names</title>
-        <programlisting role="ini">
-<![CDATA[
-"master": {
-    "master_0": {
-        "host": "localhost"
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   It is recommended to index the server lists with symbolic server names.
-   The alias names will be shown in error messages.
-  </para>
-  <para>
-   The order of servers is preserved and taken into account by mysqlnd_ms.
-   If, for example, you configure round robin load balancing strategy, the
-   first <literal>SELECT</literal> statement will be executed on the
-   slave that appears first in the slave server list.
-  </para>
-  <para>
-   A configured server can be described with the <literal>host</literal>,
-   <literal>port</literal>, <literal>socket</literal>, <literal>db</literal>,
-   <literal>user</literal>, <literal>password</literal> and <literal>connect_flags</literal>.
-   It is mandatory to set the database server host using the <literal>host</literal>
-   keyword. All other settings are optional.
-  </para>
-  <para>
-   <example>
-    <title>Keywords to configure a server</title>
-    <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "db_server_host",
-                "port": "db_server_port",
-                "socket": "db_server_socket",
-                "db": "database_resp_schema",
-                "user": "user",
-                "password": "password",
-                "connect_flags": 0
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "db_server_host",
-                "port": "db_server_port",
-                "socket": "db_server_socket"
-            }
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   If a setting is omitted, the plugin will use the value provided by the user
-   API call used to open a connection. Please, see the
-   <link linkend="mysqlnd-ms.plugin-ini-json.using-section">using section names example</link> above.
-  </para>
-  <para>
-   The configuration file format has been changed in version 1.1.0-beta to allow for
-   chained filters. Filters are responsible for filtering the configured list of
-   servers to identify a server for execution of a given statement.
-   Filters are configured with the <literal>filter</literal> keyword. Filters
-   are executed by mysqlnd_ms in the order of their appearance.
-   Defining filters is optional. A configuration section in the plugins
-   configuration file does not need to have a <literal>filters</literal> entry.
-  </para>
-  <para>
-   Filters replace the
-   <link linkend="ini.mysqlnd-ms-plugin-config.pick"><literal>pick[]</literal></link>
-   setting from prior versions. The new <literal>random</literal> and
-   <literal>roundrobin</literal> provide the same functionality.
-  </para>
-  <para>
-   <example>
-    <title>New <literal>roundrobin</literal> filter, old functionality</title>
-    <programlisting role="ini">
-<![CDATA[
-   {
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            },
-            "slave_1": {
-                "host": "192.168.78.137",
-                "port": "3306"
-            }
-        },
-        "filters": {
-            "roundrobin": [
-
-            ]
-        }
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The function
-   <function>mysqlnd_ms_set_user_pick_server</function>
-   has been removed. Setting a callback is now done with the <literal>user</literal>
-   filter. Some filters accept parameters. The <literal>user</literal> filter
-   requires and accepts a mandatory <literal>callback</literal> parameter
-   to set the callback previously set through the function <function>mysqlnd_ms_set_user_pick_server</function>.
-   <example>
-    <title>The <literal>user</literal> filter replaces <function>mysqlnd_ms_set_user_pick_server</function></title>
-    <programlisting role="ini">
-<![CDATA[
-"filters": {
-    "user": {
-        "callback": "pick_server"
-    }
-}
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para xml:id="mysqlnd-ms.plugin-ini-json.debug_config">
-   The validity of the configuration file is checked both when reading the
-   configuration file and later when establishing a connection. The configuration
-   file is read during PHP request startup. At this early stage a PHP extension
-   may not display error messages properly. In the worst case, no error
-   is shown and a connection attempt fails without an adequate error message.
-   This problem has been cured in version 1.5.0.
-  </para>
-  <para>
-   <example>
-    <title>Common error message in case of configuration file issues (upto version 1.5.0)</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Warning: mysqli::mysqli(): (mysqlnd_ms) (mysqlnd_ms) Failed to parse config file [s1.json]. Please, verify the JSON in Command line code
-
-Warning: mysqli::mysqli(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: Name or service not known in Command line code on line 1
-
-Warning: mysqli::query(): Couldn't fetch mysqli in Command line code on line 1
-
-Fatal error: Call to a member function fetch_assoc() on a non-object in Command line code on line 1
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   Since version 1.5.0 startup errors are additionally buffered and emitted when
-   a connection attempt is made. Use the configuration directive
-   <link linkend="ini.mysqlnd-ms.force-config-usage"><literal>mysqlnd_ms.force_config_usage</literal></link>
-   to set the error type used to display buffered errors. By default an error
-   of type <literal>E_WARNING</literal> will be emitted.
- </para>
-  <para>
-   <example>
-    <title>Improved configuration file validation since 1.5.0</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Warning: mysqli::mysqli(): (mysqlnd_ms) (mysqlnd_ms) Failed to parse config file [s1.json]. Please, verify the JSON in Command line code on line 1
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   It can be useful to set <link linkend="ini.mysqlnd-ms.force-config-usage"><literal>mysqlnd_ms.force_config_usage = 1</literal></link>
-   when debugging potential configuration file errors. This will not only turn the
-   type of buffered startup errors into <literal>E_RECOVERABLE_ERROR</literal> but also
-   help detecting misspelled section names.
-  </para>
-  <para>
-   <example>
-    <title>Possibly more precise error due to <literal>mysqlnd_ms.force_config_usage=1</literal></title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.force_config_usage=1
-]]>
-    </programlisting>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("invalid_section", "username", "password", "database");
-?>
-]]>
-    </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-Warning: mysqli::mysqli(): (mysqlnd_ms) Exclusive usage of configuration enforced but did not find the correct INI file section (invalid_section) in Command line code on line 1 line 1
-]]>
-    </screen>
-
-   </example>
-  </para>
-  </section>
-
-  <section xml:id="mysqlnd-ms.plugin-ini-json-reference">
-   <title>Configuration Directives</title>
-
-  <para>
-   Here is a short explanation of the configuration directives that can be used.
-  </para>
-  <para>
-  <variablelist>
-   <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.master">
-     <term>
-      <parameter>master</parameter>
-      <type>array or object</type>
-     </term>
-     <listitem>
-      <para>
-       List of MySQL replication master servers. The list of either
-       of the <literal>JSON type array</literal> to declare an anonymous list
-       of servers or of the <literal>JSON type object</literal>. Please,
-       see <link linkend="mysqlnd-ms.plugin-ini-json.server-list-syntax">above</link>
-       for examples.
-      </para>
-      <para>
-       Setting at least one master server is mandatory. The plugin will issue an
-       error of type <literal>E_ERROR</literal> if the user has failed to
-       provide a master server list for a configuration section.
-       The fatal error may read
-       <literal>(mysqlnd_ms) Section [master] doesn't exist for host
-       [name_of_a_config_section] in %s on line %d</literal>.
-      </para>
-      <para>
-       A server is described with
-       the <literal>host</literal>, <literal>port</literal>,
-       <literal>socket</literal>, <literal>db</literal>,
-       <literal>user</literal>, <literal>password</literal> and
-       <literal>connect_flags</literal>. It is mandatory to
-       provide at  a value for <literal>host</literal>. If any of the
-       other values is not given, it will be taken from the user
-       API connect call, please, see also:
-       <link linkend="mysqlnd-ms.plugin-ini-json.using-section">using section names example</link>.
-      </para>
-      <para xml:id="mysqlnd-ms.plugin-ini-json.server-config-keywords">
-       Table of server configuration keywords.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-           <entry>
-             <literal>host</literal>
-           </entry>
-           <entry>
-            <para>
-             Database server host. This is a mandatory setting.
-             Failing to provide, will cause an error of type <literal>E_RECOVERABLE_ERROR</literal>
-             when the plugin tries to connect to the server. The error message may
-             read <literal>(mysqlnd_ms) Cannot find [host] in
-             [%s] section in config in %s on line %d</literal>.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>port</literal>
-           </entry>
-           <entry>
-            <para>
-              Database server TCP/IP port.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>socket</literal>
-           </entry>
-           <entry>
-            <para>
-              Database server Unix domain socket.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>db</literal>
-           </entry>
-           <entry>
-            <para>
-              Database (schemata).
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>user</literal>
-           </entry>
-           <entry>
-            <para>
-              MySQL database user.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>password</literal>
-           </entry>
-           <entry>
-            <para>
-              MySQL database user password.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>connect_flags</literal>
-           </entry>
-           <entry>
-            <para>
-              Connection flags.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-      <para>
-       The plugin supports using only one master server. An experimental
-       setting exists to enable multi-master support. The details are
-       not documented. The setting is meant for development only.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.slave">
-    <term>
-      <parameter>slave</parameter>
-      <type>array or object</type>
-     </term>
-     <listitem>
-      <para>
-       List of one or more MySQL replication slave servers. The syntax is
-       identical to setting master servers, please, see
-       <link linkend="ini.mysqlnd-ms-plugin-config-v2.master"><literal>master</literal></link>
-       above for details.
-      </para>
-      <para>
-       The plugin supports using one or more slave servers.
-      </para>
-      <para>
-       Setting a list of slave servers is mandatory. The plugin will report
-       an error of the type <literal>E_ERROR</literal> if <literal>slave</literal>
-       is not given for a configuration section. The fatal error message may read
-       <literal>(mysqlnd_ms) Section [slave] doesn't exist for host [%s] in %s on line %d</literal>.
-       Note, that it is valid to use an empty slave server list.
-       The error has been introduced to prevent accidentally setting no slaves by
-       forgetting about the <literal>slave</literal> setting.
-       A master-only setup is still possible using an empty slave server list.
-      </para>
-      <para>
-       If an empty slave list is configured and an attempt is made to
-       execute a statement on a slave the plugin may emit a warning like
-       <literal>mysqlnd_ms) Couldn't find the appropriate slave connection.
-       0 slaves to choose from.</literal> upon statement execution.
-       It is possible that another warning follows such as
-       <literal>(mysqlnd_ms) No connection selected by the last filter</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.gtid">
-     <term>
-      <parameter>global_transaction_id_injection</parameter>
-      <type>array or object</type>
-     </term>
-     <listitem>
-      <para>
-       Global transaction identifier configuration related to both
-       the use of the server built-in global transaction ID feature and
-       the client-side emulation.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-            <literal>fetch_last_gtid</literal>
-          </entry>
-          <entry>
-           <para>
-            SQL statement for accessing the latest global transaction identifier.
-            The SQL statement is run if the plugin needs to know the most recent
-            global transaction identifier. This can be the case, for example, when checking
-            MySQL Replication slave status.
-            Also used with <function>mysqlnd_ms_get_last_gtid</function>.
-           </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-         </row>
-         <row>
-          <entry>
-            <literal>check_for_gtid</literal>
-          </entry>
-          <entry>
-           <para>
-            SQL statement for checking if a replica has replicated
-            all transactions up to and including ones searched for. The
-            SQL statement is run when searching for replicas which can offer
-            a higher level of consistency than eventual consistency.
-            The statement must contain a placeholder <literal>#GTID</literal>
-            which is to be replaced with the global transaction identifier searched
-            for by the plugin. Please, check the
-            <link linkend="mysqlnd-ms.quickstart.gtid">quickstart</link> for examples.
-           </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-         </row>
-         <row>
-          <entry>
-            <literal>report_errors</literal>
-          </entry>
-          <entry>
-           <para>
-            Whether to emit an error of type warning if an issue occurs while
-            executing any of the configured SQL statements.
-           </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-         </row>
-         <row>
-          <entry>
-           <literal>on_commit</literal>
-          </entry>
-          <entry>
-           <para>
-            Client-side global transaction ID emulation only. SQL statement
-            to run when a transaction finished to update the global transaction
-            identifier sequence number on the master. Please, see the
-            <link linkend="mysqlnd-ms.quickstart.gtid">quickstart</link> for examples.
-           </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-          </row>
-         <row>
-          <entry>
-           <literal>wait_for_gtid_timeout</literal>
-          </entry>
-          <entry>
-           <para>
-            Instructs the plugin to wait up to <literal>wait_for_gtid_timeout</literal>
-            seconds for a slave to catch up when searching for slaves that can
-            deliver session consistency. The setting limits the time spend for
-            polling the slave status. If polling the status takes very long, the total
-            clock time spend waiting may exceed <literal>wait_for_gtid_timeout</literal>.
-            The plugin calls <literal>sleep(1)</literal> to sleep one second between
-            each two polls.
-           </para>
-           <para>
-            The setting can be used both with the plugins client-side emulation
-            and the server-side global transaction identifier feature of MySQL 5.6.
-           </para>
-           <para>
-            Waiting for a slave to replicate a certain GTID needed for session
-            consistency also means throttling the client. By throttling the
-            client the write load on the master is reduced indirectly. A
-            primary copy based replication system, such as MySQL Replication,
-            is given more time to reach a consistent state. This can be desired,
-            for example, to increase the number of data copies for
-            high availability considerations or to prevent the master from being
-            overloaded.
-           </para>
-          </entry>
-          <entry>Since 1.4.0.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </informaltable>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.fabric">
-     <term>
-      <parameter>fabric</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-        MySQL Fabric related settings. If the plugin is used together with MySQL
-        Fabric, then the plugins configuration file no longer contains lists of MySQL servers.
-        Instead, the plugin will ask MySQL Fabric which list of servers to use to
-        perform a certain task.
-      </para>
-      <para>
-        A minimum plugin configuration for use with MySQL Fabric contains a list
-        of one or more MySQL Fabric hosts that the plugin can query. If more
-        than one MySQL Fabric host is  configured, the plugin will use a roundrobin
-        strategy to choose among them. Other strategies are currently not available.
-      </para>
-      <para>
-       <example>
-        <title>Minimum pluging configuration for use with MySQL Fabric</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "fabric": {
-            "hosts": [
-                {
-                    "host" : "127.0.0.1",
-                    "port" : 8080
-                }
-            ]
-        }
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       Each MySQL Fabric host is described using a JSON object with the following
-       members.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-            <literal>host</literal>
-          </entry>
-          <entry>
-           <para>
-            Host name of the MySQL Fabric host.
-           </para>
-          </entry>
-          <entry>Since 1.6.0.</entry>
-         </row>
-         <row>
-          <entry>
-            <literal>port</literal>
-          </entry>
-          <entry>
-           <para>
-            The TCP/IP port on which the MySQL Fabric host listens
-            for remote procedure calls sent by clients such as
-            the plugin.
-           </para>
-          </entry>
-          <entry>Since 1.6.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-      <para>
-       The plugin is using PHP streams to communicate with MySQL Fabric
-       through XML RPC over HTTP. By default no timeouts are set
-       for the network communication. Thus, the plugin defaults to PHP
-       stream default timeouts. Those defaults are out of control of
-       the plugin itself.
-      </para>
-      <para>
-        An optional timeout value can be set to overrule the PHP streams
-        default timeout setting. Setting the timeout in the plugins
-        configuration file has the same effect as
-        setting a timeout for a PHP user space HTTP connection established
-        through PHP streams.
-      </para>
-      <para>
-       The plugins Fabric timeout value unit is seconds. The allowed value
-       range is from 0 to 65535. The setting exists since version 1.6.
-      </para>
-      <para>
-       <example>
-        <title>Optional timeout for communication with Fabric</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "fabric": {
-            "hosts": [
-                {
-                    "host" : "127.0.0.1",
-                    "port" : 8080
-                }
-            ],
-            "timeout": 2
-        }
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">Transaction stickiness</link>
-       and MySQL Fabric logic can collide. The stickiness option disables switching
-       between servers for the duration of a transaction. When using Fabric and
-       sharding the user may (erroneously) start a local transaction on one share and
-       then attempt to switch to a different shard using either
-       <function>mysqlnd_ms_fabric_select_shard</function> or
-       <function>mysqlnd_ms_fabric_select_global</function>. In this case, the
-       plugin will not reject the request to switch servers in the middle of a transaction
-       but allow the user to switch to another server regardless of the transaction
-       stickiness setting used. It is clearly a user error to write such code.
-      </para>
-      <para>
-       If transaction stickiness is enabled and you would like to get an error of type
-       warning when calling <function>mysqlnd_ms_fabric_select_shard</function> or
-       <function>mysqlnd_ms_fabric_select_global</function>,
-       set the boolean flag <literal>trx_warn_server_list_changes</literal>.
-      </para>
-      <para>
-       <example>
-        <title>Warnings about the violation of transaction boundaries</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "fabric": {
-            "hosts": [
-                {
-                    "host" : "127.0.0.1",
-                    "port" : 8080
-                }
-            ],
-            "trx_warn_serverlist_changes": 1
-        },
-        "trx_stickiness": "on"
-    }
-}
-]]>
-        </programlisting>
-        <programlisting role="php">
-<![CDATA[
-<?php
-$link = new mysqli("myapp", "root", "", "test");
-/*
-  For the demo the call may fail.
-  Failed or not we get into the state
-  needed for the example.
-*/
-@mysqlnd_ms_fabric_select_global($link, 1);
-$link->begin_transaction();
-@$link->query("DROP TABLE IF EXISTS test");
-/*
-  Switching servers/shards is a mistake due to open
-  local transaction!
-*/
-mysqlnd_ms_select_global($link, 1);
-?>
-]]>
-         </programlisting>
-         &example.outputs;
-        <screen>
-<![CDATA[
-PHP Warning: mysqlnd_ms_fabric_select_global(): (mysqlnd_ms) Fabric server exchange in the middle of a transaction in %s on line %d
-]]>
-        </screen>
-       </example>
-      </para>
-      <para>
-       Please, consider the feature experimental. Changes to syntax and semantics may  happen.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filters">
-     <term>
-      <parameter>filters</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       List of filters. A filter is responsible to filter the list of available
-       servers for executing a given statement. Filters can be chained.
-       The <literal>random</literal> and <literal>roundrobin</literal> filter
-       replace the
-       <link linkend="ini.mysqlnd-ms-plugin-config.pick"><literal>pick[]</literal></link>
-       directive used in prior version to select a load balancing policy.
-       The <literal>user</literal> filter replaces the
-       <function>mysqlnd_ms_set_user_pick_server</function> function.
-      </para>
-      <para>
-       Filters may accept parameters to refine their actions.
-      </para>
-      <para>
-       If no load balancing policy is set, the plugin will default to
-       <literal>random_once</literal>. The <literal>random_once</literal>
-       policy picks a random slave server when running the first read-only
-       statement. The slave server will be used for all read-only
-       statements until the PHP script execution ends. No load balancing
-       policy is set and thus, defaulting takes place,
-       if neither the <literal>random</literal> nor the
-       <literal>roundrobin</literal> are part of a configuration section.
-      </para>
-      <para>
-       If a filter chain is configured so that a filter which output no
-       more than once server is used as input for a filter which should be given
-       more than one server as input, the plugin may emit a warning upon
-       opening a connection. The warning may read: <literal>(mysqlnd_ms) Error while creating
-       filter '%s' . Non-multi filter '%s' already created.
-       Stopping in %s on line %d</literal>. Furthermore, an error of
-       the error code <literal>2000</literal>, the sql state <literal>HY000</literal>
-       and an error message similar to the warning may be set on the connection
-       handle.
-      </para>
-      <para>
-       <example>
-        <title>Invalid filter sequence</title>
-        <programlisting role="ini">
-<![CDATA[
-       {
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "filters": [
-            "roundrobin",
-            "random"
-        ]
-    }
-}
-]]>
-         </programlisting>
-         <programlisting role="php">
-<![CDATA[
-<?php
-$link = new mysqli("myapp", "root", "", "test");
-printf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
-$link->query("SELECT 1 FROM DUAL");
-?>
-]]>
-         </programlisting>
-         &example.outputs;
-        <screen>
-<![CDATA[
-PHP Warning:  mysqli::mysqli(): (HY000/2000): (mysqlnd_ms) Error while creating filter 'random' . Non-multi filter 'roundrobin' already created. Stopping in filter_warning.php on line 1
-[2000] (mysqlnd_ms) Error while creating filter 'random' . Non-multi filter 'roundrobin' already created. Stopping
-PHP Warning:  mysqli::query(): Couldn't fetch mysqli in filter_warning.php on line 3
-]]>
-        </screen>
-       </example>
-      </para>
-    </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filter-random">
-     <term>
-      Filter: <parameter>random</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-        The <literal>random</literal> filter features the random and random once
-        load balancing policies, set through the
-        <link linkend="ini.mysqlnd-ms-plugin-config.pick"><literal>pick[]</literal></link>
-        directive in older versions.
-      </para>
-      <para>
-        The random policy will pick a random server whenever
-        a read-only statement is to be executed. The random once strategy
-        picks a random slave server once and continues using the slave for the
-        rest of the PHP web request. Random once is a default,
-        if load balancing is not configured through a filter.
-      </para>
-      <para>
-       If the <literal>random</literal> filter is not given any arguments, it
-       stands for random load balancing policy.
-      </para>
-      <para>
-       <example>
-        <title>Random load balancing with <literal>random</literal> filter</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            },
-            "slave_1": {
-                "host": "192.168.78.137",
-                "port": "3306"
-            }
-        },
-        "filters": [
-            "random"
-        ]
-    }
-}
-
-]]>
-         </programlisting>
-       </example>
-      </para>
-      <para>
-       Optionally, the <literal>sticky</literal> argument can be passed to the
-       filter. If the parameter <literal>sticky</literal> is set to the string
-       <literal>1</literal>, the filter follows the random once
-       load balancing strategy.
-      </para>
-      <para>
-       <example>
-        <title>Random once load balancing with <literal>random</literal> filter</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "filters": {
-        "random": {
-            "sticky": "1"
-        }
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       Both the <literal>random</literal> and <literal>roundrobin</literal>
-       filters support setting a priority, a weight for a server, since
-       PECL/mysqlnd_ms 1.4.0. If the <literal>weight</literal> argument is
-       passed to the filter, it must assign a weight for all servers. Servers
-       must be given an alias name in the <literal>slave</literal> respectively
-       <literal>master</literal> server lists. The alias must be used
-       to reference servers for assigning a priority with <literal>weight</literal>.
-      </para>
-      <para>
-       <example>
-        <title>Referencing error</title>
-        <screen>
-<![CDATA[
-[E_RECOVERABLE_ERROR] mysqli_real_connect(): (mysqlnd_ms) Unknown server 'slave3' in 'random' filter configuration. Stopping in %s on line %d
-]]>
-        </screen>
-       </example>
-      </para>
-      <para>
-       Using a wrong alias name with <literal>weight</literal> may result in
-       an error similar to the shown above.
-      </para>
-      <para>
-       If <literal>weight</literal> is omitted, the default weight of
-       all servers is one.
-      </para>
-      <para>
-       <example>
-        <title>Assigning a <literal>weight</literal> for load balancing</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-   "myapp": {
-       "master": {
-           "master1":{
-               "host":"localhost",
-               "socket":"\/var\/run\/mysql\/mysql.sock"
-           }
-       },
-       "slave": {
-           "slave1": {
-               "host":"192.168.2.28",
-               "port":3306
-           },
-           "slave2": {
-               "host":"192.168.2.29",
-               "port":3306
-           },
-           "slave3": {
-               "host":"192.0.43.10",
-               "port":3306
-           },
-       },
-       "filters": {
-           "random": {
-               "weights": {
-                   "slave1":8,
-                   "slave2":4,
-                   "slave3":1,
-                   "master1":1
-               }
-           }
-       }
-   }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       At the average a server assigned a weight of two will be selected twice
-       as often as a server assigned a weight of one. Different weights can be
-       assigned to reflect differently sized machines, to prefer co-located slaves
-       which have a low network latency or, to configure a standby failover server.
-       In the latter case, you may want to assign the standby server a very low
-       weight in relation to the other servers. For example, given the
-       configuration above <literal>slave3</literal> will get only some eight
-       percent of the requests in the average. As long as <literal>slave1</literal>
-       and <literal>slave2</literal> are running, it will be used sparsely,
-       similar to a standby failover server. Upon failure of <literal>slave1</literal>
-       and <literal>slave2</literal>, the usage of <literal>slave3</literal>
-       increases. Please, check the notes on failover before using
-       <literal>weight</literal> this way.
-      </para>
-      <para>
-       Valid weight values range from 1 to 65535.
-      </para>
-      <para>
-       Unknown arguments are ignored by the filter. No warning or error is given.
-      </para>
-      <para>
-        The filter expects one or more servers as input. Outputs one server.
-        A filter sequence such as
-        <literal>random</literal>, <literal>roundrobin</literal> may
-        cause a warning and an error message to be set on the connection
-        handle when executing a statement.
-      </para>
-      <para>
-       List of filter arguments.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-            <literal>sticky</literal>
-          </entry>
-          <entry>
-           <para>
-            Enables or disabled random once load
-            balancing policy. See above.
-           </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-         </row>
-         <row>
-          <entry>
-            <literal>weight</literal>
-          </entry>
-          <entry>
-           <para>
-            Assigns a load balancing weight/priority to
-            a server. Please, see above for a description.
-           </para>
-          </entry>
-          <entry>Since 1.4.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filter-roundrobin">
-     <term>
-      Filter: <parameter>roundrobin</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       If using the <literal>roundrobin</literal> filter, the plugin
-       iterates over the list of  configured slave servers to pick a server
-       for statement execution. If the plugin reaches the end of the list,
-       it wraps around to the beginning of the list and picks the first
-       configured slave server.
-      </para>
-      <para>
-       <example>
-        <title><literal>roundrobin</literal> filter</title>
-        <programlisting role="ini">
-<![CDATA[
-       {
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "filters": [
-            "roundrobin"
-        ]
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-        Expects one or more servers as input. Outputs one server.
-        A filter sequence such as
-        <literal>roundrobin</literal>, <literal>random</literal> may
-        cause a warning and an error message to be set on the connection
-        handle when executing a statement.
-      </para>
-      <para>
-       List of filter arguments.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-            <literal>weight</literal>
-          </entry>
-          <entry>
-           <para>
-            Assigns a load balancing weight/priority to
-            a server. Please, find a description
-            <link linkend="ini.mysqlnd-ms-plugin-config-v2.filter-random">above</link>.
-           </para>
-          </entry>
-          <entry>Since 1.4.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filter-user">
-     <term>
-      Filter: <parameter>user</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-        The <literal>user</literal> replaces
-       <function>mysqlnd_ms_set_user_pick_server</function> function,
-       which was removed in 1.1.0-beta. The filter sets a callback for user-defined
-       read/write splitting and server selection.
-      </para>
-      <para>
-        The plugins built-in read/write query split mechanism decisions can be
-        overwritten in two ways. The easiest way is to prepend a query string
-        with the SQL hints <constant>MYSQLND_MS_MASTER_SWITCH</constant>,
-        <constant>MYSQLND_MS_SLAVE_SWITCH</constant> or
-        <constant>MYSQLND_MS_LAST_USED_SWITCH</constant>. Using SQL hints one can
-        control, for example, whether a query shall be send to the MySQL replication
-        master server or one of the slave servers. By help of SQL hints it is
-        not possible to pick a certain slave server for query execution.
-      </para>
-      <para>
-       Full control on server selection can be gained using a callback function.
-       Use of a callback is recommended to expert users only because the callback
-       has to cover all cases otherwise handled by the plugin.
-      </para>
-      <para>
-       The plugin will invoke the callback function for selecting a server from the
-       lists of configured master and slave servers. The callback function
-       inspects the query to run and picks a server for query execution by returning
-       the hosts URI, as found in the master and slave list.
-      </para>
-      <para>
-       If the lazy connections are enabled and the callback chooses a slave server for
-       which no connection has been established so far and establishing the connection
-       to the slave fails, the plugin will return an error upon the next action
-       on the failed connection, for example, when running a query. It is the
-       responsibility of the application developer to handle the error. For example,
-       the application can re-run the query to trigger a new server selection and
-       callback invocation. If so, the callback must make sure to select
-       a different slave, or check slave availability, before returning to
-       the plugin to prevent an endless loop.
-      </para>
-      <para>
-       <example>
-        <title>Setting a callback</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "filters": {
-            "user": {
-                "callback": "pick_server"
-            }
-        }
-    }
-}
-]]>
-         </programlisting>
-       </example>
-      </para>
-      <para>
-       The callback is supposed to return a host to run the query on.
-       The host URI is to be taken from the master and slave connection lists
-       passed to the callback function. If callback returns a value neither
-       found in the master nor in the slave connection lists the plugin
-       will emit an error of the type <literal>E_RECOVERABLE_ERROR</literal>
-       The error may read like
-       <literal>  (mysqlnd_ms) User filter callback has returned an unknown server.
-       The server 'server that is not in master or slave list' can neither be found
-       in the master list nor in the slave list</literal>.
-       If the application catches the error to ignore it, follow up errors
-       may be set on the connection handle, for example,
-       <literal>(mysqlnd_ms) No connection selected by the last filter</literal> with
-       the error code <literal>2000</literal> and the sqlstate <literal>HY000</literal>.
-       Furthermore a warning may be emitted.
-      </para>
-      <para>
-       Referencing a non-existing function as a callback will result
-       in any error of the type <literal>E_RECOVERABLE_ERROR</literal> whenever
-       the plugin tries to callback function. The error message may reads like:
-       <literal>(mysqlnd_ms) Specified callback (pick_server) is
-       not a valid callback</literal>. If the application catches the error to
-       ignore it, follow up errors may be set on the connection handle, for example,
-       <literal>(mysqlnd_ms) Specified callback (pick_server) is
-       not a valid callback</literal> with the error code <literal>2000</literal>
-       and the sqlstate <literal>HY000</literal>. Furthermore a warning
-       may be emitted.
-      </para>
-      <para>
-       The following parameters are passed from the plugin to the callback.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Parameter</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-           <entry>
-             <literal>connected_host</literal>
-           </entry>
-           <entry>
-            <para>
-             URI of the currently connected database server.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>query</literal>
-           </entry>
-           <entry>
-            <para>
-             Query string of the statement for which a server needs
-             to be picked.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>masters</literal>
-           </entry>
-           <entry>
-            <para>
-             List of master servers to choose from. Note, that the list of master
-             servers may not be identical to the list of configured master
-             servers if the filter is not the first in the filter chain.
-             Previously run filters may have reduced the master
-             list already.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>slaves</literal>
-           </entry>
-           <entry>
-            <para>
-             List of slave servers to choose from. Note, that the list of slave
-             servers may not be identical to the list of configured slave
-             servers if the filter is not the first in the filter chain.
-             Previously run filters may have reduced the slave
-             list already.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>last_used_connection</literal>
-           </entry>
-           <entry>
-            <para>
-              URI of the server of the connection used to execute the previous
-              statement on.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>in_transaction</literal>
-           </entry>
-           <entry>
-            <para>
-             Boolean flag indicating whether the statement is
-             part of an open transaction. If autocommit mode is turned
-             off, this will be set to &true;. Otherwise
-             it is set to &false;.
-            </para>
-            <para>
-             Transaction detection is based on monitoring the
-             mysqlnd library call <literal>set_autocommit</literal>.
-             Monitoring is not possible before PHP 5.4.0. Please, see
-             <link linkend="mysqlnd-ms.pooling">connection pooling and switching</link>
-             concepts discussion for further details.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-      <para>
-       <example>
-        <title>Using a callback</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            },
-            "slave_1": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "filters": {
-            "user": {
-                "callback": "pick_server"
-            }
-        }
-    }
-}
-]]>
-         </programlisting>
-         <programlisting role="php">
-<![CDATA[
-<?php
-function pick_server($connected, $query, $masters, $slaves, $last_used_connection, $in_transaction)
-{
- static $slave_idx = 0;
- static $num_slaves = NULL;
- if (is_null($num_slaves))
-  $num_slaves = count($slaves);
-
- /* default: fallback to the plugins build-in logic */
- $ret = NULL;
-
- printf("User has connected to '%s'...\n", $connected);
- printf("... deciding where to run '%s'\n", $query);
-
- $where = mysqlnd_ms_query_is_select($query);
- switch ($where)
- {
-  case MYSQLND_MS_QUERY_USE_MASTER:
-   printf("... using master\n");
-   $ret = $masters[0];
-   break;
-  case MYSQLND_MS_QUERY_USE_SLAVE:
-   /* SELECT or SQL hint for using slave */
-   if (stristr($query, "FROM table_on_slave_a_only"))
-   {
-    /* a table which is only on the first configured slave  */
-    printf("... access to table available only on slave A detected\n");
-    $ret = $slaves[0];
-   }
-   else
-   {
-    /* round robin */
-    printf("... some read-only query for a slave\n");
-    $ret = $slaves[$slave_idx++ % $num_slaves];
-   }
-   break;
-  case MYSQLND_MS_QUERY_LAST_USED:
-   printf("... using last used server\n");
-   $ret = $last_used_connection;
-   break;
- }
-
- printf("... ret = '%s'\n", $ret);
- return $ret;
-}
-
-$mysqli = new mysqli("myapp", "root", "", "test");
-
-if (!($res = $mysqli->query("SELECT 1 FROM DUAL")))
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-else
- $res->close();
-
-if (!($res = $mysqli->query("SELECT 2 FROM DUAL")))
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-else
- $res->close();
-
-
-if (!($res = $mysqli->query("SELECT * FROM table_on_slave_a_only")))
- printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-else
- $res->close();
-
-$mysqli->close();
-?>
-]]>
-         </programlisting>
-         &example.outputs;
-         <screen>
-<![CDATA[
-User has connected to 'myapp'...
-... deciding where to run 'SELECT 1 FROM DUAL'
-... some read-only query for a slave
-... ret = 'tcp://192.168.2.27:3306'
-User has connected to 'myapp'...
-... deciding where to run 'SELECT 2 FROM DUAL'
-... some read-only query for a slave
-... ret = 'tcp://192.168.78.136:3306'
-User has connected to 'myapp'...
-... deciding where to run 'SELECT * FROM table_on_slave_a_only'
-... access to table available only on slave A detected
-... ret = 'tcp://192.168.2.27:3306'
-]]>
-         </screen>
-       </example>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filter-user-multi">
-     <term>
-      Filter: <parameter>user_multi</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       The <literal>user_multi</literal> differs from the <literal>user</literal>
-       only in one aspect. Otherwise, their syntax is identical.
-       The <literal>user</literal> filter must pick
-       and return exactly one node for statement execution. A filter chain
-       usually ends with a filter that emits only one node. The filter chain
-       shall reduce the list of candidates for statement execution down to
-       one. This, only one node left, is the case after the <literal>user</literal>
-       filter has been run.
-      </para>
-      <para>
-       The <literal>user_multi</literal> filter is a multi filter. It returns a
-       list of slave and a list of master servers. This list needs further filtering
-       to identify exactly one node for statement execution. A multi filter is typically
-       placed at the top of the filter chain. The <literal>quality_of_service</literal>
-       filter is another example of a multi filter.
-      </para>
-      <para>
-       The return value of the callback set for <literal>user_multi</literal> must
-       be an array with two elements. The first element holds a list of selected master
-       servers. The second element contains a list of selected slave servers. The
-       lists shall contain the keys of the slave and master servers as found in
-       the slave and master lists passed to the callback. The below example returns
-       random master and slave lists extracted from the functions input.
-      </para>
-      <para>
-      <example>
-        <title>Returning random masters and slaves</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-function pick_server($connected, $query, $masters, $slaves, $last_used_connection, $in_transaction)
-{
-  $picked_masters = array()
-  foreach ($masters as $key => $value) {
-    if (mt_rand(0, 2) > 1)
-      $picked_masters[] = $key;
-  }
-  $picked_slaves = array()
-  foreach ($slaves as $key => $value) {
-    if (mt_rand(0, 2) > 1)
-      $picked_slaves[] = $key;
-  }
-  return array($picked_masters, $picked_slaves);
-}
-?>
-]]>
-         </programlisting>
-       </example>
-      </para>
-      <para>
-       The plugin will issue an
-       error of type <literal>E_RECOVERABLE</literal> if the callback fails to return
-       a server list. The error may read <literal>(mysqlnd_ms) User multi
-       filter callback has not returned a list of servers to use.
-       The callback must return an array in %s on line %d</literal>. In case the
-       server list is not empty but has invalid servers key/ids in it, an error
-       of type <literal>E_RECOVERABLE</literal> will the thrown with an
-       error message like <literal>(mysqlnd_ms) User multi filter callback
-       has returned an invalid list of servers to use.
-       Server id is negative in %s on line %d</literal>, or similar.
-      </para>
-      <para>
-       Whether an error is emitted in case of an empty slave or master list
-       depends on the configuration. If an empty master list is returned
-       for a write operation, it is likely that the plugin will emit a
-       warning that may read <literal>(mysqlnd_ms) Couldn't find the appropriate
-       master connection. 0 masters to choose from. Something is wrong in %s on line %d</literal>.
-       Typically a follow up error of type <literal>E_ERROR</literal> will happen.
-       In case of a read operation and an empty slave list the behavior depends
-       on the fail over configuration. If fail over to master is enabled, no
-       error should appear. If fail over to master is deactivated the plugin will
-       emit a warning that may read <literal>(mysqlnd_ms) Couldn't find the appropriate
-       slave connection. 0 slaves to choose from. Something is wrong in %s on line %d</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filter-node-groups">
-     <term>
-      Filter: <parameter>node_groups</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       The <literal>node_groups</literal> filter lets you group cluster nodes
-       and query selected groups, for example, to support data partitioning.
-       Data partitioning can be required for manual sharding, primary copy based
-       clusters running multiple masters, or to avoid hot spots in update everywhere
-       clusters that have no built-in partitioning. The filter is a multi filter
-       which returns zero, one or multiple of its input servers. Thus, it
-       must be followed by other filters to reduce the number of candidates
-       down to one for statement execution.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-           <literal>user defined node group name</literal>
-          </entry>
-          <entry>
-            <para>
-             One or more node groups must be defined. A node group can have an
-             arbitrary user defined name. The name is used in combination with
-             a SQL hint to restrict query execution to the nodes listed for the
-             node group. To run a query on any of the servers of a node group,
-             the query must begin with the SQL hint
-             <literal>/*user defined node group name*/</literal>.
-             Please note, no white space is allowed around
-             <literal>user defined node group name</literal>. Because
-             <literal>user defined node group name</literal> is used as-is
-             as part of a SQL hint, you should choose the name that is compliant
-             with the SQL language.
-            </para>
-            <para>
-             Each node group entry must contain a list of <literal>master</literal>
-             servers. Additional <literal>slave</literal> servers are allowed.
-             Failing to provide a list of <literal>master</literal> for a node group
-             <literal>name_of_group</literal> may cause an
-             error of type <constant>E_RECOVERABLE_ERROR</constant> like
-             <literal>(mysqlnd_ms) No masters configured in node group 'name_of_group' for 'node_groups' filter</literal>.
-            </para>
-            <para>
-             The list of master and slave servers must reference corresponding
-             entries in the
-             <link linkend="ini.mysqlnd-ms-plugin-config-v2.master">global master</link>
-             respectively <link linkend="ini.mysqlnd-ms-plugin-config-v2.slave">slave</link>
-             server list. Referencing an unknown server in either of the both server
-             lists may cause an <constant>E_RECOVERABLE_ERROR</constant> error like
-             <literal>(mysqlnd_ms) Unknown master 'server_alias_name' (section 'name_of_group') in 'node_groups' filter configuration</literal>.
-            </para>
-            <para>
-             <example>
-               <title>Manual partitioning</title>
-                <programlisting role="ini">
-<![CDATA[
- {
-  "myapp": {
-       "master": {
-            "master_0": {
-                "host": "localhost",
-                "socket": "\/tmp\/mysql.sock"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.28",
-                "port": 3306
-            },
-            "slave_1": {
-                "host": "127.0.0.1",
-                "port": 3311
-            }
-        },
-        "filters": {
-            "node_groups": {
-                "Partition_A" : {
-                    "master": ["master_0"],
-                    "slave": ["slave_0"]
-                }
-            },
-           "roundrobin": []
-        }
-    }
-}
-]]>
-              </programlisting>
-             </example>
-            </para>
-            <para>
-              Please note, if a filter chain
-              generates an empty slave list and the PHP configuration directive
-              <literal>mysqlnd_ms.multi_master=0</literal> is used, the plugin may
-              emit a warning.
-            </para>
-          </entry>
-          <entry>Since 1.5.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.filter-qos">
-     <term>
-      Filter: <parameter>quality_of_service</parameter>
-      <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       The <literal>quality_of_service</literal> identifies cluster nodes
-       capable of delivering a certain quality of service. It is a multi filter
-       which returns zero, one or multiple of its input servers. Thus, it
-       must be followed by other filters to reduce the number of candidates
-       down to one for statement execution.
-      </para>
-      <para>
-       The <literal>quality_of_service</literal> filter has been introduced in 1.2.0-alpha.
-       In the 1.2 series the filters focus is on the consistency aspect of
-       service quality. Different types of clusters offer different
-       default data consistencies. For example, an asynchronous MySQL
-       replication slave offers eventual consistency. The slave may not
-       be able to deliver requested data because it has not replicated the write,
-       it may serve stale database because its lagging behind or it may serve
-       current information. Often, this is acceptable. In some cases
-       higher consistency levels are needed for the application to work correct.
-       In those cases, the <literal>quality_of_service</literal> can filter out cluster nodes
-       which cannot deliver the necessary quality of service.
-      </para>
-      <para>
-       The <literal>quality_of_service</literal> filter can be replaced or created
-       at runtime. A successful call to
-       <function>mysqlnd_ms_set_qos</function>
-       removes all existing <literal>qos</literal> filter entries from the
-       filter list and installs a new one at the very beginning. All settings
-       that can be made through
-       <function>mysqlnd_ms_set_qos</function>
-       can also be in the plugins configuration file. However, use of the function
-       is by far the most common use case. Instead of setting session consistency and
-       strong consistency service levels in the plugins configuration file it is
-       recommended to define only masters and no slaves. Both service levels will
-       force the use of masters only. Using an empty slave list shortens the
-       configuration file, thus improving readability. The only service level for which
-       there is a case of defining in the plugins configuration file is the combination
-       of eventual consistency and maximum slave lag.
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-           <entry>
-             <literal>eventual_consistency</literal>
-           </entry>
-           <entry>
-            <para>
-             Request eventual consistency. Allows the use of all
-             master and slave servers. Data returned may or may not be current.
-            </para>
-            <para>
-             Eventual consistency accepts an optional <literal>age</literal>
-             parameter. If <literal>age</literal> is given the plugin considers
-             only slaves for reading for which MySQL replication reports
-             a slave lag less or equal to <literal>age</literal>.
-             The replication lag is measure using <literal>SHOW SLAVE STATUS</literal>.
-             If the plugin fails to fetch the replication lag, the slave tested
-             is skipped. Implementation details and tips are given in the
-             <link linkend="mysqlnd-ms.qos-consistency">quality of service concepts section</link>.
-            </para>
-            <para>
-              Please note, if a filter chain
-              generates an empty slave list and the PHP configuration directive
-              <literal>mysqlnd_ms.multi_master=0</literal> is used, the plugin may
-              emit a warning.
-            </para>
-            <para>
-             <example>
-               <title>Global limit on slave lag</title>
-                <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.2.27",
-                "port": "3306"
-            },
-            "slave_1": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "filters": {
-            "quality_of_service": {
-                "eventual_consistency": {
-                    "age":123
-                }
-            }
-        }
-    }
-}
-]]>
-              </programlisting>
-             </example>
-            </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>session_consistency</literal>
-           </entry>
-           <entry>
-            <para>
-              Request session consistency (read your writes). Allows use of all masters
-              and all slaves which are in sync with the master.
-              If no further parameters are given slaves are filtered out
-              as there is no reliable way to test if a slave has caught up
-              to the master or is lagging behind. Please note, if a filter chain
-              generates an empty slave list and the PHP configuration directive
-              <literal>mysqlnd_ms.multi_master=0</literal> is used, the plugin may
-              emit a warning.
-            </para>
-            <para>
-             Session consistency temporarily requested using
-             <function>mysqlnd_ms_set_qos</function> is a valuable alternative
-             to using <literal>master_on_write</literal>.
-             <literal>master_on_write</literal> is likely to send more statements
-             to the master than needed. The application may be able to continue
-             operation at a lower consistency level after it has done
-             some critical reads.
-            </para>
-          </entry>
-          <entry>Since 1.1.0.</entry>
-         </row>
-         <row>
-           <entry>
-             <literal>strong_consistency</literal>
-           </entry>
-           <entry>
-            <para>
-              Request strong consistency. Only masters will be used.
-            </para>
-          </entry>
-          <entry>Since 1.2.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.failover">
-     <term>
-      <parameter>failover</parameter>
-      Up to and including 1.3.x: <type>string</type>.
-      Since 1.4.0: <type>object</type>.
-     </term>
-     <listitem>
-      <para>
-       Failover policy. Supported policies:
-       <literal>disabled</literal> (default), <literal>master</literal>,
-       <literal>loop_before_master</literal> (Since 1.4.0).
-      </para>
-      <para>
-       If no failover policy is set, the plugin will not do any
-       automatic failover (<literal>failover=disabled</literal>). Whenever
-       the plugin fails to connect a server it will emit a warning and
-       set the connections error code and message. Thereafter it is up to
-       the application to handle the error and, for example, resent the
-       last statement to trigger the selection of another server.
-      </para>
-      <para>
-       Please note, the automatic failover logic is applied when opening
-       connections only. Once a connection has been opened no automatic attempts
-       are made to reopen it in case of an error. If, for example, the server
-       a connection is connected to is shut down and the  user attempts to
-       run a statement on the connection, no automatic failover
-       will be tried. Instead, an error will be reported.
-      </para>
-      <para>
-       If using <literal>failover=master</literal> the plugin will implicitly
-       failover to a master, if available. Please check the
-       concepts documentation to learn about potential
-       pitfalls and risks of using <literal>failover=master</literal>.
-      </para>
-      <para>
-       <example>
-        <title>Optional master failover when failing to connect to slave (PECL/mysqlnd_ms &lt; 1.4.0)</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "failover": "master"
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       Since PECL/mysqlnd_ms 1.4.0 the failover configuration keyword refers to an
-       object.
-      </para>
-      <para>
-       <example>
-        <title>New syntax since 1.4.0</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "failover": {"strategy": "master" }
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-           <literal>strategy</literal>
-          </entry>
-          <entry>
-           <para>
-            Failover policy. Possible values:
-            <literal>disabled</literal> (default), <literal>master</literal>,
-            <literal>loop_before_master</literal>
-           </para>
-           <para>
-            A value of <literal>disabled</literal> disables automatic failover.
-           </para>
-           <para>
-            Setting <literal>master</literal> instructs the plugin to try
-            to connect to a master in case of a slave connection error. If the
-            master connection attempt fails, the plugin exists the failover
-            loop and returns an error to the user.
-           </para>
-           <para>
-             If using <literal>loop_before_master</literal> and a slave request
-             is made, the plugin tries to connect to other slaves before failing
-             over to a master. If multiple master are given and multi master is enabled,
-             the plugin also loops over the list of masters and attempts to connect
-             before returning an error to the user.
-           </para>
-          </entry>
-          <entry>Since 1.4.0.</entry>
-         </row>
-         <row>
-          <entry>
-           <literal>remember_failed</literal>
-          </entry>
-          <entry>
-           <para>
-            Remember failures for the duration of a web request. Default:
-             <literal>false</literal>.
-            </para>
-            <para>
-             If set to <literal>true</literal> the plugin will remember failed
-             hosts and skip the hosts in all future load balancing made for
-             the duration of the current web request.
-            </para>
-          </entry>
-          <entry>
-           Since 1.4.0. The feature is only available together
-           with the <literal>random</literal> and <literal>roundrobin</literal>
-           load balancing filter. Use of the setting is recommended.
-          </entry>
-         </row>
-         <row>
-           <entry>
-            <literal>max_retries</literal>
-           </entry>
-           <entry>
-            <para>
-             Maximum number of connection attempts before skipping host.
-             Default: <literal>0</literal> (no limit).
-            </para>
-            <para>
-             The setting is used to prevent hosts from being dropped of the
-             host list upon the first failure. If set to <literal>n > 0</literal>,
-             the plugin will keep the node in the node list even after a failed
-             connection attempt. The node will not be removed immediately from the slave respectively
-             master lists after the first connection failure but instead be tried to
-             connect to up to <literal>n</literal> times in future load balancing rounds
-             before being removed.
-            </para>
-          </entry>
-          <entry>
-           Since 1.4.0. The feature is only available together
-           with the <literal>random</literal> and <literal>roundrobin</literal>
-           load balancing filter.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-      <para>
-       Setting <literal>failover</literal> to any other value but
-       <literal>disabled</literal>, <literal>master</literal> or
-       <literal>loop_before_master</literal>
-       will not emit any warning or error.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.lazy-connections">
-     <term>
-      <parameter>lazy_connections</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Controls the use of lazy connections. Lazy connections
-       are connections which are not opened before the client sends the first
-       connection. Lazy connections are a default.
-      </para>
-      <para>
-       It is strongly recommended to use lazy connections.
-       Lazy connections help to keep the number of open connections low.
-       If you disable lazy connections and, for example, configure one MySQL
-       replication master server and two MySQL replication slaves, the
-       plugin will open three connections upon the first call to a
-       connect function although the application might use the master
-       connection only.
-      </para>
-      <para>
-       Lazy connections bare a risk if you make heavy use of actions
-       which change the state of a connection. The plugin does not dispatch
-       all state changing actions to all connections from the connection pool.
-       The few dispatched actions are applied to already opened connections
-       only. Lazy connections opened in the future are not affected.
-       Only some settings are &quot;remembered&quot; and applied when lazy
-       connections are opened.
-      </para>
-      <para>
-       <example>
-        <title>Disabling lazy connection</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "lazy_connections": 0
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       Please, see also <literal>server_charset</literal> to overcome potential
-       problems with string escaping and servers using different default
-       charsets.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.server-charset">
-     <term>
-      <parameter>server_charset</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The setting has been introduced in 1.4.0. It is recommended to set it
-       if using lazy connections.
-      </para>
-      <para>
-       The <literal>server_charset</literal> setting serves two purposes. It
-       acts as a fallback charset to be used for string escaping done before
-       a connection has been established and it helps to avoid escaping pitfalls
-       in heterogeneous environments which servers using different default charsets.
-      </para>
-      <para>
-       String escaping takes a connections charset into account. String escaping
-       is not possible before a connection has been opened and the connections
-       charset is known. The use of lazy connections delays the actual opening
-       of connections until a statement is send.
-      </para>
-      <para>
-       An application using lazy connections may attempt to escape a string
-       before sending a statement. In fact, this should be a common case as
-       the statement string may contain the string that is to be escaped.
-       However, due to the lazy connection feature no connection has been opened
-       yet and escaping fails. The plugin may report an error of the type
-       <literal>E_WARNING</literal> and a message like <literal>(mysqlnd_ms)
-       string escaping doesn't work without established connection.
-       Possible solution is to add server_charset to your configuration</literal>
-       to inform you of the pitfall.
-      </para>
-      <para>
-       Setting <literal>server_charset</literal> makes the plugin use
-       the given charset for string escaping done on lazy connection handles
-       before establishing a network connection to MySQL. Furthermore, the
-       plugin will enforce the use of the charset when the connection is
-       established.
-      </para>
-      <para>
-       Enforcing the use of the configured charset used for escaping is done
-       to prevent tapping into the pitfall of using a different charset for
-       escaping than used later for the connection. This has the additional
-       benefit of removing the need to align the charset configuration of all
-       servers used. No matter what the default charset on any of the servers is,
-       the plugin will set the configured one as a default.
-      </para>
-      <para>
-       The plugin does not stop the user from changing the charset at any time
-       using the <function>set_charset</function> call or corresponding SQL statements.
-       Please, note that the use of SQL is not recommended as it cannot be monitored
-       by the plugin. The user can, for example, change the charset on a
-       lazy connection handle after escaping a string and before the actual connection
-       is opened. The charset set by the user will be used for any subsequent escaping
-       before the connection is established. The connection will be established
-       using the configured charset, no matter what the server charset is or
-       what the user has set before. Once a connection has been opened,
-       <literal>set_charset</literal> is of no meaning anymore.
-      </para>
-      <para>
-       <example>
-        <title>String escaping on a lazy connection handle</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "lazy_connections": 1,
-        "server_charset" : "utf8mb4"
-    }
-}
-]]>
-        </programlisting>
-        <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("myapp", "username", "password", "database");
-$mysqli->real_escape("this will be escaped using the server_charset setting - utf8mb4");
-$mysqli->set_charset("latin1");
-$mysqli->real_escape("this will be escaped using latin1");
-/* server_charset implicitly set - utf8mb4 connection */
-$mysqli->query("SELECT 'This connection will be set to server_charset upon establishing' AS _msg FROM DUAL");
-/* latin1 used from now on */
-$mysqli->set_charset("latin1");
-?>
-]]>
-         </programlisting>
-       </example>
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.master-on-write">
-     <term>
-      <parameter>master_on_write</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       If set, the plugin will use the master server only after the
-       first statement has been executed on the master. Applications
-       can still send statements to the slaves using SQL hints to
-       overrule the automatic decision.
-      </para>
-      <para>
-       The setting may help with replication lag. If an application runs
-       an <literal>INSERT</literal> the plugin will, by default, use the
-       master to execute all following statements, including
-       <literal>SELECT</literal> statements. This helps to avoid problems
-       with reads from slaves which have not replicated the
-       <literal>INSERT</literal> yet.
-      </para>
-      <para>
-       <example>
-        <title>Master on write for consistent reads</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "master_on_write": 1
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       Please, note the <literal>quality_of_service</literal> filter introduced
-       in version 1.2.0-alpha. It gives finer control, for example, for achieving read-your-writes
-       and, it offers additional functionality introducing
-       <link linkend="mysqlnd-ms.qos-consistency">service levels</link>.
-      </para>
-      <para>
-       All <link linkend="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">transaction stickiness</link> settings,
-       including <literal>trx_stickiness=on</literal>, are overruled by <literal>master_on_write=1</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.trx-stickiness">
-     <term>
-      <parameter>trx_stickiness</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Transaction stickiness policy. Supported policies:
-       <literal>disabled</literal> (default), <literal>master</literal>.
-      </para>
-      <para>
-       The setting requires 5.4.0 or newer. If used with PHP older than 5.4.0,
-       the plugin will emit a warning like
-       <literal>(mysqlnd_ms) trx_stickiness strategy is not supported before PHP 5.3.99</literal>.
-      </para>
-      <para>
-       If no transaction stickiness policy is set or,
-       if setting <literal>trx_stickiness=disabled</literal>,
-       the plugin is not transaction aware. Thus, the plugin may load balance
-       connections and switch connections in the middle of a transaction.
-       The plugin is not transaction safe. SQL hints must be used
-       avoid connection switches during a transaction.
-      </para>
-      <para>
-       As of PHP 5.4.0 the mysqlnd library allows the plugin to monitor
-       the <literal>autocommit</literal> mode set by calls to the
-       libraries <literal>set_autocommit()</literal> function.
-       If setting <literal>set_stickiness=master</literal> and
-       <literal>autocommit</literal> gets disabled by a PHP MySQL extension
-       invoking the <literal>mysqlnd</literal> library internal
-       function call <literal>set_autocommit()</literal>, the plugin is made
-       aware of the begin of a transaction. Then, the plugin stops load balancing
-       and directs all statements to the master server until
-       <literal>autocommit</literal> is enabled. Thus, no SQL hints are required.
-      </para>
-      <para>
-       An example of a PHP MySQL API function calling the <literal>mysqlnd</literal>
-       library internal function call <literal>set_autocommit()</literal> is
-       <function>mysqli_autocommit</function>.
-      </para>
-      <para>
-       Although setting <literal>trx_stickiness=master</literal>, the plugin
-       cannot be made aware of <literal>autocommit</literal> mode changes caused
-       by SQL statements such as <literal>SET AUTOCOMMIT=0</literal> or <literal>BEGIN</literal>.
-      </para>
-      <para>
-       As of PHP 5.5.0, the mysqlnd library features additional C API calls to
-       control transactions. The level of control matches the one offered by SQL
-       statements. The <literal>mysqli</literal> API has been modified to use
-       these calls. Since version 1.5.0, PECL/mysqlnd_ms can monitor not only
-       <function>mysqli_autocommit</function>, but also <function>mysqli_begin</function>,
-       <function>mysqli_commit</function> and <function>mysqli_rollback</function> to
-       detect transaction boundaries and stop load balancing for the duration of
-       a transaction.
-      </para>
-      <para>
-       <example>
-        <title>Using master to execute transactions</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-        },
-        "trx_stickiness": "master"
-    }
-}
-]]>
-        </programlisting>
-       </example>
-      </para>
-      <para>
-       Since version 1.5.0 automatic and silent failover is disabled for the
-       duration of a transaction. If the boundaries of a transaction have been
-       properly detected, transaction stickiness is enabled and a server fails,
-       the plugin will not attempt to fail over to the next server, if any, regardless
-       of the failover policy configured. The user must handle the error
-       manually. Depending on the configuration, the plugin may emit
-       an error of type <literal>E_WARNING</literal> reading like
-       <literal>(mysqlnd_ms) Automatic failover is not permitted in the middle of a transaction</literal>.
-       This error may then be overwritten by follow up errors such as
-       <literal>(mysqlnd_ms) No connection selected by the last filter</literal>.
-       Those errors will be generated by the failing query function.
-      </para>
-      <para>
-       <example>
-        <title>No automatic failover, error handling pitfall</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* assumption: automatic failover configured */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-
-/* sets plugin internal state in_trx = 1 */
-$mysqli->autocommit(false);
-
-/* assumption: server fails */
-if (!($res = $mysqli->query("SELECT 'Assume this query fails' AS _msg FROM DUAL"))) {
- /* handle failure of transaction, plugin internal state is still in_trx = 1 */
- printf("[%d] %s", $mysqli->errno, $mysqli->error);
- /*
-  If using autocommit() based transaction detection it is a
-  MUST to call autocommit(true). Otherwise the plugin assumes
-  the current transaction continues and connection
-  changes remain forbidden.
- */
- $mysqli->autocommit(true);
- /* Likewise, you'll want to start a new transaction */
- $mysqli->autocommit(false);
-}
-/* latin1 used from now on */
-$mysqli->set_charset("latin1");
-?>
-]]>
-         </programlisting>
-       </example>
-      </para>
-      <para>
-       If a server fails in the middle of a transaction the
-       plugin continues to refuse to switch connections until the
-       current transaction has been finished. Recall
-       that the plugin monitors API calls to detect transaction
-       boundaries. Thus, you have to, for example, enable
-       auto commit mode to end the current transaction before
-       the plugin continues load balancing and switches the server.
-       Likewise, you will want to start a new transaction
-       immediately thereafter and disable auto commit mode again.
-      </para>
-      <para>
-       Not handling failed queries and not ending a failed transaction
-       using API calls may cause all following commands emit errors
-       such as  <literal>Commands out of sync; you can't run this command now</literal>.
-       Thus, it is important to handle all errors.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.transient_error">
-     <term>
-       <parameter>transient_error</parameter>
-       <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       The setting has been introduced in 1.6.0.
-      </para>
-      <para>
-       A database cluster node may reply a transient error to a client. The client
-       can then repeat the operation on the same node, fail over to a different node
-       or abort the operation. Per definition is it safe for a client to
-       retry the same operation on the same node before giving up.
-      </para>
-      <para>
-       <literal>PECL/mysqlnd_ms</literal> can perform the retry
-       loop on behalf of the application.
-       By configuring <literal>transient_error</literal> the plugin can be
-       instructed to repeat operations failing with a certain error code for
-       a certain maximum number of times with a pause between the retries.
-       If the transient error disappears during loop execution, it is
-       hidden from the application. Otherwise, the error is
-       forwarded to the application by the end of the loop.
-      </para>
-      <para>
-       <example>
-        <title>Retry loop for transient errors</title>
-        <programlisting role="ini">
-<![CDATA[
-{
-    "myapp": {
-        "master": {
-            "master_0": {
-                "host": "localhost"
-            }
-        },
-        "slave": {
-            "slave_0": {
-                "host": "192.168.78.136",
-                "port": "3306"
-            }
-       },
-       "transient_error": {
-          "mysql_error_codes": [
-            1297
-          ],
-          "max_retries": 2,
-          "usleep_retry": 100
-       }
-    }
-}
-]]>
-        </programlisting>
-      </example>
-     </para>
-      <informaltable>
-       <tgroup cols="3">
-        <colspec colwidth="1*"/>
-        <colspec colwidth="7*"/>
-        <colspec colwidth="2*"/>
-        <thead>
-         <row>
-          <entry>Keyword</entry>
-          <entry>Description</entry>
-          <entry>Version</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-           <literal>mysql_error_codes</literal>
-          </entry>
-          <entry>
-           <para>
-            List of transient error codes. You may add any MySQL error code
-            to the list. It is possible to consider any error as transient
-            not only <literal>1297</literal>
-            (<literal>HY000 (ER_GET_TEMPORARY_ERRMSG),
-            Message: Got temporary error %d '%s' from %s</literal>).
-            Before adding other codes but <literal>1297</literal> to the list,
-            make sure your cluster supports a new attempt without impacting
-            the state of your application.
-           </para>
-          </entry>
-          <entry>Since 1.6.0.</entry>
-         </row>
-         <row>
-          <entry>
-           <literal>max_retries</literal>
-          </entry>
-          <entry>
-           <para>
-            How often to retry an operation which
-            fails with a transient error before forwarding the
-            failure to the user.
-           </para>
-           <para>
-             Default: <literal>1</literal>
-           </para>
-          </entry>
-          <entry>Since 1.6.0.</entry>
-         </row>
-         <row>
-          <entry>
-           <literal>usleep_retry</literal>
-          </entry>
-          <entry>
-           <para>
-            Milliseconds to sleep between transient error retries.
-            The value is passed to the C function <function>usleep</function>,
-            hence the name.
-           </para>
-           <para>
-             Default: <literal>100</literal>
-           </para>
-          </entry>
-          <entry>Since 1.6.0.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.xa">
-     <term>
-       <parameter>xa</parameter>
-       <type>object</type>
-     </term>
-     <listitem>
-      <para>
-       The setting has been introduced in 1.6.0.
-      </para>
-      <para>
-       <note>
-        <title>Experimental</title>
-        <para>
-         The feature is currently under development. There may be issues and/or
-         feature limitations. Do not use in production environments.
-        </para>
-       </note>
-      </para>
-      <variablelist>
-       <varlistentry>
-        <term>state_store</term>
-        <listitem>
-           <variablelist xml:id="ini.mysqlnd-ms-plugin-config-v2.xa.state-store">
-            <varlistentry>
-             <term>record_participant_credentials</term>
-             <listitem>
-              <para>
-               Whether to store the username and password of a global transaction
-               participant in the participants table. If disabled, the garbage
-               collection will use the default username and password when connecting
-               to the participants. Unless you are using a different username and
-               password for each of your MySQL servers, you can use the default
-               and avoid storing the sensible information in state store.
-              </para>
-              <para>
-               Please note, username and password are stored in clear text when using
-               the MySQL state store, which is the only one available. It is in your
-               responsibility to protect this sensible information.
-              </para>
-              <para>
-               Default: <literal>false</literal>
-              </para>
-             </listitem>
-            </varlistentry>
-            <varlistentry>
-             <term>participant_localhost_ip</term>
-             <listitem>
-              <para>
-               During XA garbage collection the plugin may find a participant server
-               for which the host <literal>localhost</literal>
-               has been recorded. If the garbage collection takes place on another host
-               but the host that has written the participant record to the state store,
-               the host name <literal>localhost</literal> now resolves to a different
-               host. Therefore, when recording a participant servers host name
-               in the state store, a value of <literal>localhost</literal> must
-               be replaced with the actual IP address of <literal>localhost</literal>.
-              </para>
-              <para>
-               Setting <literal>participant_localhost_ip</literal> should be considered
-               only if using <literal>localhost</literal> cannot be avoided.
-               From a garbage collection point of view only, it is preferrable not to
-               configure any socket connection but to provide an IP address and port
-               for a node.
-              </para>
-             </listitem>
-            </varlistentry>
-            <varlistentry>
-             <term>mysql</term>
-             <listitem>
-              <para>
-               The MySQL state store is the only state store available.
-              </para>
-              <variablelist>
-               <varlistentry>
-                <term>global_trx_table</term>
-                <listitem>
-                 <para>
-                  Name of the MySQL table used to store the state of an ongoing or aborted
-                  global transaction. Use the below SQL statement to create the table.
-                  Make sure to edit the table name to match your configuration.
-                 </para>
-                 <para>
-                  Default: <literal>mysqlnd_ms_xa_trx</literal>
-                 </para>
-                 <para>
-                  <example>
-                   <title>SQL definition for the MySQL state store transaction table</title>
-                   <programlisting role="sql">
-<![CDATA[
-CREATE TABLE mysqlnd_ms_xa_trx (
-  store_trx_id int(11) NOT NULL AUTO_INCREMENT,
-  gtrid int(11) NOT NULL,
-  format_id int(10) unsigned NOT NULL DEFAULT '1',
-  state enum('XA_NON_EXISTING','XA_ACTIVE','XA_IDLE','XA_PREPARED','XA_COMMIT','XA_ROLLBACK') NOT NULL DEFAULT 'XA_NON_EXISTING',
-  intend enum('XA_NON_EXISTING','XA_ACTIVE','XA_IDLE','XA_PREPARED','XA_COMMIT','XA_ROLLBACK') DEFAULT 'XA_NON_EXISTING',
-  finished enum('NO','SUCCESS','FAILURE') NOT NULL DEFAULT 'NO',
-  modified timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  started datetime DEFAULT NULL,
-  timeout datetime DEFAULT NULL,
-  PRIMARY KEY (store_trx_id),
-  KEY idx_xa_id (gtrid,format_id,finished),
-  KEY idx_state (state)
-) ENGINE=InnoDB
-]]>
-                   </programlisting>
-                  </example>
-                 </para>
-                </listitem>
-               </varlistentry>
-                 <varlistentry>
-                  <term>participant_table</term>
-                  <listitem>
-                   <para>
-                    Name of the MySQL table used to store participants of an ongoing or aborted
-                    global transaction. Use the below SQL statement to create the table.
-                    Make sure to edit the table name to match your configuration.
-                   </para>
-                   <para>
-                    Storing credentials can be enabled and disabled using
-                    <literal>record_participant_credentials</literal>
-                   </para>
-                   <para>
-                    Default: <literal>mysqlnd_ms_xa_participants</literal>
-                   </para>
-                   <example>
-                    <title>SQL definition for the MySQL state store transaction table</title>
-                    <programlisting role="sql">
-<![CDATA[
-CREATE TABLE mysqlnd_ms_xa_participants (
-  fk_store_trx_id int(11) NOT NULL,
-  bqual varbinary(64) NOT NULL DEFAULT '',
-  participant_id int(10) unsigned NOT NULL AUTO_INCREMENT,
-  server_uuid varchar(127) DEFAULT NULL,
-  scheme varchar(1024) NOT NULL,
-  host varchar(127) DEFAULT NULL,
-  port smallint(5) unsigned DEFAULT NULL,
-  socket varchar(127) DEFAULT NULL,
-  user varchar(127) DEFAULT NULL,
-  password varchar(127) DEFAULT NULL,
-  state enum('XA_NON_EXISTING','XA_ACTIVE','XA_IDLE','XA_PREPARED','XA_COMMIT','XA_ROLLBACK')
-   NOT NULL DEFAULT 'XA_NON_EXISTING',
-  health enum('OK','GC_DONE','CLIENT ERROR','SERVER ERROR') NOT NULL DEFAULT 'OK',
-  connection_id int(10) unsigned DEFAULT NULL,
-  client_errno smallint(5) unsigned DEFAULT NULL,
-  client_error varchar(1024) DEFAULT NULL,
-  modified timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (participant_id),
-  KEY idx_xa_bqual (bqual),
-  KEY idx_store_trx (fk_store_trx_id),
-  CONSTRAINT mysqlnd_ms_xa_participants_ibfk_1 FOREIGN KEY (fk_store_trx_id)
-    REFERENCES mysqlnd_ms_xa_trx (store_trx_id) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB
-]]>
-                    </programlisting>
-                  </example>
-                 </listitem>
-                </varlistentry>
-                <varlistentry>
-                 <term>garbage_collection_table</term>
-                 <listitem>
-                  <para>
-                   Name of the MySQL table used to track and synchronize garbage collection runs.
-                   Use the below SQL statement to create the table.
-                   Make sure to edit the table name to match your configuration.
-                  </para>
-                  <para>
-                   Default: <literal>mysqlnd_ms_xa_gc</literal>
-                  </para>
-                  <example>
-                   <title>SQL definition for the MySQL state store garbage collection table</title>
-                   <programlisting role="sql">
-<![CDATA[
-CREATE TABLE mysqlnd_ms_xa_gc (
-  gc_id int(10) unsigned NOT NULL AUTO_INCREMENT,
-  gtrid int(11) NOT NULL,
-  format_id int(10) unsigned NOT NULL DEFAULT '1',
-  fk_store_trx_id int(11) DEFAULT NULL,
-  modified timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  attempts smallint(5) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (gc_id),
-  KEY idx_store_trx (gtrid,format_id,fk_store_trx_id)
-) ENGINE=InnoDB
-]]>
-                   </programlisting>
-                  </example>
-                 </listitem>
-                </varlistentry>
-               <varlistentry>
-                <term>host</term>
-                <listitem>
-                 <para>
-                  Host name of the MySQL server.
-                 </para>
-                </listitem>
-               </varlistentry>
-               <varlistentry>
-                <term>user</term>
-                <listitem>
-                 <para>
-                  Name of the user used to connect to the MySQL server.
-                 </para>
-                </listitem>
-               </varlistentry>
-               <varlistentry>
-                <term>password</term>
-                <listitem>
-                 <para>
-                  Password for the MySQL server user.
-                 </para>
-                </listitem>
-               </varlistentry>
-               <varlistentry>
-                <term>db</term>
-                <listitem>
-                 <para>
-                  Database that holds the garbage collection tables.
-                  Please note, you have to create the garbage collection
-                  tables prior to using the plugin. The tables will not be
-                  created implicitly during runtime but garbage collection
-                  will fail if the tables to not exist.
-                 </para>
-                </listitem>
-               </varlistentry>
-               <varlistentry>
-                <term>port</term>
-                <listitem>
-                 <para>
-                  Port of the MySQL server.
-                 </para>
-                </listitem>
-               </varlistentry>
-               <varlistentry>
-                <term>socket</term>
-                <listitem>
-                 <para>
-                  Unix domain socket of the MySQL server. Please note,
-                  if you have multiple PHP servers each of them will
-                  try to carry out garbage collection and need to be able
-                  to connect to the state store. In this case, you may
-                  prefer configuring an IP address and a port for
-                  the MySQL state store server to ensure all PHP servers
-                  can reach it.
-                 </para>
-                </listitem>
-               </varlistentry>
-              </variablelist>
-             </listitem>
-            </varlistentry>
-           </variablelist>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>rollback_on_close</term>
-          <listitem>
-           <para>
-            Whether to automatically rollback an open global transaction when
-            a connection is closed. If enabled, it mimics the default behaviour
-            of local transactions. Should a client disconnect, the server rolls
-            back any open and unfinished transactions.
-           </para>
-           <para>
-            Default: <literal>true</literal>
-           </para>
-          </listitem>
-         </varlistentry>
-         <varlistentry xml:id="ini.mysqlnd-ms-plugin-config-v2.xa.gc">
-          <term>garbage_collection</term>
-          <listitem>
-           <variablelist>
-            <varlistentry>
-             <term>max_retries</term>
-             <listitem>
-              <para>
-               Maximum number of garbage collection runs before giving up.
-               Allowed values are from <literal>0</literal> to <literal>100</literal>.
-               A setting of <literal>0</literal> means no limit, unless
-               the state store enforces a limit. Should the state store enforce a limit,
-               it can be supposed to be significantly higher than <literal>100</literal>.
-               Available since 1.6.0.
-              </para>
-              <para>
-               Please note, it is important to end failed XA
-               transactions within reasonable time to make participating servers
-               free resources bound to the transaction. The built-in garbage
-               collection is not expected to fail for a long period as
-               long as crashed servers become available again quickly.
-               Still, a situation may arise where a human is required to
-               act because the built-in garbage collection stopped or failed.
-               In this case, you may first want to check if the transaction still
-               cannot be fixed by forcing <function>mysqlnd_ms_xa_gc</function>
-               to ignore the setting, prior to handling it manually.
-              </para>
-              <para>
-               Default: <literal>5</literal>
-              </para>
-             </listitem>
-            </varlistentry>
-            <varlistentry>
-             <term>probability</term>
-             <listitem>
-              <para>
-               Garbage collection probability.
-               Allowed values are from <literal>0</literal> to <literal>1000</literal>.
-               A setting of <literal>0</literal> disables automatic background
-               garbage collection. Despite a setting of <literal>0</literal> it is
-               still possible to trigger garbage collection by calling
-               <function>mysqlnd_ms_gc</function>.
-               Available since 1.6.0.
-              </para>
-              <para>
-               The automatic garbage collection of stalled XA transaction is only
-               available if a state store have been configured. The state store
-               is responsible to keep track of XA transactions. Based on its recordings
-               it can find blocked XA transactions where the client has crashed,
-               connect to the participants and rollback the unfinished transactions.
-              </para>
-              <para>
-               The garbage collection is triggered as part of PHP's request shutdown
-               procedure at the end of a web request. That is after your PHP script
-               has finished working. Do decide whether to run the garbage collection
-               a random value between <literal>0</literal> and <literal>1000</literal>
-               is computed. If the <literal>probability</literal> value is higher
-               or equal to the random value, the state stores garbage collection routines
-               are invoked.
-              </para>
-              <para>
-               Default: <literal>5</literal>
-              </para>
-             </listitem>
-            </varlistentry>
-            <varlistentry>
-             <term>max_transactions_per_run</term>
-             <listitem>
-              <para>
-               Maximum number of unfinished XA transactions considered
-               by the garbage collection during one run.
-               Allowed values are from <literal>1</literal> to <literal>32768</literal>.
-               Available since 1.6.0.
-              </para>
-              <para>
-               Cleaning up an unfinished XA transaction takes considerable
-               amounts of time and resources. The garbage collection routine
-               may have to connect to several participants of a failed global
-               transaction to issue the SQL commands for rolling back
-               the unfinished tranaction.
-              </para>
-              <para>
-               Default: <literal>100</literal>
-              </para>
-             </listitem>
-            </varlistentry>
-           </variablelist>
-          </listitem>
-         </varlistentry>
-        </variablelist>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </para>
-   </section>
-
- <section xml:id="mysqlnd-ms.plugin-ini-v1">
-  <title xmlns="http://docbook.org/ns/docbook">Plugin configuration file (&lt;= 1.0.x)</title>
-  <note>
-   <para>
-    The below description applies to PECL/mysqlnd_ms &lt; 1.1.0-beta.
-    It is not valid for later versions.
-   </para>
-  </note>
-  <para>
-   The plugin is using its own configuration file. The configuration file
-   holds information on the MySQL replication master server,
-   the MySQL replication slave servers, the server pick (load balancing) policy,
-   the failover strategy and the use of lazy connections.
-  </para>
-  <para>
-   The PHP configuration directive
-   <link linkend="ini.mysqlnd-ms.ini-file"><literal>mysqlnd_ms.ini_file</literal></link>
-   is used to set the plugins configuration file.
-  </para>
-  <para>
-   The configuration file mimics standard the <literal>php.ini</literal> format.
-   It consists of one or more sections. Every section defines its own unit
-   of settings. There is no global section for setting defaults.
-  </para>
-  <para>
-   Applications reference sections by their name. Applications use section names
-   as the host (server) parameter to the various connect methods of the
-   <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link> and
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions. Upon connect
-   the <link linkend="book.mysqlnd">mysqlnd</link> plugin compares the hostname
-   with all section names from the plugin configuration file. If hostname and
-   section name match, the plugin will load the sections settings.
-  </para>
-  <para>
-   <example>
-    <title>Using section names example</title>
-    <programlisting role="ini">
-<![CDATA[
-[myapp]
-master[] = localhost
-slave[] = 192.168.2.27
-slave[] = 192.168.2.28:3306
-[localhost]
-master[] = localhost:/tmp/mysql/mysql.sock
-slave[] = 192.168.3.24:3305
-slave[] = 192.168.3.65:3309
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* All of the following connections will be load balanced */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-$pdo = new PDO('mysql:host=myapp;dbname=database', 'username', 'password');
-$mysql = mysql_connect("myapp", "username", "password");
-
-$mysqli = new mysqli("localhost", "username", "password", "database");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Section names are strings. It is valid to use a section name such as
-   <literal>192.168.2.1</literal>, <literal>127.0.0.1</literal> or
-   <literal>localhost</literal>. If, for example, an application
-   connects to <literal>localhost</literal> and a plugin
-   configuration section <literal>[localhost]</literal> exists, the
-   semantics of the connect operation are changed. The application will
-   no longer only use the MySQL server running on the host
-   <literal>localhost</literal> but the plugin will start to load balance
-   MySQL queries following the rules from the <literal>[localhost]</literal>
-   configuration section. This way you can load balance queries from
-   an application without changing the applications source code.
-  </para>
-  <para>
-   The <literal>master[]</literal>, <literal>slave[]</literal>
-   and <literal>pick[]</literal> configuration directives use a list-like syntax.
-   Configuration directives supporting list-like syntax may appear multiple
-   times in a configuration section. The plugin maintains the order in
-   which entries appear when interpreting them. For example,
-   the below example shows two <literal>slave[]</literal> configuration
-   directives in the configuration section <literal>[myapp]</literal>.
-   If doing round-robin load balancing for read-only queries, the plugin
-   will send the first read-only query to the MySQL server
-   <literal>mysql_slave_1</literal> because it is the first in the list.
-   The second read-only query will be send to the MySQL server
-   <literal>mysql_slave_2</literal> because it is the second in the list.
-   Configuration directives supporting list-like syntax result are ordered
-   from top to bottom in accordance to their appearance within a configuration
-   section.
-  </para>
-  <para>
-   <example>
-    <title>List-like syntax</title>
-    <programlisting role="ini">
-<![CDATA[
-[myapp]
-master[] = mysql_master_server
-slave[] = mysql_slave_1
-slave[] = mysql_slave_2
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   Here is a short explanation of the configuration directives that can be used.
-  </para>
-  <para>
-  <variablelist>
-   <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.master">
-     <term>
-      <parameter>master[]</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       URI of a MySQL replication master server. The URI follows the syntax
-       <literal>hostname[:port|unix_domain_socket]</literal>.
-      </para>
-      <para>
-       The plugin supports using only one master server.
-      </para>
-      <para>
-       Setting a master server is mandatory. The plugin will report a
-       warning upon connect if the user has failed to provide a master
-       server for a configuration section.
-       The warning may read
-       <literal>(mysqlnd_ms) Cannot find master section in config</literal>.
-       Furthermore the plugin may set an error code for the connection handle such as
-       <literal>HY000/2000 (CR_UNKNOWN_ERROR)</literal>. The corresponding error
-       message depends on your language settings.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.slave">
-    <term>
-      <parameter>slave[]</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       URI of one or more MySQL replication slave servers. The URI follows the syntax
-       <literal>hostname[:port|unix_domain_socket]</literal>.
-      </para>
-      <para>
-       The plugin supports using one or more slave servers.
-      </para>
-      <para>
-       Setting a slave server is mandatory. The plugin will report a
-       warning upon connect if the user has failed to provide at least one slave
-       server for a configuration section. The warning may read
-       <literal>(mysqlnd_ms) Cannot find slaves section in config</literal>.
-       Furthermore the plugin may set an error code for the connection handle such as
-       <literal>HY000/2000 (CR_UNKNOWN_ERROR)</literal>. The corresponding error
-       message depends on your language settings.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.pick">
-     <term>
-      <parameter>pick[]</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Load balancing (server picking) policy. Supported policies:
-       <literal>random</literal>, <literal>random_once</literal> (default),
-       <literal>roundrobin</literal>, <literal>user</literal>.
-      </para>
-      <para>
-       If no load balancing policy is set, the plugin will default to
-       <literal>random_once</literal>. The <literal>random_once</literal>
-       policy picks a random slave server when running the first read-only
-       statement. The slave server will be used for all read-only
-       statements until the PHP script execution ends.
-      </para>
-     <para>
-       The <literal>random</literal> policy will pick a random server whenever
-       a read-only statement is to be executed.
-     </para>
-     <para>
-       If using
-       <literal>roundrobin</literal> the plugin iterates over the list of
-       configured slave servers to pick a server for statement execution.
-       If the plugin reaches the end of the list, it wraps around to the beginning
-       of the list and picks the first configured slave server.
-      </para>
-      <para>
-       Setting more than one load balancing policy for a configuration
-       section makes only sense in conjunction with <literal>user</literal>
-       and <function>mysqlnd_ms_set_user_pick_server</function>. If the
-       user defined callback fails to pick a server, the plugin falls
-       back to the second configured load balancing policy.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.failover">
-     <term>
-      <parameter>failover</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Failover policy. Supported policies:
-       <literal>disabled</literal> (default), <literal>master</literal>.
-      </para>
-      <para>
-       If no failover policy is set, the plugin will not do any
-       automatic failover (<literal>failover=disabled</literal>). Whenever
-       the plugin fails to connect a server it will emit a warning and
-       set the connections error code and message. Thereafter it is up to
-       the application to handle the error and, for example, resent the
-       last statement to trigger the selection of another server.
-      </para>
-      <para>
-       If using <literal>failover=master</literal> the plugin will implicitly
-       failover to a slave, if available. Please check the
-       concepts documentation to learn about potential
-       pitfalls and risks of using <literal>failover=master</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.lazy-connections">
-     <term>
-      <parameter>lazy_connections</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Controls the use of lazy connections. Lazy connections
-       are connections which are not opened before the client sends the first
-       connection.
-      </para>
-      <para>
-       It is strongly recommended to use lazy connections.
-       Lazy connections help to keep the number of open connections low.
-       If you disable lazy connections and, for example, configure one MySQL
-       replication master server and two MySQL replication slaves, the
-       plugin will open three connections upon the first call to a
-       connect function although the application might use the master
-       connection only.
-      </para>
-      <para>
-       Lazy connections bare a risk if you make heavy use of actions
-       which change the state of a connection. The plugin does not dispatch
-       all state changing actions to all connections from the connection pool.
-       The few dispatched actions are applied to already opened connections
-       only. Lazy connections opened in the future are not affected.
-       If, for example, the connection character set is changed using a
-       PHP MySQL API call, the plugin will change the character set of all
-       currently opened connection. It will not remember the character set
-       change to apply it on lazy connections opened in the future. As a
-       result the internal connection pool would hold connections using
-       different character sets. This is not desired. Remember that character
-       sets are taken into account for escaping.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.master-on-write">
-     <term>
-      <parameter>master_on_write</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       If set, the plugin will use the master server only after the
-       first statement has been executed on the master. Applications
-       can still send statements to the slaves using SQL hints to
-       overrule the automatic decision.
-      </para>
-      <para>
-       The setting may help with replication lag. If an application runs
-       an <literal>INSERT</literal> the plugin will, by default, use the
-       master to execute all following statements, including
-       <literal>SELECT</literal> statements. This helps to avoid problems
-       with reads from slaves which have not replicated the
-       <literal>INSERT</literal> yet.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-ms-plugin-config.trx-stickiness">
-     <term>
-      <parameter>trx_stickiness</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Transaction stickiness policy. Supported policies:
-       <literal>disabled</literal> (default), <literal>master</literal>.
-      </para>
-      <para>
-       Experimental feature.
-      </para>
-      <para>
-       The setting requires 5.4.0 or newer. If used with PHP older than 5.4.0,
-       the plugin will emit a warning like
-       <literal>(mysqlnd_ms) trx_stickiness strategy is not supported before PHP 5.3.99</literal>.
-      </para>
-      <para>
-       If no transaction stickiness policy is set or,
-       if setting <literal>trx_stickiness=disabled</literal>,
-       the plugin is not transaction aware. Thus, the plugin may load balance
-       connections and switch connections in the middle of a transaction.
-       The plugin is not transaction safe. SQL hints must be used
-       avoid connection switches during a transaction.
-      </para>
-      <para>
-       As of PHP 5.4.0 the mysqlnd library allows the plugin to monitor
-       the <literal>autocommit</literal> mode set by calls to the
-       libraries <literal>trx_autocommit()</literal> function.
-       If setting <literal>trx_stickiness=master</literal> and
-       <literal>autocommit</literal> gets disabled by a PHP MySQL extension
-       invoking the <literal>mysqlnd</literal> library internal
-       function call <literal>trx_autocommit()</literal>, the plugin is made
-       aware of the begin of a transaction. Then, the plugin stops load balancing
-       and directs all statements to the master server until
-       <literal>autocommit</literal> is enabled. Thus, no SQL hints are required.
-      </para>
-      <para>
-       An example of a PHP MySQL API function calling the <literal>mysqlnd</literal>
-       library internal function call <literal>trx_autocommit()</literal> is
-       <function>mysqli_autocommit</function>.
-      </para>
-      <para>
-       Although setting <literal>trx_stickiness=master</literal>, the plugin
-       cannot be made aware of <literal>autocommit</literal> mode changes caused
-       by SQL statements such as <literal>SET AUTOCOMMIT=0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.testing">
-  <title xmlns="http://docbook.org/ns/docbook">Testing</title>
-  <note>
-   <para>
-    The section applies to mysqlnd_ms 1.1.0 or newer, not the 1.0 series.
-   </para>
-  </note>
-  <para>
-   The PECL/mysqlnd_ms test suite is in the <filename>tests/</filename>
-   directory of the source distribution. The test suite consists of standard
-   phpt tests, which are described on the PHP Quality Assurance Teams website.
-  </para>
-  <para>
-   Running the tests requires setting up one to four MySQL servers. Some tests don't
-   connect to MySQL at all. Others require one server for testing. Some require
-   two distinct servers. In some cases two servers are used to emulate a
-   replication setup. In other cases a master and a slave of an existing MySQL replication
-   setup are required for testing. The tests will try to detect how many servers
-   and what kind of servers are given. If the required servers are not found, the
-   test will be skipped automatically.
-  </para>
-  <para>
-   Before running the tests, edit <filename>tests/config.inc</filename> to
-   configure the MySQL servers to be used for testing.
-  </para>
-  <para>
-   The most basic configuration is as follows.
-   <programlisting>
-<![CDATA[
- putenv("MYSQL_TEST_HOST=localhost");
- putenv("MYSQL_TEST_PORT=3306");
- putenv("MYSQL_TEST_USER=root");
- putenv("MYSQL_TEST_PASSWD=");
- putenv("MYSQL_TEST_DB=test");
- putenv("MYSQL_TEST_ENGINE=MyISAM");
- putenv("MYSQL_TEST_SOCKET=");
-
- putenv("MYSQL_TEST_SKIP_CONNECT_FAILURE=1");
- putenv("MYSQL_TEST_CONNECT_FLAGS=0");
- putenv("MYSQL_TEST_EXPERIMENTAL=0");
-
- /* replication cluster emulation */
- putenv("MYSQL_TEST_EMULATED_MASTER_HOST=". getenv("MYSQL_TEST_HOST"));
- putenv("MYSQL_TEST_EMULATED_SLAVE_HOST=". getenv("MYSQL_TEST_HOST"));
-
- /* real replication cluster */
- putenv("MYSQL_TEST_MASTER_HOST=". getenv("MYSQL_TEST_EMULATED_MASTER_HOST"));
- putenv("MYSQL_TEST_SLAVE_HOST=". getenv("MYSQL_TEST_EMULATED_SLAVE_HOST"));
-]]>
-     </programlisting>
-   </para>
-   <para>
-    <literal>MYSQL_TEST_HOST</literal>, <literal>MYSQL_TEST_PORT</literal> and
-    <literal>MYSQL_TEST_SOCKET</literal> define the hostname,
-    TCP/IP port and Unix domain socket of the default database server.
-    <literal>MYSQL_TEST_USER</literal> and <literal>MYSQL_TEST_PASSWD</literal>
-    contain the user and password needed to connect to the database/schema
-    configured with <literal>MYSQL_TEST_DB</literal>. All configured
-    servers must  have the same database user configured to give access to
-    the test database.
-   </para>
-   <para>
-    Using <literal>host</literal>, <literal>host:port</literal> or <literal>host:/path/to/socket</literal>
-    syntax one can set an alternate  host, host and port or host and socket for any
-    of the servers.
-   <programlisting>
-<![CDATA[
-putenv("MYSQL_TEST_SLAVE_HOST=192.168.78.136:3307"));
-putenv("MYSQL_TEST_MASTER_HOST=myserver_hostname:/path/to/socket"));
-]]>
-     </programlisting>
-   </para>
- </section>
-
- <section xml:id="mysqlnd-ms.debugging">
-  <title xmlns="http://docbook.org/ns/docbook">Debugging and Tracing</title>
-  <para>
-   The mysqlnd debug log can be used to debug and trace the actitivities of
-   PECL/mysqlnd_ms. As a mysqlnd PECL/mysqlnd_ms adds trace information to the
-   mysqlnd library debug file. Please, see the
-   <link linkend="ini.mysqlnd.debug"><literal>mysqlnd.debug</literal></link>
-   PHP configuration directive documentation for a detailed description
-   on how to configure the debug log.
-  </para>
-  <para>
-  Configuration setting example to activate the debug log:
-  <programlisting>
-<![CDATA[
-mysqlnd.debug=d:t:x:O,/tmp/mysqlnd.trace
-]]>
-  </programlisting>
-  <note>
-    <para>
-     This feature is only available with a debug build of PHP. Works
-     on Microsoft Windows if using a debug build of PHP and PHP was
-     built using Microsoft Visual C version 9 and above.
-    </para>
-   </note>
-  </para>
-  <para>
-   The debug log shows mysqlnd library and PECL/mysqlnd_ms plugin function calls,
-   similar to a trace log. Mysqlnd library calls are usually prefixed with
-   <literal>mysqlnd_</literal>. PECL/mysqlnd internal calls begin with
-   <literal>mysqlnd_ms</literal>.
-  </para>
-  <para>
-   Example excerpt from the debug log (connect):
-   <programlisting>
-<![CDATA[
-[...]
->mysqlnd_connect
-| info : host=myapp user=root db=test port=3306 flags=131072
-| >mysqlnd_ms::connect
-| | >mysqlnd_ms_config_json_section_exists
-| | | info : section=[myapp] len=[5]
-| | | >mysqlnd_ms_config_json_sub_section_exists
-| | | | info : section=[myapp] len=[5]
-| | | | info : ret=1
-| | | <mysqlnd_ms_config_json_sub_section_exists
-| | | info : ret=1
-| | <mysqlnd_ms_config_json_section_exists
-[...]
-]]>
-   </programlisting>
-  </para>
-  <para>
-   The debug log is not only useful for plugin developers but also to find the
-   cause of user errors. For example, if your application does not do proper
-   error handling and fails to record error messages, checking the debug
-   and trace log may help finding the cause. Use of the debug log
-   to debug application issues should be considered only if no other
-   option is available. Writing the debug log to disk is a slow
-   operation and may have negative impact on the application
-   performance.
-  </para>
-  <para>
-   Example excerpt from the debug log (connection failure):
-   <programlisting>
-<![CDATA[
-[...]
-| | | | | | | info : adding error [Access denied for user 'root'@'localhost' (using password: YES)] to the list
-| | | | | | | info : PACKET_FREE(0)
-| | | | | | | info : PACKET_FREE(0x7f3ef6323f50)
-| | | | | | | info : PACKET_FREE(0x7f3ef6324080)
-| | | | | | <mysqlnd_auth_handshake
-| | | | | | info : switch_to_auth_protocol=n/a
-| | | | | | info : conn->error_info.error_no = 1045
-| | | | | <mysqlnd_connect_run_authentication
-| | | | | info : PACKET_FREE(0x7f3ef63236d8)
-| | | | | >mysqlnd_conn::free_contents
-| | | | | | >mysqlnd_net::free_contents
-| | | | | | <mysqlnd_net::free_contents
-| | | | | | info : Freeing memory of members
-| | | | | | info : scheme=unix:///tmp/mysql.sock
-| | | | | | >mysqlnd_error_list_pdtor
-| | | | | | <mysqlnd_error_list_pdtor
-| | | | | <mysqlnd_conn::free_contents
-| | | | <mysqlnd_conn::connect
-[...]
-]]>
-   </programlisting>
-  </para>
-  <para>
-   The trace log can also be used to verify correct behaviour
-   of PECL/mysqlnd_ms itself, for example, to check which server has been
-   selected for query execution and why.
-  </para>
-  <para>
-   Example excerpt from the debug log (plugin decision):
-   <programlisting>
-<![CDATA[
-[...]
->mysqlnd_ms::query
-| info : query=DROP TABLE IF EXISTS test
-| >_mysqlnd_plugin_get_plugin_connection_data
-| | info : plugin_id=5
-| <_mysqlnd_plugin_get_plugin_connection_data
-| >mysqlnd_ms_pick_server_ex
-| | info : conn_data=0x7fb6a7d3e5a0 *conn_data=0x7fb6a7d410d0
-| | >mysqlnd_ms_select_servers_all
-| | <mysqlnd_ms_select_servers_all
-| | >mysqlnd_ms_choose_connection_rr
-| | | >mysqlnd_ms_query_is_select
-[...]
-| | | <mysqlnd_ms_query_is_select
-[...]
-| | | info : Init the master context
-| | | info : list(0x7fb6a7d3f598) has 1
-| | | info : Using master connection
-| | | >mysqlnd_ms_advanced_connect
-| | | | >mysqlnd_conn::connect
-| | | | | info : host=localhost user=root db=test port=3306 flags=131072 persistent=0 state=0
-]]>
-   </programlisting>
-  </para>
-  <para>
-   In this case the statement <literal>DROP TABLE IF EXISTS test</literal> has been
-   executed. Note that the statement string is shown in the log file. You may want
-   to take measures to restrict access to the log for security considerations.
-  </para>
-  <para>
-    The statement has been load balanced using round robin policy,
-    as you can easily guess from the functions name <literal>>mysqlnd_ms_choose_connection_rr</literal>.
-    It has been sent to a master server running on
-    <literal>host=localhost user=root db=test port=3306 flags=131072 persistent=0 state=0</literal>.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-ms.monitoring">
-  <title xmlns="http://docbook.org/ns/docbook">Monitoring</title>
-  <para>
-   Plugin activity can be monitored using the mysqlnd trace log,
-   mysqlnd statistics, mysqlnd_ms plugin statistics and external PHP debugging tools.
-   Use of the trace log should be limited to debugging. It is recommended
-   to use the plugins statistics for monitoring.
-  </para>
-  <para>
-   Writing a trace log is a slow operation. If using an external PHP debugging tool,
-   please refer to the vendors manual about its performance impact and the
-   type of information collected. In many cases, external debugging tools will
-   provide call stacks. Often, a call stack or a trace log is more difficult to interpret
-   than the statistics provided by the plugin.
-  </para>
-  <para>
-   Plugin statistics tell how often which kind of cluster node has been used (slave or master),
-   why the node was used, if lazy connections have been used and if global transaction
-   ID injection has been performed. The monitoring information provided enables
-   user to verify plugin decisions and to plan their cluster resources based on usage pattern.
-   The function <function>mysqlnd_ms_get_stats</function>
-   is used to access the statistics. Please, see the functions description for a list
-   of available statistics.
-  </para>
-  <para>
-   Statistics are collected on a per PHP process basis. Their scope is a PHP process.
-   Depending on the PHP deployment model a process may serve one or multiple web requests.
-   If using CGI model, a PHP process serves one web request. If using FastCGI or
-   pre-fork web server models, a PHP process usually serves multiple web requests.
-   The same is the case with a threaded web server. Please, note that threads running
-   in parallel can update the statistics in parallel. Thus, if using a threaded PHP
-   deployment model, statistics can be changed by more than one script at a time. A
-   script cannot rely on the fact that it sees only its own changes to statistics.
-  </para>
-  <para>
-   <example>
-    <title>Verify plugin activity in a non-threaded deployment model</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.collect_statistics=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Load balanced following "myapp" section rules from the plugins config file (not shown) */
-$mysqli = new mysqli("myapp", "username", "password", "database");
-if (mysqli_connect_errno())
-  /* Of course, your error handling is nicer... */
-  die(sprintf("[%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
-
-$stats_before = mysqlnd_ms_get_stats();
-if ($res = $mysqli->query("SELECT 'Read request' FROM DUAL")) {
-  var_dump($res->fetch_all());
-}
-$stats_after = mysqlnd_ms_get_stats();
-if ($stats_after['use_slave'] <= $stats_before['use_slave']) {
-  echo "According to the statistics the read request has not been run on a slave!";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Statistics are aggregated for all plugin activities and all connections handled by
-   the plugin. It is not possible to tell how much a certain connection handle has
-   contributed to the overall statistics.
-  </para>
-  <para>
-   Utilizing PHPs <function>register_shutdown_function</function> function or the
-   <literal>auto_append_file</literal> PHP configuration directive it is
-   easily possible to dump statistics into, for example, a log file when a script
-   finishes. Instead of using a log file it is also possible to send the statistics
-   to an external monitoring tool for recording and display.
-  </para>
-  <para>
-   <example>
-    <title>Recording statistics during shutdown</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_ms.enable=1
-mysqlnd_ms.collect_statistics=1
-error_log=/tmp/php_errors.log
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function check_stats() {
-  $msg = str_repeat("-", 80) . "\n";
-  $msg .= var_export(mysqlnd_ms_get_stats(), true) . "\n";
-  $msg .= str_repeat("-", 80) . "\n";
-  error_log($msg);
-}
-register_shutdown_function("check_stats");
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-  </section>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_ms/versions.xml b/reference/mysqlnd_ms/versions.xml
deleted file mode 100644
index b8a1fb25a4..0000000000
--- a/reference/mysqlnd_ms/versions.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
- <!-- Functions -->
- <function name='mysqlnd_ms_get_last_gtid' from='PECL mysqlnd_ms &gt;= 1.2.0'/>
- <function name='mysqlnd_ms_get_last_qos' from='PECL mysqlnd_ms &gt;= 1.2.0'/>
- <function name='mysqlnd_ms_get_last_used_connection' from='PECL mysqlnd_ms &gt;= 1.1.0'/>
- <function name='mysqlnd_ms_get_stats' from='PECL mysqlnd_ms &gt;= 1.0.0'/>
- <function name='mysqlnd_ms_match_wild' from='PECL mysqlnd_ms &gt;= 1.1.0'/>
- <function name='mysqlnd_ms_query_is_select' from='PECL mysqlnd_ms &gt;= 1.0.0'/>
- <function name='mysqlnd_ms_set_user_pick_server' from='PECL mysqlnd_ms &lt; 1.1.0'/>
- <function name='mysqlnd_ms_set_qos' from='PECL mysqlnd_ms &lt; 1.2.0'/>
- <function name='mysqlnd_ms_xa_begin' from='PECL mysqlnd_ms &lt; 1.6.0'/>
- <function name='mysqlnd_ms_xa_commit' from='PECL mysqlnd_ms &lt; 1.6.0'/>
- <function name='mysqlnd_ms_xa_rollback' from='PECL mysqlnd_ms &lt; 1.6.0'/>
- <function name='mysqlnd_ms_xa_gc' from='PECL mysqlnd_ms &lt; 1.6.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_mux/book.xml b/reference/mysqlnd_mux/book.xml
deleted file mode 100644
index dbd0a42ffb..0000000000
--- a/reference/mysqlnd_mux/book.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mysqlnd-mux" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd connection multiplexing plugin</title>
- <titleabbrev>mysqlnd_mux</titleabbrev>
-
- <preface xml:id="intro.mysqlnd-mux">
-  &reftitle.intro;
-  <para>
-   The mysqlnd multiplexing plugin (<literal>mysqlnd_mux</literal>)
-   multiplexes MySQL connections established by all PHP MySQL extensions 
-   that use the MySQL native driver (<link linkend="book.mysqlnd">mysqlnd</link>)
-   for PHP.
-  </para>
-  <para>
-   The MySQL native driver for PHP features an internal C API for plugins,
-   such as the connection multiplexing plugin, which can extend the functionality of
-   mysqlnd. See the <link linkend="book.mysqlnd">mysqlnd</link> for additional details
-   about its benefits over the MySQL Client Library libmysqlclient.
-  </para>
-  <para>
-   Mysqlnd plugins like <literal>mysqlnd_mux</literal> operate, for the most part,
-   transparently from a user perspective. The connection multiplexing
-   plugin supports all PHP applications, and all MySQL PHP extensions.
-   It does not change existing APIs. Therefore, it can easily be used with
-   existing PHP applications.
-  </para>
-  <note>
-   <para>
-     This is a proof-of-concept. All features are at an early stage. Not all
-     kinds of queries are handled by the plugin yet. Thus, it cannot be used
-     in a drop-in fashion at the moment.
-    </para>
-    <para>
-      Please, do not use this version in production environments.
-    </para>
-  </note>
-  <section xml:id="mysqlnd-mux.key-features">
-   <title>Key Features</title>
-   <para>
-    The key features of mysqlnd_mux are as follows:
-   </para>
-   <para>
-    <itemizedlist>
-     <listitem>
-      <para>
-       Transparent and therefore easy to use:
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Supports all of the PHP MySQL extensions.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          Little to no application changes are required, dependent on the required usage scenario.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Reduces server load and connection establishment latency:
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-           Opens less connections to the MySQL server.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-           Less connections to MySQL mean less work for the MySQL server.
-           In a client-server environment scaling the server is often more
-           difficult than scaling the client. Multiplexing helps with
-           horizontal scale-out (scale-by-client).
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-           Pooling saves connection time.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-           Multiplexed connection: multiple user handles share the
-           same network connection. Once opened,
-           a network connection is cached and shared among
-           multiple user handles. There is a 1:n relationship between
-           internal network connection and user connection handles.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-           Persistent connection: a network connection is kept open
-           at the end of the web request, if the PHP deployment model allows.
-           Thus, subsequently web requests can reuse a
-           previously opened connection. Like other resources, network
-           connections are bound to the scope of a process. Thus, they can
-           be reused for all web requests served by a process.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-    </itemizedlist>
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-mux.limitations">
-   <title>Limitations</title>
-   <para>
-    The proof-of-concept does not support unbuffered queries, prepared
-    statements, and asynchronous queries.
-   </para>
-   <para>
-    The connection pool is using a combination of the transport method and
-    hostname as keys. As a consequence, two connections to the same
-    host using the same transport method (TCP/IP, Unix socket, Windows named pipe)
-    will be linked to the same pooled connection even if username and
-    password differ. Be aware of the possible security implications.
-   </para>
-   <para>
-    The proof-of-concept is transaction agnostic. It does not know about SQL
-    transactions.
-   </para>
-   <note>
-    <para>
-     Applications must be aware of the consequences of connection sharing connections.
-    </para>
-   </note>
-  </section>
-
-  <section xml:id="mysqlnd-mux.name">
-   <title>About the name mysqlnd_mux</title>
-   <para>
-    The shortcut <literal>mysqlnd_mux</literal>
-    stands for <literal>mysqlnd connection multiplexing plugin</literal>.
-   </para>
-  </section>
- </preface>
-
- &reference.mysqlnd-mux.concepts;
- &reference.mysqlnd-mux.setup;
- &reference.mysqlnd-mux.constants;
- &reference.mysqlnd-mux.changes;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_mux/changes.xml b/reference/mysqlnd_mux/changes.xml
deleted file mode 100644
index 9e09b27a65..0000000000
--- a/reference/mysqlnd_mux/changes.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-mux.changes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title xmlns="http://docbook.org/ns/docbook">Change History</title>
- <para>
-  This change history is a high level summary of selected changes
-  that may impact applications and/or break backwards compatibility.
- </para>
- <para>
-  See also the <filename>CHANGES</filename> file in the source distribution
-  for a complete list of changes.
- </para>
-
- <section xml:id="mysqlnd-mux.changes-one-o">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_mux 1.0 series</title>
-  <para>
-   1.0.0-pre-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: no package released, initial check-in 09/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Proof of concept
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Initial check-in. Essentially a demo of the
-   <link linkend="book.mysqlnd">mysqlnd</link> plugin API.
-  </para>
-  <note>
-   <para>
-     This is the current development series. All
-     features are at an early stage. Changes may happen at any time without
-     prior notice. Please, do not use this version in production environments.
-    </para>
-    <para>
-     The documentation may not reflect all changes yet.
-    </para>
-  </note>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_mux/concepts.xml b/reference/mysqlnd_mux/concepts.xml
deleted file mode 100644
index e2a28a5225..0000000000
--- a/reference/mysqlnd_mux/concepts.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-mux.concepts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Concepts</title>
- <para>
-  This explains the architecture and related concepts for this plugin.
-  Reading and understanding these concepts is required to successfully
-  use this plugin.
- </para>
-
- <section xml:id="mysqlnd-mux.architecture">
-  <title>Architecture</title>
-  <para>
-   The mysqlnd connection multiplexing plugin is implemented as a PHP extension.
-   It is written in C and operates under the hood of PHP. During the
-   startup of the PHP interpreter, in the module initialization phase of the
-   PHP engine, it gets registered as a
-   <link linkend="book.mysqlnd">mysqlnd</link> plugin to replace specific
-   mysqlnd C methods.
-  </para>
-  <para>
-   The mysqlnd library uses PHP streams to communicate with the MySQL
-   server. PHP streams are accessed by the mysqlnd library through its net module.
-   The mysqlnd connection multiplexing plugin proxies methods of the mysqlnd
-   library net module to control opening and closing of network streams.
-  </para>
-  <para>
-   Upon opening a user connection to MySQL using the appropriate connection
-   functions of either  <link linkend="book.mysqli">mysqli</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link> or
-   <link linkend="book.mysql">ext/mysql</link>, the plugin will search its
-   connection pool for an open network connection. If the pool
-   contains a network connection to the host specified by the connect function
-   using the transport method requested (TCP/IP, Unix domain socket, Windows named pipe),
-   the pooled connection is linked to the user handle. Otherwise, a new
-   network connection is opened, put into the poolm and associated with the
-   user connection handle. This way, multiple user handles can be linked
-   to the same network connection.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-mux.connection_pool">
-  <title>Connection pool</title>
-  <para>
-   The plugins connection pool is created when PHP initializes its modules
-   (<literal>MINIT</literal>) and free'd when PHP shuts down the modules
-   (<literal>MSHUTDOWN</literal>). This is the same as for persistent MySQL connections.
-  </para>
-  <para>
-   Depending on the deployment model, the pool is used for the duration of one
-   or multiple web requests. Network connections are bound to the lifespan
-   of an operating system level process. If the PHP process serves multiple
-   web requests as it is the case for Fast-CGI or threaded web server deployments,
-   then the pooled connections can be reused over multiple connections.
-   Because multiplexing means sharing connections, it can even happen with a
-   threaded deployment that two threads or two distinct web requests are
-   linked to one pooled network connections.
-  </para>
-  <para>
-   A pooled connection is explicitly closed once the last reference to it
-   is released. An implicit close happens when PHP shuts down its modules.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-mux.sharing_connections">
-  <title>Sharing connections</title>
-  <para>
-   The PHP mysqlnd connection multiplexing plugin changes the relationship
-   between a users connection handle and the underlying MySQL connection.
-   Without the plugin, every MySQL connection belongs to exactly one
-   user connection at a time. The multiplexing plugin changes.
-   A MySQL connection is shared among multiple user handles.
-   There no one-to-one relation if using the plugin.
-  </para>
-  <para>
-   Sharing pooled connections has an impact on the connection state.
-   State changing operations from multiple user handles pointing to one
-   MySQL connection are not isolated from each other. If, for example,
-   a session variable is set through one user connection handle,
-   the session variable becomes visible to all other user handles that
-   reference the same underlying MySQL connection.
-  </para>
-  <para>
-   This is similar in concept to connection state related phenomens
-   described for the PHP mysqlnd replication and load balancing plugin.
-   Please, check the
-   <link linkend="book.mysqlnd-ms">PECL/mysqlnd_ms documentation</link> for
-   more details on the state of a connection.
-  </para>
-  <para>
-   The proof-of-concept takes no measures to isolate multiplexed
-   connections from each other.
-  </para>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/mysqlnd_mux/configure.xml b/reference/mysqlnd_mux/configure.xml
deleted file mode 100644
index c128e99acb..0000000000
--- a/reference/mysqlnd_mux/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-mux.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mysqlnd_mux">&url.pecl.package;mysqlnd_mux</link>
- </para>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_mux/constants.xml b/reference/mysqlnd_mux/constants.xml
deleted file mode 100644
index 1ac7ac39cb..0000000000
--- a/reference/mysqlnd_mux/constants.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mysqlnd-mux.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
-
- <para>
-  <emphasis role="bold">Other</emphasis>
- </para>
- <para>
-  The plugins version number can be obtained using
-  <constant>MYSQLND_MUX_VERSION</constant> or
-  <constant>MYSQLND_MUX_VERSION_ID</constant>.
-  <constant>MYSQLND_MUX_VERSION</constant>
-  is the string representation of the numerical version number
-  <constant>MYSQLND_MUX_VERSION_ID</constant>, which is an integer such as 10000.
-  Developers can calculate the version number as follows.
- </para>
- <para>
-   <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Version (part)</entry>
-      <entry>Example</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Major*10000</entry>
-      <entry>1*10000 = 10000</entry>
-     </row>
-     <row>
-      <entry>Minor*100</entry>
-      <entry>0*100 = 0</entry>
-     </row>
-     <row>
-      <entry>Patch</entry>
-      <entry>0 = 0</entry>
-     </row>
-     <row>
-      <entry>MYSQLND_MUX_VERSION_ID</entry>
-      <entry>10000</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-mux-version">
-    <term>
-     <constant>MYSQLND_MUX_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version string, for example, <quote>1.0.0-prototype</quote>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-mux-version-id">
-    <term>
-     <constant>MYSQLND_MUX_VERSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version number, for example, 10000.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_mux/ini.xml b/reference/mysqlnd_mux/ini.xml
deleted file mode 100644
index 38e9a89180..0000000000
--- a/reference/mysqlnd_mux/ini.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-mux.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Mysqlnd_mux &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mysqlnd-mux.configuration.list">
-     <row>
-      <entry><link linkend="ini.mysqlnd-mux.enable">mysqlnd_mux.enable</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-
-   <varlistentry xml:id="ini.mysqlnd-mux.enable">
-    <term>
-     <parameter>mysqlnd_mux.enable</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables the plugin. If disabled, the extension will not plug
-      into
-      <link linkend="book.mysqlnd">mysqlnd</link> to proxy internal
-      <link linkend="book.mysqlnd">mysqlnd</link> C API calls.
-     </para>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_mux/setup.xml b/reference/mysqlnd_mux/setup.xml
deleted file mode 100644
index 367e6e7de4..0000000000
--- a/reference/mysqlnd_mux/setup.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-mux.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mysqlnd-mux.requirements">
-  &reftitle.required;
-  <para>
-    <literal>PHP 5.5.0</literal> or newer.
-    Some advanced functionality requires <literal>PHP 5.5.0</literal> or newer.
-  </para>
-  <para>
-   The <literal>mysqlnd_mux</literal> replication and load balancing
-   plugin supports all PHP applications and all available PHP MySQL extensions
-   (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>).
-   The PHP MySQL extension must be configured to use
-   <link linkend="book.mysqlnd">mysqlnd</link>  in order to be able
-   to use the <literal>mysqlnd_mux</literal> plugin for
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
- </section>
-
- &reference.mysqlnd-mux.configure;
- &reference.mysqlnd-mux.ini;
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/book.xml b/reference/mysqlnd_qc/book.xml
deleted file mode 100644
index bc1b331729..0000000000
--- a/reference/mysqlnd_qc/book.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mysqlnd-qc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd query result cache plugin</title>
- <titleabbrev>mysqlnd_qc</titleabbrev>
-
- <preface xml:id="intro.mysqlnd-qc">
-  &reftitle.intro;
-  <para>
-   The mysqlnd query result cache plugin adds easy to use client-side query
-   caching to all PHP MySQL extensions using
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
-  <para>
-   As of version PHP 5.3.3 the MySQL native driver for PHP (
-   <literal>mysqlnd</literal>)
-   features an internal plugin C API. C plugins, such as the query cache
-   plugin, can extend the functionality of
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
-  <para>
-   Mysqlnd plugins such as the query cache plugin operate transparent
-   from a user perspective. The cache plugin supports all PHP applications
-   and all PHP MySQL extensions (
-   <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>).
-   It does not change existing APIs.
-  </para>
-  <para>
-   No significant application changes are required to cache a query.
-   The cache has two operation modes. It will either cache all
-   queries (not recommended) or only those queries marked with a
-   certain SQL hint (recommended).
-  </para>
-
-  <section xml:id="mysqlnd-qc.key-features">
-   <title>Key Features</title>
-   <para>
-    <itemizedlist>
-     <listitem>
-      <para>
-       Transparent and therefore easy to use
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          supports all PHP MySQL extensions
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          no API changes
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          very little application changes required
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Flexible invalidation strategy
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Time-to-Live (TTL)
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          user-defined
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Storage with different scope and life-span
-      </para>
-      <para>
-       <itemizedlist>
-        <listitem>
-         <para>
-          Default (Hash, process memory)
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          APC
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          MEMCACHE
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          sqlite
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          user-defined
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-
-     <listitem>
-       <para>
-         Built-in slam defense to prevent cache stampeding.
-       </para>
-     </listitem>
-    </itemizedlist>
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-qc.limitations">
-   <title>Limitations</title>
-   <para>
-    The current 1.0.1 release of PECL mysqlnd_qc does
-    not support PHP 5.4. Version 1.1.0-alpha lifts this limitation.
-   </para>
-   <para>
-    Prepared statements and unbuffered queries are fully supported.
-    Thus, the plugin is capable of caching all statements issued
-    with <literal>mysqli</literal> or <literal>PDO_MySQL</literal>, which are
-    the only two PHP MySQL APIs to offer prepared statement support.
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-qc.name">
-   <title>On the name</title>
-   <para>
-    The shortcut <literal>mysqlnd_qc</literal>
-    stands for <literal>mysqlnd query cache plugin</literal>. The name
-    was chosen for a quick-and-dirty proof-of-concept. In the beginning
-    the developers did not expect to continue using the code base.
-    Sometimes PECL/mysqlnd_qc has also been called
-    <literal>client-side query result set cache</literal>.
-   </para>
-  </section>
-
- </preface>
-
-
- &reference.mysqlnd-qc.quickstart;
- &reference.mysqlnd-qc.setup;
- &reference.mysqlnd-qc.constants;
- &reference.mysqlnd-qc.reference;
- &reference.mysqlnd-qc.changes;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/changes.xml b/reference/mysqlnd_qc/changes.xml
deleted file mode 100644
index e029ce37fb..0000000000
--- a/reference/mysqlnd_qc/changes.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-qc.changes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title xmlns="http://docbook.org/ns/docbook">Change History</title>
- <para>
-  This change history is a high level summary of selected changes
-  that may impact applications and/or break backwards compatibility.
- </para>
- <para>
-  See also the <filename>CHANGES</filename> file in the source distribution
-  for a complete list of changes.
- </para>
-
-<section xml:id="mysqlnd-qc.changes-one-two">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_qc 1.2 series</title>
-  <para>
-   1.2.0 - alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 03/2013
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: PHP 5.5 compatibility
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-     <para>
-      Update build for PHP 5.5 (Credits: Remi Collet)
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      APC storage handler update
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          Fix build for APC 3.1.13-beta and trunk
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Introduced
-      <link linkend="constant.mysqlnd-qc-version"><constant>MYSQLND_QC_VERSION</constant></link> and
-      <link linkend="constant.mysqlnd-qc-version-id"><constant>MYSQLND_QC_VERSION_ID</constant></link>.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.changes-one-one">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_qc 1.1 series</title>
-   <para>
-   1.1.0 - stable
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: PHP 5.4 compatibility, schema pattern based caching and mysqlnd_ms support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.1.0 - beta
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: PHP 5.4 compatibility, schema pattern based caching and mysqlnd_ms support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.1.0 - alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 04/2012
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: PHP 5.4 compatibility, schema pattern based caching and mysqlnd_ms support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-     <para>
-      APC storage handler update
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          Fix build for APC 3.1.9+
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          Note: Use of the APC storage handler is currently
-          not recommended due to stability issues of APC itself.
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      New PHP configuration directives
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          <literal><link linkend="ini.mysqlnd-qc.collect-statistics-log-file">
-          mysqlnd_qc.collect_statistics_log_file</link></literal>. Aggregated
-          cache statistics log file written after every 10th request served by the
-          PHP process.
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          <literal><link linkend="ini.mysqlnd-qc.ignore-sql-comments">
-          mysqlnd_qc.ignore_sql_comments</link></literal>.
-          Control whether SQL comments are ignored for cache key hash generation.
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      New constants and SQL hints
-      <itemizedlist>
-       <listitem>
-         <simpara>
-          <link linkend="constant.mysqlnd-qc-server-id"><constant>
-          MYSQLND_QC_SERVER_ID_SWITCH</constant></link> allows grouping of cache entries from
-          different physical connections. This is needed by PECL/mysqlnd_ms.
-         </simpara>
-       </listitem>
-       <listitem>
-         <simpara>
-          <link linkend="constant.mysqlnd-qc-condition-meta-schema-pattern">
-          <constant>MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN</constant></link>
-          to be used with <function>mysqlnd_qc_set_cache_condition</function>.
-         </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      New function <function>mysqlnd_qc_set_cache_condition</function>
-      for built-in schema pattern based caching. Likely to support a wider
-      range of conditions in the future.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Report <literal>valid_until</literal> timestamp for cache entries
-      of the default handler through <function>mysqlnd_qc_get_cache_info</function>.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-       Include charset number for cache entry hashing. This should prevent serving result
-       sets which have the wrong charset.
-     </para>
-     <para>
-       API change: get_hash_key expects new "charsetnr" (int)  parameter after "port".
-     </para>
-    </listitem>
-    <listitem>
-      <para>
-       API change: changing is_select() signature from bool is_select() to
-       mixed is_select(). Mixed can be  either boolean or
-       array(long ttl, string server_id). This is needed by PECL/mysqlnd_ms.
-      </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Other
-   <itemizedlist>
-    <listitem>
-     <para>
-      Support acting as a cache backend for
-      <link linkend="book.mysqlnd-ms">PECL/mysqlnd_ms</link> 1.3.0-beta or later
-      to transparently replace MySQL Replication slave reads with cache accesses,
-      if the user explicitly allows.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Bug fixes
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Fixed Bug #59959 (config.m4, wrong library - 64bit memcached handler builds) (Credits: Remi Collet)
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.changes-one-o">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_qc 1.0 series</title>
-  <para>
-   1.0.1-stable
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 12/2010
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Prepared statement support
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Added support for Prepared statements and unbuffered queries.
-  </para>
-  <para>
-   1.0.0-beta
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 07/2010
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: TTL-based cache with various storage options (Memcache, APC, SQLite, user-defined)
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Initial public release of the transparent TTL-based query result cache.
-   Flexible storage of cached results. Various storage media supported.
-  </para>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/configure.xml b/reference/mysqlnd_qc/configure.xml
deleted file mode 100644
index b45aafc395..0000000000
--- a/reference/mysqlnd_qc/configure.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-qc.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.moved;
- </para>
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mysqlnd_qc">&url.pecl.package;mysqlnd_qc</link>
- </para>
-
- <para>
-  &pecl.windows.download;
- </para>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/constants.xml b/reference/mysqlnd_qc/constants.xml
deleted file mode 100644
index d037b938b1..0000000000
--- a/reference/mysqlnd_qc/constants.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mysqlnd-qc.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
-  <emphasis role="bold">SQL hint related</emphasis>
- </para>
- <para>
-  <example>
-   <title>Using SQL hint constants</title>
-   <para>
-    The query cache is controlled by SQL hints. SQL hints are used to enable and
-    disable caching. SQL hints can be used to set the
-    <literal>TTL</literal> of a query.
-   </para>
-   <para>
-    The SQL hints recognized by the query cache can be manually changed at
-    compile time. This makes it possible to use
-    <literal>mysqlnd_qc</literal> in environments in which the default
-    SQL hints are already taken and interpreted by other systems. Therefore
-    it is recommended to use the SQL hint string constants instead of
-    manually adding the default SQL hints to the query string.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Use constants for maximum portability */
-$query = "/*" . MYSQLND_QC_ENABLE_SWITCH . "*/SELECT id FROM test";
-
-/* Valid but less portable: default TTL */
-$query = "/*qc=on*/SELECT id FROM test";
-
-/* Valid but less portable: per statement TTL */
-$query = "/*qc=on*//*qc_ttl=5*/SELECT id FROM test";
-
-printf("MYSQLND_QC_ENABLE_SWITCH: %s\n", MYSQLND_QC_ENABLE_SWITCH);
-printf("MYSQLND_QC_DISABLE_SWITCH: %s\n", MYSQLND_QC_DISABLE_SWITCH);
-printf("MYSQLND_QC_TTL_SWITCH: %s\n", MYSQLND_QC_TTL_SWITCH);
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-MYSQLND_QC_ENABLE_SWITCH: qc=on
-MYSQLND_QC_DISABLE_SWITCH: qc=off
-MYSQLND_QC_TTL_SWITCH: qc_ttl=
-
-]]>
-   </screen>
-
-  </example>
- </para>
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-qc-enable-switch">
-    <term>
-     <constant>MYSQLND_QC_ENABLE_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SQL hint used to enable caching of a query.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-qc-disable-switch">
-    <term>
-     <constant>MYSQLND_QC_DISABLE_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SQL hint used to disable caching of a query if
-      <literal>mysqlnd_qc.cache_by_default = 1</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-qc-ttl-switch">
-    <term>
-     <constant>MYSQLND_QC_TTL_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SQL hint used to set the TTL of a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-qc-server-id">
-    <term>
-     <constant>MYSQLND_QC_SERVER_ID_SWITCH</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      This SQL hint should not be used in general.
-     </simpara>
-     <simpara>
-      It is needed by <link linkend="book.mysqlnd-ms">PECL/mysqlnd_ms</link>
-      to group cache entries for one statement
-      but originating from different physical connections. If the
-      hint is used connection settings such as user, hostname and charset
-      are not considered for generating a cache key of a query.
-      Instead the given value and the query string are used as input
-      to the hashing function that generates the key.
-     </simpara>
-     <simpara>
-      PECL/mysqlnd_ms may, if instructed, cache results from
-      MySQL Replication slaves. Because it can hold many connections
-      to the slave the cache key shall not be formed from the user,
-      hostname or other settings that may vary for the various slave
-      connections. Instead, PECL/mysqlnd_ms provides an identifier
-      which refers to the group of slave connections that shall be enabled
-      to share cache entries no matter which physical slave connection was
-      to generate the cache entry.
-     </simpara>
-     <simpara>
-      Use of this feature outside of PECL/mysqlnd_ms is not recommended.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
- <para>
-  <emphasis role="bold"><function>mysqlnd_qc_set_cache_condition</function> related</emphasis>
- </para>
- <para>
-  <example>
-   <title>Example <function>mysqlnd_qc_set_cache_condition</function> usage</title>
-   <para>
-    The function <function>mysqlnd_qc_set_cache_condition</function> allows setting conditions
-    for automatic caching of statements which don't begin with the SQL hints
-    necessary to manually enable caching.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Cache all accesses to tables with the name "new%" in schema/database "db_example" for 1 second */
-if (!mysqlnd_qc_set_cache_condition(MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN, "db_example.new%", 1)) {
-  die("Failed to set cache condition!");
-}
-
-$mysqli = new mysqli("host", "user", "password", "db_example", "port");
-/* cached although no SQL hint given  */
-$mysqli->query("SELECT id, title FROM news");
-
-$pdo_mysql = new PDO("mysql:host=host;dbname=db_example;port=port", "user", "password");
-/* not cached: no SQL hint, no pattern match */
-$pdo_mysql->query("SELECT id, title FROM latest_news");
-/* cached: TTL 1 second, pattern match */
-$pdo_mysql->query("SELECT id, title FROM news");
-?>
-]]>
-   </programlisting>
-  </example>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-qc-condition-meta-schema-pattern">
-    <term>
-     <constant>MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Used as a parameter of <function>mysqlnd_qc_set_cache_condition</function>
-      to set conditions for schema based automatic caching.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
- <para>
-  <emphasis role="bold">Other</emphasis>
- </para>
- <para>
-  The plugin version number can be obtained using either
-  <constant>MYSQLND_QC_VERSION</constant>, which is the string representation 
-  of the numerical version number, or <constant>MYSQLND_QC_VERSION_ID</constant>, 
-  which is an integer such as 10000. Developers can calculate the version number 
-  as follows.
- </para>
- <para>
-   <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Version (part)</entry>
-      <entry>Example</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Major*10000</entry>
-      <entry>1*10000 = 10000</entry>
-     </row>
-     <row>
-      <entry>Minor*100</entry>
-      <entry>0*100 = 0</entry>
-     </row>
-     <row>
-      <entry>Patch</entry>
-      <entry>0 = 0</entry>
-     </row>
-     <row>
-      <entry>MYSQLND_QC_VERSION_ID</entry>
-      <entry>10000</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-qc-version">
-    <term>
-     <constant>MYSQLND_QC_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version string, for example, <quote>1.0.0-prototype</quote>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-qc-version-id">
-    <term>
-     <constant>MYSQLND_QC_VERSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version number, for example, 10000.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-clear-cache.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-clear-cache.xml
deleted file mode 100644
index 0e75b00d72..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-clear-cache.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-qc-clear-cache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_clear_cache</refname>
-  <refpurpose>Flush all cache contents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_qc_clear_cache</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Flush all cache contents.
-  </para>
-  <para>
-   Flushing the cache is a storage handler responsibility.
-   All built-in storage handler but the
-   <literal>memcache</literal> storage
-   handler support flushing the cache. The
-   <literal>memcache</literal>
-   storage handler cannot flush its cache contents.
-  </para>
-  <para>
-   User-defined storage handler may or may not support the operation.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
-  <para>
-   A return value of
-   &false;
-   indicates that flushing all cache contents has
-   failed or the operation is not supported by
-   the active storage handler. Applications must
-   not expect that calling the function will always
-   flush the cache.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-available-handlers.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-get-available-handlers.xml
deleted file mode 100644
index 12ce1fe996..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-available-handlers.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.mysqlnd-qc-get-available-handlers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_get_available_handlers</refname>
-  <refpurpose>Returns a list of available storage handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_qc_get_available_handlers</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Which storage are available depends on the compile time
-   configuration of the query cache plugin. The
-   <literal>default</literal> storage handler is always available.
-   All other storage handler must be enabled explicitly when building the
-   extension.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of available built-in storage handler.
-   For each storage handler the version number and version string
-   is given.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_get_available_handlers</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(mysqlnd_qc_get_available_handlers());
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-array(5) {
-  ["default"]=>
-  array(2) {
-    ["version"]=>
-    string(5) "1.0.0"
-    ["version_number"]=>
-    int(100000)
-  }
-  ["user"]=>
-  array(2) {
-    ["version"]=>
-    string(5) "1.0.0"
-    ["version_number"]=>
-    int(100000)
-  }
-  ["APC"]=>
-  array(2) {
-    ["version"]=>
-    string(5) "1.0.0"
-    ["version_number"]=>
-    int(100000)
-  }
-  ["MEMCACHE"]=>
-  array(2) {
-    ["version"]=>
-    string(5) "1.0.0"
-    ["version_number"]=>
-    int(100000)
-  }
-  ["sqlite"]=>
-  array(2) {
-    ["version"]=>
-    string(5) "1.0.0"
-    ["version_number"]=>
-    int(100000)
-  }
-}
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.installation">Installation</link>
-    </member>
-    <member>
-     <function>mysqlnd_qc_set_storage_handler</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-cache-info.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-get-cache-info.xml
deleted file mode 100644
index 5d59dbaa95..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-cache-info.xml
+++ /dev/null
@@ -1,551 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-qc-get-cache-info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_get_cache_info</refname>
-  <refpurpose>Returns information on the current handler, the number of cache entries and cache entries, if available</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_qc_get_cache_info</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns information on the current handler, the number of cache entries and
-   cache entries, if available. If and what data will be returned for the cache
-   entries is subject to the active storage handler.
-   Storage handler are free to return any data. Storage handler are
-   recommended to return at least the data provided by the default handler,
-   if technically possible.
-  </para>
-  <para>
-   The scope of the information is the PHP process. Depending on the PHP deployment
-   model a process may serve one or more web requests.
-  </para>
-  <para>
-   Values are aggregated for all cache activities on a per storage handler basis.
-   It is not possible to tell how much queries originating from
-   <literal>mysqli</literal>, <literal>PDO_MySQL</literal> or
-   <literal>mysql</literal>.API calls have contributed to the aggregated data values. Use
-   <function>mysqlnd_qc_get_core_stats</function>
-   to get timing data aggregated for all storage handlers.
-  </para>
-  <para>
-   Array of cache information
-  </para>
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      <parameter>handler</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The active storage handler.
-      </para>
-      <para>
-       All storage handler. Since 1.0.0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>handler_version</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The version of the active storage handler.
-      </para>
-      <para>
-       All storage handler. Since 1.0.0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>num_entries</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The number of cache entries. The value depends on the storage handler in use.
-      </para>
-      <para>
-       The default, APC and SQLite storage handler provide the actual
-       number of cache entries.
-      </para>
-      <para>
-       The MEMCACHE storage handler always returns <literal>0</literal>.
-       MEMCACHE does not support counting the number of cache entries.
-      </para>
-      <para>
-       If a user defined handler is used, the number of
-       entries of the <literal>data</literal> property is reported.
-      </para>
-      <para>
-       Since 1.0.0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <parameter>data</parameter>
-      <type>array</type>
-     </term>
-     <listitem>
-      <para>
-       The version of the active storage handler.
-      </para>
-      <para>
-       Additional storage handler dependent data on the cache entries.
-       Storage handler are requested to provide similar and comparable
-       information. A user defined storage handler is free to return any data.
-      </para>
-      <para>
-       Since 1.0.0.
-      </para>
-      <para>
-       The following information is provided by the default storage handler
-       for the <literal>data</literal> property.
-      </para>
-      <para>
-       The <literal>data</literal>
-       property holds a hash. The hash is indexed by the internal
-       cache entry identifier of the storage handler. The cache entry identifier
-       is human-readable and contains the query string leading to the cache entry.
-       Please, see also the example below. The following data is given for
-       every cache entry.
-      </para>
-      <para>
-       <variablelist>
-        <varlistentry>
-         <term>
-          <parameter>statistics</parameter>
-          <type>array</type>
-         </term>
-         <listitem>
-          <para>
-           Statistics of the cache entry.
-          </para>
-          <para>
-            Since 1.0.0.
-          </para>
-          <informaltable>
-           <tgroup cols="3">
-            <colspec colwidth="1*"/>
-            <colspec colwidth="7*"/>
-            <colspec colwidth="2*"/>
-            <thead>
-             <row>
-              <entry>Property</entry>
-              <entry>Description</entry>
-              <entry>Version</entry>
-             </row>
-            </thead>
-            <tbody>
-             <row>
-              <entry>
-               <literal>rows</literal>
-              </entry>
-              <entry>
-               Number of rows of the cached result set.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>stored_size</literal>
-              </entry>
-              <entry>
-               The size of the cached result set in bytes. This is the size
-               of the payload. The value is not suited for calculating the
-               total memory consumption of all cache entries including the
-               administrative overhead of the cache entries.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>cache_hits</literal>
-              </entry>
-              <entry>
-               How often the cached entry has been returned.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>run_time</literal>
-              </entry>
-              <entry>
-               Run time of the statement to which the cache entry belongs.
-               This is the run time of the uncached statement. It is the time
-               between sending the statement to MySQL receiving a reply from MySQL.
-               Run time saved by using the query cache plugin can be calculated
-               like this: <literal>cache_hits * ((run_time - avg_run_time) + (store_time - avg_store_time))</literal>.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>store_time</literal>
-              </entry>
-              <entry>
-               Store time of the statements result set to which the cache entry belongs.
-               This is the time it took to fetch and store the results of the uncached
-               statement.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>min_run_time</literal>
-              </entry>
-              <entry>
-               Minimum run time of the cached statement. How long it took
-               to find the statement in the cache.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>min_store_time</literal>
-              </entry>
-              <entry>
-               Minimum store time of the cached statement. The time taken
-               for fetching the cached result set from the storage medium and
-               decoding
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>avg_run_time</literal>
-              </entry>
-              <entry>
-               Average run time of the cached statement.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>avg_store_time</literal>
-              </entry>
-              <entry>
-               Average store time of the cached statement.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>max_run_time</literal>
-              </entry>
-              <entry>
-               Average run time of the cached statement.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>max_store_time</literal>
-              </entry>
-              <entry>
-               Average store time of the cached statement.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>valid_until</literal>
-              </entry>
-              <entry>
-               Timestamp when the cache entry expires.
-              </entry>
-              <entry>Since 1.1.0.</entry>
-             </row>
-            </tbody>
-           </tgroup>
-          </informaltable>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>
-          <parameter>metadata</parameter>
-          <type>array</type>
-         </term>
-         <listitem>
-          <para>
-           Metadata of the cache entry.
-           This is the metadata provided by MySQL together with the
-           result set of the statement in question. Different versions
-           of the MySQL server may return different metadata. Unlike with
-           some of the PHP MySQL extensions no attempt is made to hide
-           MySQL server version dependencies and version details from the
-           caller. Please, refer to the MySQL C API documentation that
-           belongs to the MySQL server in use for further details.
-          </para>
-          <para>
-           The metadata list contains one entry for every column.
-          </para>
-          <para>
-            Since 1.0.0.
-          </para>
-          <informaltable>
-           <tgroup cols="3">
-            <colspec colwidth="1*"/>
-            <colspec colwidth="7*"/>
-            <colspec colwidth="2*"/>
-            <thead>
-             <row>
-              <entry>Property</entry>
-              <entry>Description</entry>
-              <entry>Version</entry>
-             </row>
-            </thead>
-            <tbody>
-             <row>
-              <entry>
-               <literal>name</literal>
-              </entry>
-              <entry>
-               The field name. Depending on the MySQL version this
-               may be the fields alias name.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>org_name</literal>
-              </entry>
-              <entry>
-               The field name.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>table</literal>
-              </entry>
-              <entry>
-               The table name. If an alias name was used for the table, this
-               usually holds the alias name.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>org_table</literal>
-              </entry>
-              <entry>
-               The table name.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>db</literal>
-              </entry>
-              <entry>
-               The database/schema name.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>max_length</literal>
-              </entry>
-              <entry>
-               The maximum width of the field. Details may vary by MySQL server version.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>length</literal>
-              </entry>
-              <entry>
-               The width of the field. Details may vary by MySQL server version.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-             <row>
-              <entry>
-               <literal>type</literal>
-              </entry>
-              <entry>
-               The data type of the field. Details may vary by the MySQL server in use.
-               This is the MySQL C API type constants value. It is recommended
-               to use type constants provided by the <literal>mysqli</literal> extension
-               to test for its meaning. You should not test for certain type values
-               by comparing with certain numbers.
-              </entry>
-              <entry>Since 1.0.0.</entry>
-             </row>
-            </tbody>
-           </tgroup>
-          </informaltable>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-      </para>
-      <para>
-       The APC storage handler returns the same information
-       for the <literal>data</literal> property but no <literal>metadata</literal>.
-       The <literal>metadata</literal> of a cache entry is set to <literal>NULL</literal>.
-      </para>
-      <para>
-       The MEMCACHE storage handler does not fill the <literal>data</literal> property.
-       Statistics are not available on a per cache entry basis with the MEMCACHE storage
-       handler.
-      </para>
-      <para>
-       A user defined storage handler is free to provide any data.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_get_cache_info</function> example</title>
-   <para>
-    The example shows the output from the built-in default storage handler.
-    Other storage handler may report different data.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Populate the cache, e.g. using mysqli */
-$mysqli = new mysqli("host", "user", "password", "schema");
-$mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/SELECT id FROM test");
-
-/* Display cache information */
-var_dump(mysqlnd_qc_get_cache_info());
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-array(4) {
- ["num_entries"]=>
- int(1)
- ["handler"]=>
- string(7) "default"
- ["handler_version"]=>
- string(5) "1.0.0"
- ["data"]=>
- array(1) {
-   ["Localhost via UNIX socket 3306 user schema|/*qc=on*/SELECT id FROM test"]=>
-   array(2) {
-     ["statistics"]=>
-     array(11) {
-       ["rows"]=>
-       int(6)
-       ["stored_size"]=>
-       int(101)
-       ["cache_hits"]=>
-       int(0)
-       ["run_time"]=>
-       int(471)
-       ["store_time"]=>
-       int(27)
-       ["min_run_time"]=>
-       int(0)
-       ["max_run_time"]=>
-       int(0)
-       ["min_store_time"]=>
-       int(0)
-       ["max_store_time"]=>
-       int(0)
-       ["avg_run_time"]=>
-       int(0)
-       ["avg_store_time"]=>
-       int(0)
-     }
-     ["metadata"]=>
-     array(1) {
-       [0]=>
-       array(8) {
-         ["name"]=>
-         string(2) "id"
-         ["orig_name"]=>
-         string(2) "id"
-         ["table"]=>
-         string(4) "test"
-         ["orig_table"]=>
-         string(4) "test"
-         ["db"]=>
-         string(4) "schema"
-         ["max_length"]=>
-         int(1)
-         ["length"]=>
-         int(11)
-         ["type"]=>
-         int(3)
-       }
-     }
-   }
- }
-}
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_qc_get_core_stats</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-core-stats.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-get-core-stats.xml
deleted file mode 100644
index 997505761d..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-core-stats.xml
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-qc-get-core-stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_get_core_stats</refname>
-  <refpurpose>Statistics collected by the core of the query cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_qc_get_core_stats</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of statistics collected by the core of the cache plugin.
-   The same data fields will be reported for any storage handler because the
-   data is collected by the core.
-  </para>
-  <para>
-   The
-   <literal>PHP</literal> configuration setting
-   <literal>mysqlnd_qc.collect_statistics</literal>
-   controls the collection of statistics. The collection of statistics
-   is disabled by default for performance reasons.
-   Disabling the collection of statistics will also disable the collection
-   of time related statistics.
-  </para>
-  <para>
-   The
-   <literal>PHP</literal> configuration setting
-   <literal>mysqlnd_qc.collect_time_statistics</literal> controls the
-   collection of time related statistics.
-  </para>
-  <para>
-   The scope of the core statistics is the
-   <literal>PHP</literal> process.
-   Depending on your deployment model a
-   <literal>PHP</literal> process may handle one or multiple requests.
-  </para>
-  <para>
-   Statistics are aggregated for all cache entries and all storage handler.
-   It is not possible
-   to tell how much queries originating from
-   <literal>mysqli</literal>,
-   <literal>PDO_MySQL</literal> or
-   <literal>mysql</literal> API calls have
-   contributed to the aggregated data values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-      Array of core statistics
-  </para>
-  <informaltable>
-   <tgroup cols="3">
-    <colspec colwidth="10%"/>
-    <colspec colwidth="70%"/>
-    <colspec colwidth="20%"/>
-    <thead>
-     <row>
-      <entry>Statistic</entry>
-      <entry>Description</entry>
-      <entry>Version</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>cache_hit</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable and cached data has been reused.
-       Statement is considered cacheable and a cache miss happened but
-       the statement got cached by someone else while we process it and thus
-       we can fetch the result from the refreshed cache.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>cache_miss</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable...
-       <itemizedlist>
-        <listitem>
-         <para>
-          ... and has been added to the cache
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          ... but the
-          <literal>PHP</literal>
-          configuration directive setting of
-          <literal>mysqlnd_qc.cache_no_table = 1</literal> has prevented caching.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-           ... but an unbuffered result set is requested.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          ... but a buffered result set was empty.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>cache_put</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable and has been added to the cache.
-       Take care when calculating derived statistics. Storage handler
-       with a storage life time beyond process scope may report
-       <literal>cache_put = 0</literal> together with
-       <literal>cache_hit &gt; 0</literal>, if another process has filled
-       the cache. You may want to use
-       <literal>num_entries</literal> from
-       <function>mysqlnd_qc_get_cache_info</function> if the handler
-       supports it (
-       <literal>default</literal>,
-       <literal>APC</literal>).
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_should_cache</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable based on query string analysis.
-       The statement may or may not be added to the cache. See also
-       <literal>cache_put</literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_should_not_cache</literal>
-      </entry>
-      <entry>
-       Statement is considered not cacheable based on query string analysis.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_not_cached</literal>
-      </entry>
-      <entry>
-       Statement is considered not cacheable or it is
-       considered cachable but the storage handler has not returned a
-       hash key for it.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_could_cache</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable...
-       <itemizedlist>
-        <listitem>
-         <para>
-          ... and statement has been run without errors
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          ... and meta data shows at least one column in the result set
-         </para>
-        </listitem>
-       </itemizedlist>
-       The statement may or may not be in the cache already.
-       It may or may not be added to the cache later on.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_found_in_cache</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable and we have found it in the cache
-       but we have not replayed the cached data yet and we have not send
-       the result set to the client yet. This is not considered
-       a cache hit because the client might not fetch the result or
-       the cached data may be faulty.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_uncached_other</literal>
-      </entry>
-      <entry>
-       Statement is considered cacheable and it may or may not be in
-       the cache already but either replaying cached data has failed,
-       no result set is available or some other error has happened.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_uncached_no_table</literal>
-      </entry>
-      <entry>
-       Statement has not been cached because the result set has at least
-       one column which has no table name in its meta data. An example of
-       such a query is
-       <literal>SELECT SLEEP(1)</literal>. To cache those
-       statements you have to change default value of the PHP configuration directive
-       <literal>mysqlnd_qc.cache_no_table</literal> and set
-       <literal>mysqlnd_qc.cache_no_table = 1</literal>. Often, it is not
-       desired to cache such statements.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_uncached_use_result</literal>
-      </entry>
-      <entry>
-       Statement would have been cached if a buffered result set
-       had been used. The situation is also considered as a cache miss and
-       <literal>cache_miss</literal> will be incremented as well.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_aggr_run_time_cache_hit</literal>
-      </entry>
-      <entry>
-       Aggregated run time (ms) of all cached queries.
-       Cached queries are those which have incremented
-       <literal>cache_hit</literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_aggr_run_time_cache_put</literal>
-      </entry>
-      <entry>
-       Aggregated run time (ms) of all uncached queries that
-       have been put into the cache. See also
-       <literal>cache_put</literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_aggr_run_time_total</literal>
-      </entry>
-      <entry>
-       Aggregated run time (ms) of all uncached and cached queries
-       that have been inspected and executed by the query cache.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_aggr_store_time_cache_hit</literal>
-      </entry>
-      <entry>
-       Aggregated store time (ms) of all cached queries.
-       Cached queries are those which have incremented
-       <literal>cache_hit</literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_aggr_store_time_cache_put</literal>
-      </entry>
-      <entry>
-       Aggregated store time (
-       <literal>ms</literal>) of all uncached queries that
-       have been put into the cache. See also
-       <literal>cache_put</literal>.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>query_aggr_store_time_total</literal>
-      </entry>
-      <entry>
-       Aggregated store time (ms) of all uncached and cached queries
-       that have been inspected and executed by the query cache.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>receive_bytes_recorded</literal>
-      </entry>
-      <entry>
-       Recorded incoming network traffic (
-       <literal>bytes</literal>) send from MySQL to PHP.
-       The traffic may or may not have been added to the cache. The
-       traffic is the total for all queries regardless if cached or not.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>receive_bytes_replayed</literal>
-      </entry>
-      <entry>
-       Network traffic replayed during cache. This is the total amount of
-       incoming traffic saved because of the usage of the query cache plugin.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>send_bytes_recorded</literal>
-      </entry>
-      <entry>
-       Recorded outgoing network traffic (
-       <literal>bytes</literal>) send from MySQL to PHP.
-       The traffic may or may not have been added to the cache. The
-       traffic is the total for all queries regardless if cached or not.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>send_bytes_replayed</literal>
-      </entry>
-      <entry>
-       Network traffic replayed during cache. This is the total amount of
-       outgoing traffic saved because of the usage of the query cache plugin.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>slam_stale_refresh</literal>
-      </entry>
-      <entry>
-       Number of cache misses which triggered serving stale data until
-       the client causing the cache miss has refreshed the cache entry.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-     <row>
-      <entry>
-       <literal>slam_stale_hit</literal>
-      </entry>
-      <entry>
-       Number of cache hits while a stale cache entry gets refreshed.
-      </entry>
-      <entry>Since 1.0.0.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_get_core_stats</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Enable collection of statistics - default: disabled */
-ini_set("mysqlnd_qc.collect_statistics", 1);
-
-/* Enable collection of all timing related statistics -
-default: enabled but overruled by mysqlnd_qc.collect_statistics = 0 */
-ini_set("mysqlnd_qc.collect_time_statistics", 1);
-
-/* Populate the cache, e.g. using mysqli */
-$mysqli = new mysqli('host', 'user', 'password', 'schema');
-
-/* Cache miss and cache put */
-$mysqli->query("/*qc=on*/SELECT id FROM test");
-/* Cache hit */
-$mysqli->query("/*qc=on*/SELECT id FROM test");
-
-/* Display core statistics */
-var_dump(mysqlnd_qc_get_core_stats());
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-array(26) {
-  ["cache_hit"]=>
-  string(1) "1"
-  ["cache_miss"]=>
-  string(1) "1"
-  ["cache_put"]=>
-  string(1) "1"
-  ["query_should_cache"]=>
-  string(1) "2"
-  ["query_should_not_cache"]=>
-  string(1) "0"
-  ["query_not_cached"]=>
-  string(1) "0"
-  ["query_could_cache"]=>
-  string(1) "2"
-  ["query_found_in_cache"]=>
-  string(1) "1"
-  ["query_uncached_other"]=>
-  string(1) "0"
-  ["query_uncached_no_table"]=>
-  string(1) "0"
-  ["query_uncached_no_result"]=>
-  string(1) "0"
-  ["query_uncached_use_result"]=>
-  string(1) "0"
-  ["query_aggr_run_time_cache_hit"]=>
-  string(1) "4"
-  ["query_aggr_run_time_cache_put"]=>
-  string(3) "395"
-  ["query_aggr_run_time_total"]=>
-  string(3) "399"
-  ["query_aggr_store_time_cache_hit"]=>
-  string(1) "2"
-  ["query_aggr_store_time_cache_put"]=>
-  string(1) "8"
-  ["query_aggr_store_time_total"]=>
-  string(2) "10"
-  ["receive_bytes_recorded"]=>
-  string(2) "65"
-  ["receive_bytes_replayed"]=>
-  string(2) "65"
-  ["send_bytes_recorded"]=>
-  string(2) "29"
-  ["send_bytes_replayed"]=>
-  string(2) "29"
-  ["slam_stale_refresh"]=>
-  string(1) "0"
-  ["slam_stale_hit"]=>
-  string(1) "0"
-  ["request_counter"]=>
-  int(1)
-  ["process_hash"]=>
-  int(3547549858)
-}
-
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.collect-statistics">mysqlnd_qc.collect_statistics</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.time-statistics">mysqlnd_qc.time_statistics</link>
-    </member>
-    <member>
-     <function>mysqlnd_qc_get_cache_info</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-normalized-query-trace-log.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-get-normalized-query-trace-log.xml
deleted file mode 100644
index 204cd6d945..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-normalized-query-trace-log.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.mysqlnd-qc-get-normalized-query-trace-log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_get_normalized_query_trace_log</refname>
-  <refpurpose>Returns a normalized query trace log for each query inspected by the query cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_qc_get_normalized_query_trace_log</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a normalized query trace log for each query inspected by the query cache.
-   The collection of the trace log is disabled by default. To collect
-   the trace log you have to set the PHP configuration directive
-   <literal>mysqlnd_qc.collect_normalized_query_trace</literal> to
-   <literal>1</literal>
-  </para>
-  <para>
-   Entries in the trace log are grouped by the normalized query statement.
-   The normalized query statement is the query statement with all statement
-   parameter values being replaced with a question mark. For example, the two
-   statements <literal>SELECT id FROM test WHERE id = 1</literal> and
-   <literal>SELECT id FROM test WHERE id = 2</literal> are normalized as
-   <literal>SELECT id FROM test WHERE id = ?</literal>. Whenever a statement
-   is inspected by the query cache which matches the normalized statement pattern,
-   its statistics are grouped by the normalized statement string.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of query log. Every list entry contains
-   the normalized query stringand further detail information.
-  </para>
-
-  <informaltable>
-   <tgroup cols="2">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="9*"/>
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>query</literal>
-      </entry>
-      <entry>
-       Normalized statement string.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>occurences</literal>
-      </entry>
-      <entry>
-       How many statements have matched the normalized statement
-       string in addition to the one which has created the log entry.
-       The value is zero if a statement has been normalized, its normalized
-       representation has been added to the log but no further queries inspected
-       by PECL/mysqlnd_qc have the same normalized statement string.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>eligible_for_caching</literal>
-      </entry>
-      <entry>
-       Whether the statement could be cached. An statement eligible for
-       caching has not necessarily been cached. It not possible to tell
-       for sure if or how many cached statement have contributed to the
-       aggregated normalized statement log entry. However, comparing
-       the minimum and average run time one can make an educated guess.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>avg_run_time</literal>
-      </entry>
-      <entry>
-       The average run time of all queries contributing to the
-       query log entry. The run time is the time between sending the
-       query statement to MySQL and receiving an answer from MySQL.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>avg_store_time</literal>
-      </entry>
-      <entry>
-       The average store time of all queries contributing to the
-       query log entry. The store time is the time needed to fetch
-       a statements result set from the server to the client and,
-       storing it on the client.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>min_run_time</literal>
-      </entry>
-      <entry>
-       The minimum run time of all queries contributing to the
-       query log entry.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>min_store_time</literal>
-      </entry>
-      <entry>
-       The minimum store time of all queries contributing to the
-       query log entry.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>max_run_time</literal>
-      </entry>
-      <entry>
-       The maximum run time of all queries contributing to the
-       query log entry.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>max_store_time</literal>
-      </entry>
-      <entry>
-       The maximum store time of all queries contributing to the
-       query log entry.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_get_normalized_query_trace_log</function> example</title>
-  <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.collect_normalized_query_trace=1
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2)");
-
-/* not cached */
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-
-/* cache put */
-$res = $mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/" . "SELECT id FROM test WHERE id = 2");
-var_dump($res->fetch_assoc());
-$res->free();
-
-/* cache hit */
-$res = $mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/" . "SELECT id FROM test WHERE id = 2");
-var_dump($res->fetch_assoc());
-$res->free();
-
-var_dump(mysqlnd_qc_get_normalized_query_trace_log());
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-array(1) {
-  ["id"]=>
-  string(1) "2"
-}
-array(1) {
-  ["id"]=>
-  string(1) "2"
-}
-array(4) {
-  [0]=>
-  array(9) {
-    ["query"]=>
-    string(25) "DROP TABLE IF EXISTS test"
-    ["occurences"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["avg_run_time"]=>
-    int(0)
-    ["min_run_time"]=>
-    int(0)
-    ["max_run_time"]=>
-    int(0)
-    ["avg_store_time"]=>
-    int(0)
-    ["min_store_time"]=>
-    int(0)
-    ["max_store_time"]=>
-    int(0)
-  }
-  [1]=>
-  array(9) {
-    ["query"]=>
-    string(27) "CREATE TABLE test (id INT )"
-    ["occurences"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["avg_run_time"]=>
-    int(0)
-    ["min_run_time"]=>
-    int(0)
-    ["max_run_time"]=>
-    int(0)
-    ["avg_store_time"]=>
-    int(0)
-    ["min_store_time"]=>
-    int(0)
-    ["max_store_time"]=>
-    int(0)
-  }
-  [2]=>
-  array(9) {
-    ["query"]=>
-    string(40) "INSERT INTO test (id ) VALUES (? ), (? )"
-    ["occurences"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["avg_run_time"]=>
-    int(0)
-    ["min_run_time"]=>
-    int(0)
-    ["max_run_time"]=>
-    int(0)
-    ["avg_store_time"]=>
-    int(0)
-    ["min_store_time"]=>
-    int(0)
-    ["max_store_time"]=>
-    int(0)
-  }
-  [3]=>
-  array(9) {
-    ["query"]=>
-    string(31) "SELECT id FROM test WHERE id =?"
-    ["occurences"]=>
-    int(2)
-    ["eligible_for_caching"]=>
-    bool(true)
-    ["avg_run_time"]=>
-    int(159)
-    ["min_run_time"]=>
-    int(12)
-    ["max_run_time"]=>
-    int(307)
-    ["avg_store_time"]=>
-    int(10)
-    ["min_store_time"]=>
-    int(8)
-    ["max_store_time"]=>
-    int(13)
-  }
-}
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.collect-query-trace">mysqlnd_qc.collect_normalized_query_trace</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.time-statistics">mysqlnd_qc.time_statistics</link>
-    </member>
-    <member>
-     <function>mysqlnd_qc_get_query_trace_log</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-query-trace-log.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-get-query-trace-log.xml
deleted file mode 100644
index 14d656d85b..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-get-query-trace-log.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-qc-get-query-trace-log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_get_query_trace_log</refname>
-  <refpurpose>Returns a backtrace for each query inspected by the query cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_qc_get_query_trace_log</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a backtrace for each query inspected by the query cache.
-   The collection of the backtrace is disabled by default. To collect
-   the backtrace you have to set the PHP configuration directive
-   <literal>mysqlnd_qc.collect_query_trace</literal> to
-   <literal>1</literal>
-  </para>
-  <para>
-   The maximum depth of the backtrace is limited to the depth set
-   with the PHP configuration directive
-   <literal>mysqlnd_qc.query_trace_bt_depth</literal>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of query backtrace. Every list entry contains
-   the query string, a backtrace and further detail information.
-  </para>
-
-  <informaltable>
-   <tgroup cols="2">
-    <colspec colwidth="1*"/>
-    <colspec colwidth="9*"/>
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>
-       <literal>query</literal>
-      </entry>
-      <entry>
-              Query string.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>origin</literal>
-      </entry>
-      <entry>
-       Code backtrace.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>run_time</literal>
-      </entry>
-      <entry>
-       Query run time in milliseconds. The collection of
-       all times and the necessary
-       <literal>gettimeofday</literal>
-       system calls can be disabled by setting the PHP configuration
-       directive
-       <literal>mysqlnd_qc.time_statistics</literal> to
-       <literal>0</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>store_time</literal>
-      </entry>
-      <entry>
-       Query result set store time in milliseconds. The collection of
-       all times and the necessary
-       <literal>gettimeofday</literal>
-       system calls can be disabled by setting the PHP configuration
-       directive
-       <literal>mysqlnd_qc.time_statistics</literal> to
-       <literal>0</literal>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>eligible_for_caching</literal>
-      </entry>
-      <entry>
-       &true; if query is cacheable otherwise
-       &false;.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>no_table</literal>
-      </entry>
-      <entry>
-       &true; if the query has generated a result
-       set and at least one column from the result set has no table
-       name set in its metadata. This is usually the case with
-       queries which one probably do not want to cache such as
-       <literal>SELECT SLEEP(1)</literal>. By default any such query
-       will not be added to the cache. See also PHP configuration directive
-       <literal>mysqlnd_qc.cache_no_table</literal>.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>was_added</literal>
-      </entry>
-      <entry>
-       &true; if the query result has been put into
-       the cache, otherwise
-       &false;.
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <literal>was_already_in_cache</literal>
-      </entry>
-      <entry>
-       &true; if the query result would have been
-       added to the cache if it was not already in the cache (cache hit).
-       Otherwise
-       &false;.
-      </entry>
-     </row>
-
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_get_query_trace_log</function> example</title>
-   <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.collect_query_trace=1
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2)");
-
-/* not cached */
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-
-/* cache put */
-$res = $mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/" . "SELECT id FROM test WHERE id = 2");
-var_dump($res->fetch_assoc());
-$res->free();
-
-/* cache hit */
-$res = $mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/" . "SELECT id FROM test WHERE id = 2");
-var_dump($res->fetch_assoc());
-$res->free();
-
-var_dump(mysqlnd_qc_get_query_trace_log());
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-array(1) {
-  ["id"]=>
-  string(1) "2"
-}
-array(1) {
-  ["id"]=>
-  string(1) "2"
-}
-array(6) {
-  [0]=>
-  array(8) {
-    ["query"]=>
-    string(25) "DROP TABLE IF EXISTS test"
-    ["origin"]=>
-    string(102) "#0 qc.php(4): mysqli->query('DROP TABLE IF E...')
-#1 {main}"
-    ["run_time"]=>
-    int(0)
-    ["store_time"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-  [1]=>
-  array(8) {
-    ["query"]=>
-    string(25) "CREATE TABLE test(id INT)"
-    ["origin"]=>
-    string(102) "#0 qc.php(5): mysqli->query('CREATE TABLE te...')
-#1 {main}"
-    ["run_time"]=>
-    int(0)
-    ["store_time"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-  [2]=>
-  array(8) {
-    ["query"]=>
-    string(36) "INSERT INTO test(id) VALUES (1), (2)"
-    ["origin"]=>
-    string(102) "#0 qc.php(6): mysqli->query('INSERT INTO tes...')
-#1 {main}"
-    ["run_time"]=>
-    int(0)
-    ["store_time"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-  [3]=>
-  array(8) {
-    ["query"]=>
-    string(32) "SELECT id FROM test WHERE id = 1"
-    ["origin"]=>
-    string(102) "#0 qc.php(9): mysqli->query('SELECT id FROM ...')
-#1 {main}"
-    ["run_time"]=>
-    int(0)
-    ["store_time"]=>
-    int(25)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-  [4]=>
-  array(8) {
-    ["query"]=>
-    string(41) "/*qc=on*/SELECT id FROM test WHERE id = 2"
-    ["origin"]=>
-    string(103) "#0 qc.php(14): mysqli->query('/*qc=on*/SELECT...')
-#1 {main}"
-    ["run_time"]=>
-    int(311)
-    ["store_time"]=>
-    int(13)
-    ["eligible_for_caching"]=>
-    bool(true)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(true)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-  [5]=>
-  array(8) {
-    ["query"]=>
-    string(41) "/*qc=on*/SELECT id FROM test WHERE id = 2"
-    ["origin"]=>
-    string(103) "#0 qc.php(19): mysqli->query('/*qc=on*/SELECT...')
-#1 {main}"
-    ["run_time"]=>
-    int(13)
-    ["store_time"]=>
-    int(8)
-    ["eligible_for_caching"]=>
-    bool(true)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(true)
-  }
-}
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.collect-query-trace">mysqlnd_qc.collect_query_trace</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.query-trace-bt-depth">mysqlnd_qc.query_trace_bt_depth</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.time-statistics">mysqlnd_qc.time_statistics</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.cache-no-table">mysqlnd_qc.cache_no_table</link>
-    </member>
-    <member>
-     <function>mysqlnd_qc_get_normalized_query_trace_log</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-cache-condition.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-set-cache-condition.xml
deleted file mode 100644
index 3bccea835a..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-cache-condition.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.mysqlnd-qc-set-cache-condition" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_set_cache_condition</refname>
-  <refpurpose>Set conditions for automatic caching</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_qc_set_cache_condition</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>condition_type</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>condition</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>condition_option</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a condition for automatic caching of statements which do not contain
-   the necessary SQL hints to enable caching of them.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>condition_type</parameter>
-    </term>
-    <listitem>
-     <para>
-      Type of the condition. The only allowed value is
-      <constant>MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>condition</parameter>
-    </term>
-    <listitem>
-     <para>
-      Parameter for the condition set with <literal>condition_type</literal>.
-      Parameter type and structure depend on <literal>condition_type</literal>
-     </para>
-     <para>
-      If <literal>condition_type</literal> equals
-      <literal>MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN</literal>
-      <literal>condition</literal> must be a string. The string sets a pattern.
-      Statements are cached if table and database meta data entry of their result sets
-      match the pattern. The pattern is checked for a match with the
-      <literal>db</literal> and <literal>org_table</literal> meta data entries
-      provided by the underlying MySQL client server library. Please, check
-      the MySQL Reference manual for details about the two entries. The
-      <literal>db</literal> and <literal>org_table</literal> values are
-      concatenated with a dot (<literal>.</literal>) before matched
-      against <literal>condition</literal>. Pattern matching supports
-      the wildcards <literal>%</literal> and <literal>_</literal>.
-      The wildcard <literal>%</literal> will match one or many arbitrary
-      characters. <literal>_</literal> will match one arbitrary character.
-      The escape symbol is backslash.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>condition_option</parameter>
-    </term>
-    <listitem>
-     <para>
-      Option for <literal>condition</literal>. Type and structure depend
-      on <literal>condition_type</literal>.
-     </para>
-     <para>
-      If <literal>condition_type</literal> equals
-      <literal>MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN</literal>
-      <literal>condition_options</literal> is the TTL to be used.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_set_cache_condition</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Cache all accesses to tables with the name "new%" in schema/database "db_example" for 1 second */
-if (!mysqlnd_qc_set_cache_condition(MYSQLND_QC_CONDITION_META_SCHEMA_PATTERN, "db_example.new%", 1)) {
-  die("Failed to set cache condition!");
-}
-
-$mysqli = new mysqli("host", "user", "password", "db_example", "port");
-/* cached although no SQL hint given  */
-$mysqli->query("SELECT id, title FROM news");
-
-$pdo_mysql = new PDO("mysql:host=host;dbname=db_example;port=port", "user", "password");
-/* not cached: no SQL hint, no pattern match */
-$pdo_mysql->query("SELECT id, title FROM latest_news");
-/* cached: TTL 1 second, pattern match */
-$pdo_mysql->query("SELECT id, title FROM news");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns TRUE on success or FALSE on FAILURE.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.pattern-based-caching">Quickstart: pattern based caching</link>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-is-select.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-set-is-select.xml
deleted file mode 100644
index 05abe97392..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-is-select.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.mysqlnd-qc-set-is-select" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_set_is_select</refname>
-  <refpurpose>Installs a callback which decides whether a statement is cached</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type>
-   <methodname>mysqlnd_qc_set_is_select</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Installs a callback which decides whether a statement is cached.
-  </para>
-  <para>
-   There are several ways of hinting PELC/mysqlnd_qc to cache a query.
-   By default, PECL/mysqlnd_qc attempts to cache a if caching of all statements
-   is enabled or the query string begins with a certain SQL hint.
-   The plugin internally calls a function named <literal>is_select()</literal>
-   to find out. This internal function can be replaced with a user-defined callback.
-   Then, the user-defined callback is responsible to decide whether the plugin
-   attempts to cache a statement. Because the internal function is replaced
-   with the callback, the callback gains full control. The callback is free
-   to ignore the configuration setting <literal>mysqlnd_qc.cache_by_default</literal>
-   and SQL hints.
-  </para>
-  <para>
-   The callback is invoked for every statement inspected by the plugin.
-   It is given the statements string as a parameter. The callback returns
-   &false; if the statement shall not be cached. It returns &true; to
-   make the plugin attempt to cache the statements result set, if any.
-   A so-created cache entry is given the default TTL set with the
-   PHP configuration directive <literal>mysqlnd_qc.ttl</literal>.
-   If a different TTL shall be used, the callback returns a numeric
-   value to be used as the TTL.
-  </para>
-  <para>
-   The internal <literal>is_select</literal> function is part of the internal
-   cache storage handler interface. Thus, a user-defined storage handler
-   offers the same capabilities.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_set_is_select</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* callback which decides if query is cached */
-function is_select($query) {
-  static $patterns = array(
-   /* true - use default from mysqlnd_qc.ttl */
-   "@SELECT\s+.*\s+FROM\s+test@ismU" => true,
-   /* 3 - use TTL = 3 seconds */
-   "@SELECT\s+.*\s+FROM\s+news@ismU" => 3
-  );
-  /* check if query does match pattern */
-  foreach ($patterns as $pattern => $ttl) {
-    if (preg_match($pattern, $query)) {
-      printf("is_select(%45s): cache\n", $query);
-      return $ttl;
-    }
-  }
-  printf("is_select(%45s): do not cache\n", $query);
-  return false;
-}
-mysqlnd_qc_set_is_select("is_select");
-
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2), (3)");
-
-/* cache put */
-$mysqli->query("SELECT id FROM test WHERE id = 1");
-/* cache hit */
-$mysqli->query("SELECT id FROM test WHERE id = 1");
-/* cache put */
-$mysqli->query("SELECT * FROM test");
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-is_select(                    DROP TABLE IF EXISTS test): do not cache
-is_select(                    CREATE TABLE test(id INT)): do not cache
-is_select(    INSERT INTO test(id) VALUES (1), (2), (3)): do not cache
-is_select(             SELECT id FROM test WHERE id = 1): cache
-is_select(             SELECT id FROM test WHERE id = 1): cache
-is_select(                           SELECT * FROM test): cache
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.configuration">Runtime configuration</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.ttl">mysqlnd_qc.ttl</link>
-    </member>
-    <member>
-     <link linkend="ini.mysqlnd-qc.cache-by-default">mysqlnd_qc.cache_by_default</link>
-    </member>
-    <member>
-     <function>mysqlnd_qc_set_user_handlers</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-storage-handler.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-set-storage-handler.xml
deleted file mode 100644
index 341fe4fb3c..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-storage-handler.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.mysqlnd-qc-set-storage-handler" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_set_storage_handler</refname>
-  <refpurpose>Change current storage handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_qc_set_storage_handler</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>handler</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the storage handler used by the query cache. A list of available
-   storage handler can be obtained from
-   <function>mysqlnd_qc_get_available_handlers</function>.
-   Which storage are available depends on the compile time
-   configuration of the query cache plugin. The
-   <literal>default</literal> storage handler is always available.
-   All other storage handler must be enabled explicitly when building the
-   extension.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>handler</parameter>
-    </term>
-    <listitem>
-     <para>
-      Handler can be of type string representing the name of a
-      built-in storage handler or an object of type
-      <literal>mysqlnd_qc_handler_default</literal>.
-      The names of the built-in storage handler are
-      <literal>default</literal>,
-      <literal>APC</literal>,
-      <literal>MEMCACHE</literal>,
-      <literal>sqlite</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
-  <para>
-   If changing the storage handler fails a catchable fatal error will
-   be thrown. The query cache cannot operate if the previous storage
-   handler has been shutdown but no new storage handler has been installed.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysqlnd_qc_set_storage_handler</function> example</title>
-   <para>
-    The example shows the output from the built-in default storage handler.
-    Other storage handler may report different data.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(mysqlnd_qc_set_storage_handler("memcache"));
-
-if (true === mysqlnd_qc_set_storage_handler("default"))
-  printf("Default storage handler activated");
-
-/* Catchable fatal error */
-var_dump(mysqlnd_qc_set_storage_handler("unknown"));
-?>
-]]>
-   </programlisting>
-   &examples.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-Default storage handler activated
-Catchable fatal error: mysqlnd_qc_set_storage_handler(): Unknown handler 'unknown' in (file) on line (line)
-
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.installation">Installation</link>
-    </member>
-    <member>
-     <function>mysqlnd_qc_get_available_handlers</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-user-handlers.xml b/reference/mysqlnd_qc/functions/mysqlnd-qc-set-user-handlers.xml
deleted file mode 100644
index 59f4b2af2e..0000000000
--- a/reference/mysqlnd_qc/functions/mysqlnd-qc-set-user-handlers.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-qc-set-user-handlers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_qc_set_user_handlers</refname>
-  <refpurpose>Sets the callback functions for a user-defined procedural storage handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>mysqlnd_qc_set_user_handlers</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>get_hash</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>find_query_in_cache</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>return_to_cache</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>add_query_to_cache_if_not_exists</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>query_is_select</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>update_query_run_time_stats</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>get_stats</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>clear_cache</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the callback functions for a user-defined procedural storage handler.
-  </para>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>get_hash</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>get_hash</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>find_query_in_cache</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>find_in_cache</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>return_to_cache</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>return_to_cache</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>add_query_to_cache_if_not_exists</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>add_query_to_cache_if_not_exists</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>query_is_select</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>query_is_select</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>update_query_run_time_stats</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>update_query_run_time_stats</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>get_stats</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>get_stats</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>clear_cache</parameter>
-    </term>
-    <listitem>
-     <para>
-      Name of the user function implementing the storage handler
-      <literal>clear_cache</literal> functionality.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns TRUE on success or FALSE on FAILURE.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <link linkend="mysqlnd-qc.set-user-handlers">Procedural user-defined storage handler example</link>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/ini.xml b/reference/mysqlnd_qc/ini.xml
deleted file mode 100644
index 3a14ce54a8..0000000000
--- a/reference/mysqlnd_qc/ini.xml
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-qc.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>mysqlnd_qc &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mysqlnd-qc.configuration.list">
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.enable-qc">mysqlnd_qc.enable_qc</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.ttl">mysqlnd_qc.ttl</link></entry>
-      <entry>30</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.cache-by-default">mysqlnd_qc.cache_by_default</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.cache-no-table">mysqlnd_qc.cache_no_table</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.use-request-time">mysqlnd_qc.use_request_time</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.time-statistics">mysqlnd_qc.time_statistics</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.collect-statistics">mysqlnd_qc.collect_statistics</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.collect-statistics-log-file">mysqlnd_qc.collect_statistics_log_file</link></entry>
-      <entry>/tmp/mysqlnd_qc.stats</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.collect-query-trace">mysqlnd_qc.collect_query_trace</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.query-trace-bt-depth">mysqlnd_qc.query_trace_bt_depth</link></entry>
-      <entry>3</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.collect-normalized-query-trace">mysqlnd_qc.collect_normalized_query_trace</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.ignore-sql-comments">mysqlnd_qc.ignore_sql_comments</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.slam-defense">mysqlnd_qc.slam_defense</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.slam-defense-ttl">mysqlnd_qc.slam_defense_ttl</link></entry>
-      <entry>30</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.std-data-copy">mysqlnd_qc.std_data_copy</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.apc-prefix">mysqlnd_qc.apc_prefix</link></entry>
-      <entry>qc_</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.memc-server">mysqlnd_qc.memc_server</link></entry>
-      <entry>127.0.0.1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.memc-port">mysqlnd_qc.memc_port</link></entry>
-      <entry>11211</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-qc.sqlite-data-file">mysqlnd_qc.sqlite_data_file</link></entry>
-      <entry>:memory:</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script -->
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.mysqlnd-qc.enable-qc">
-    <term>
-     <parameter>mysqlnd_qc.enable_qc</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enables or disables the plugin. If disabled the extension will not plug
-      into
-      <link linkend="book.mysqlnd">mysqlnd</link> to proxy internal
-      <link linkend="book.mysqlnd">mysqlnd</link> C API calls.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.ttl">
-    <term>
-     <parameter>mysqlnd_qc.ttl</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-             Default Time-to-Live (TTL) for cache entries in seconds.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.cache-by-default">
-    <term>
-     <parameter>mysqlnd_qc.cache_by_default</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Cache all queries regardless if they begin with the SQL hint that
-      enables caching of a query or not. Storage handler cannot overrule
-      the setting. It is evaluated by the core of the plugin.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.cache-no-table">
-    <term>
-     <parameter>mysqlnd_qc.cache_no_table</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Whether to cache queries with no table name in any of columns meta data
-      of their result set, for example,
-      <literal>SELECT SLEEP(1)</literal>, <literal>SELECT NOW()</literal>,
-      <literal>SELECT SUBSTRING()</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.use-request-time">
-    <term>
-     <parameter>mysqlnd_qc.use_request_time</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Use PHP global request time to avoid
-      <literal>gettimeofday()</literal> system calls?
-      If using
-      <literal>APC</literal> storage handler
-      it should be set to the value of
-      <literal>apc.use_request_time</literal>, if not
-      warnings will be generated.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.time-statistics">
-    <term>
-     <parameter>mysqlnd_qc.time_statistics</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Collect run time and store time statistics using
-      <literal>gettimeofday()</literal> system call? Data will be
-      collected only if you also set
-      <literal>mysqlnd_qc.collect_statistics = 1</literal>,
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.collect-statistics">
-    <term>
-     <parameter>mysqlnd_qc.collect_statistics</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Collect statistics for
-      <function>mysqlnd_qc_get_core_stats</function>?
-      Does not influence storage handler statistics! Handler statistics
-      can be an integral part of the handler internal storage format.
-      Therefore, collection of some handler statistics cannot be disabled.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.collect-statistics-log-file">
-    <term>
-     <parameter>mysqlnd_qc.collect_statistics-log-file</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      If <literal>mysqlnd_qc.collect_statistics</literal> and
-      <literal>mysqlnd_qc.collect_statistics_log_file</literal>
-      are set, the plugin will dump statistics into the specified
-      log file at every 10th web request during PHP request shutdown.
-      The log file needs to be writable by the web server user.
-     </para>
-     <para>
-      Since 1.1.0.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.collect-query-trace">
-    <term>
-     <parameter>mysqlnd_qc.collect_query_trace</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Collect query back traces?
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.query-trace-bt-depth">
-    <term>
-     <parameter>mysqlnd_qc.query_trace_bt_depth</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Maximum depth/level of a query code backtrace.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.ignore-sql-comments">
-    <term>
-     <parameter>mysqlnd_qc.ignore_sql_comments</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Whether to remove SQL comments from a query string before
-      hashing it to generate a cache key. Disable if you do not want
-      two statemts such as <literal>SELECT /*my_source_ip=123*/ id FROM test</literal>
-      and <literal>SELECT /*my_source_ip=456*/ id FROM test</literal> to refer
-      to the same cache entry.
-     </para>
-     <para>
-      Since 1.1.0.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.slam-defense">
-    <term>
-     <parameter>mysqlnd_qc.slam_defense</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Activates handler based slam defense (cache stampeding protection) if available.
-      Supported by
-      <literal>Default</literal> and
-      <literal>APC</literal> storage handler
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.slam-defense-ttl">
-    <term>
-     <parameter>mysqlnd_qc.slam_defense_ttl</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      <literal>TTL</literal> for stale cache entries which are
-      served while another client updates the entries. Supported by
-      <literal>APC</literal> storage handler.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.collect-normalized-query-trace">
-    <term>
-     <parameter>mysqlnd_qc.collect_normalized_query_trace</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Collect aggregated normalized query traces? The setting
-      has no effect by default. You compile the extension
-      using the define
-      <literal>NORM_QUERY_TRACE_LOG</literal> to make use of the setting.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.std-data-copy">
-    <term>
-     <parameter>mysqlnd_qc.std_data_copy</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Default storage handler: copy cached wire data?
-      EXPERIMENTAL – use default setting!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.apc-prefix">
-    <term>
-     <parameter>mysqlnd_qc.apc_prefix</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      The
-      <literal>APC</literal> storage handler stores data in the
-      <literal>APC</literal> user cache. The setting sets a prefix to be
-      used for cache entries.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.memc-server">
-    <term>
-     <parameter>mysqlnd_qc.memc_server</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      <literal>MEMCACHE</literal> storage handler: memcache server host.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.memc-port">
-    <term>
-     <parameter>mysqlnd_qc.memc_port</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      <literal>MEMCACHE</literal> storage handler: memcached server port.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.mysqlnd-qc.sqlite-data-file">
-    <term>
-     <parameter>mysqlnd_qc.sqlite_data_file</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      <literal>sqlite</literal> storage handler: data file. Any setting
-      but <literal>:memory:</literal> may be of little practical value.
-     </para>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/quickstart.xml b/reference/mysqlnd_qc/quickstart.xml
deleted file mode 100644
index ffb9e589be..0000000000
--- a/reference/mysqlnd_qc/quickstart.xml
+++ /dev/null
@@ -1,1732 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<chapter xml:id="mysqlnd-qc.quickstart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Quickstart and Examples</title>
- <para>
-  The mysqlnd query cache plugin is easy to use.
-  This quickstart will demo typical use-cases, and provide practical advice on getting
-  started.
- </para>
- <para>
-  It is strongly recommended to read the reference sections in addition to the
-  quickstart. It is safe to begin with the quickstart.
-  However, before using the plugin in mission critical
-  environments we urge you to read additionally the background information from the
-  reference sections.
- </para>
- <para>
-   Most of the examples use the <link linkend="ref.mysqli">mysqli</link> extension
-   because it is the most feature complete PHP MySQL extension. However, the plugin
-   can be used with any PHP MySQL extension that is using the
-   <link linkend="book.mysqlnd">mysqlnd</link> library.
-  </para>
-
- <section xml:id="mysqlnd-qc.quickstart.concepts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Architecture and Concepts</title>
-   <para>
-    The query cache plugin is implemented as a PHP extension.
-    It is written in C and operates under the hood of PHP. During the
-    startup of the PHP interpreter, it gets registered as a
-    <link linkend="book.mysqlnd">mysqlnd</link> plugin to replace selected
-    mysqlnd C methods. Hereby, it can change the behaviour of any
-    PHP MySQL extension (<link linkend="ref.mysqli">mysqli</link>,
-    <link linkend="ref.pdo-mysql">PDO_MYSQL</link>,
-    <link linkend="ref.mysql">mysql</link>) compiled to use the
-    mysqlnd library without changing the extensions API. This makes
-    the plugin compatible with each and every PHP MySQL application.
-    Because existing APIs are not changed, it is almost transparent
-    to use. Please, see the
-    <link linkend="mysqlnd.plugin">mysqlnd plugin API description</link>
-    for a discussion of the advantages of the plugin architecture and
-    a comparison with proxy based solutions.
-   </para>
-   <para>
-    <emphasis role="bold">Transparent to use</emphasis>
-   </para>
-   <para>
-    At PHP run time PECL/mysqlnd_qc can proxy queries send from PHP
-    (<link linkend="book.mysqlnd">mysqlnd</link>) to the MySQL server.
-    It then inspects the statement string to find whether it shall cache
-    its results. If so, result set is cached using a storage handler and
-    further executions of the statement are served from the cache for
-    a user-defined period. The Time to Live (TTL) of the cache entry
-    can either be set globally or on a per statement basis.
-   </para>
-   <para>
-    A statement is either cached if the plugin is instructed to cache all
-    statements globally using a or, if the query string starts with the SQL hint
-    (<literal>/*qc=on*/</literal>). The plugin is capable of caching any
-    query issued by calling appropriate API calls of any of the existing
-    PHP MySQL extensions.
-   </para>
-   <para>
-    <emphasis role="bold">Flexible storage: various storage handler</emphasis>
-   </para>
-   <para>
-    Various storage handler are supported to offer different scopes for cache
-    entries. Different scopes allow for different degrees in sharing cache
-    entries among clients.
-   </para>
-   <para>
-    <itemizedlist>
-     <listitem>
-     <para>
-      <literal>default</literal> (built-in): process memory, scope: process, one or more web requests depending on PHP deployment model used
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>APC</literal>: shared memory, scope: single server, multiple web requests
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>SQLite</literal>: memory or file, scope: single server, multiple web requests
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>MEMCACHE</literal>: main memory, scope: single or multiple server, multiple web requests
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>user</literal> (built-in): user-defined - any, scope: user-defined - any
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Support for the <literal>APC</literal>, <literal>SQLite</literal> and <literal>
-   MEMCACHE</literal> storage handler has to be enabled at compile time. The <literal>
-   default</literal> and <literal>user</literal> handler are built-in. It is possible
-   to switch between compiled-in storage handlers on a per query basis at run time.
-   However, it is recommended to pick one storage handler and use it for all cache entries.
-  </para>
-  <para>
-   <emphasis role="bold">Built-in slam defense to avoid overloading</emphasis>
-  </para>
-  <para>
-   To avoid overload situations the cache plugin has a built-in slam defense mechanism.
-   If a popular cache entries expires many clients using the cache entries will try
-   to refresh the cache entry. For the duration of the refresh many clients may
-   access the database server concurrently. In the worst case, the database server
-   becomes overloaded and it takes more and more time to refresh the cache entry, which
-   in turn lets more and more clients try to refresh the cache entry. To prevent
-   this from happening the plugin has a slam defense mechanism. If slam defense is
-   enabled and the plugin detects an expired cache entry it extends the life time
-   of the cache entry before it refreshes the cache entry. This way other concurrent
-   accesses to the expired cache entry are still served from the cache for a certain
-   time. The other concurrent accesses to not trigger a concurrent refresh. Ideally,
-   the cache entry gets refreshed by the client which extended the cache entries lifespan
-   before other clients try to refresh the cache and potentially cause an overload
-   situation.
-  </para>
-  <para>
-   <emphasis role="bold">Unique approach to caching</emphasis>
-  </para>
-  <para>
-   PECL/mysqlnd_qc has a unique approach to caching result sets that is superior
-   to application based cache solutions. Application based solutions first fetch
-   a result set into PHP variables. Then, the PHP variables are serialized for
-   storage in a persistent cache, and then unserialized when fetching. The mysqlnd
-   query cache stores the raw wire protocol data sent from MySQL to PHP in its cache
-   and replays it, if still valid, on a cache hit. This way, it saves an extra
-   serialization step for a cache put that all application based solutions have to
-   do. It can store the raw wire protocol data in the cache without having to
-   serialize into a PHP variable first and deserializing the PHP variable for storing
-   in the cache again.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.quickstart.configuration">
-  <title>Setup</title>
-  <para>
-   The plugin is implemented as a PHP extension. See also the
-   <link linkend="mysqlnd-qc.installation">installation instructions</link> to
-   install the
-   <link xlink:href="&url.pecl.package;mysqlnd_qc">PECL/mysqlnd_qc</link> extension.
-  </para>
-  <para>
-   Compile or configure the PHP MySQL extension (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>,
-   <link linkend="ref.mysql">mysql</link>) that you plan to use with support
-   for the <link linkend="book.mysqlnd">mysqlnd</link> library. PECL/mysqlnd_qc
-   is a plugin for the mysqlnd library. To use the plugin with any of the existing PHP
-   MySQL extensions (APIs), the extension has to use the mysqlnd library.
-  </para>
-  <para>
-   Then, load the extension into PHP and activate the plugin in the PHP configuration
-   file using the PHP configuration directive named
-   <link linkend="ini.mysqlnd-qc.enable-qc">mysqlnd_qc.enable_qc</link>.
-  </para>
-  <para>
-   <example>
-    <title>Enabling the plugin (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-]]>
-    </programlisting>
-    </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.quickstart.caching">
-  <title>Caching queries</title>
-  <para>
-   There are four ways to trigger caching of a query.
-   <itemizedlist>
-    <listitem>
-     <simpara>Use of SQL hints on a per query basis</simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      User supplied callbacks to decide on a per query basis, for example, using <function>mysqlnd_qc_is_select</function>
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <function>mysqlnd_set_cache_condition</function> for rule based automatic per query decisions
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.cache_by_default = 1</link></literal>
-      to cache all queries blindly
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Use of SQL hints and
-   <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.cache_by_default = 1</link></literal>
-   are explained below. Please, refer to the function reference on
-   <function>mysqlnd_qc_is_select</function> for a description of using a callback and,
-   <function>mysqlnd_qc_set_cache_condition</function> on how to set rules for automatic
-   caching.
-  </para>
-  <para>
-   A SQL hint is a SQL standards compliant
-   comment. As a SQL comment it is ignored by the database. A statement is considered
-   eligible for caching if it either begins with the SQL hint enabling caching
-   or it is a <literal>SELECT</literal> statement.
-  </para>
-  <para>
-   An individual query which shall be cached must begin with the SQL hint
-   <literal>/*qc=on*/</literal>. It is recommended to use the PHP constant
-   <literal><link linkend="mysqlnd-qc.constants">MYSQLND_QC_ENABLE_SWITCH</link></literal>
-   instead of using the string value.
-  </para>
-  <para>
-   <itemizedlist>
-    <listitem>
-     <para>
-      not eligible for caching and not cached: <literal>INSERT INTO test(id) VALUES (1)</literal>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      not eligible for caching and not cached: <literal>SHOW ENGINES</literal>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      eligible for caching but uncached: <literal>SELECT id FROM test</literal>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      eligible for caching and cached: <literal>/*qc=on*/SELECT id FROM test</literal>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The examples <literal>SELECT</literal> statement string is prefixed with the
-   <literal><link linkend="mysqlnd-qc.constants">MYSQLND_QC_ENABLE_SWITCH</link></literal>
-   SQL hint to enable caching of the statement. The SQL hint must be given at
-   the very beginning of the statement string to enable caching.
-  </para>
-  <para>
-   <example>
-    <title>Using the <literal>MYSQLND_QC_ENABLE_SWITCH</literal> SQL hint</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2)");
-
-/* Will be cached because of the SQL hint */
-$start = microtime(true);
-$res   = $mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/" . "SELECT id FROM test WHERE id = 1");
-
-var_dump($res->fetch_assoc());
-$res->free();
-
-printf("Total time uncached query: %.6fs\n", microtime(true) - $start);
-
-/* Cache hit */
-$start = microtime(true);
-$res   = $mysqli->query("/*" . MYSQLND_QC_ENABLE_SWITCH . "*/" . "SELECT id FROM test WHERE id = 1");
-
-var_dump($res->fetch_assoc());
-$res->free();
-
-printf("Total time cached query: %.6fs\n", microtime(true) - $start);
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-Total time uncached query: 0.000740s
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-Total time cached query: 0.000098s
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   If nothing else is configured, as it is the case in the quickstart example,
-   the plugin will use the built-in <literal>default</literal> storage handler.
-   The <literal>default</literal> storage handler uses process memory to hold a cache entry.
-   Depending on the PHP deployment model, a PHP process may serve one or more
-   web requests. Please, consult the web server manual for details.
-   Details make no difference for the examples given in the quickstart.
-  </para>
-  <para>
-   The query cache plugin will cache all queries regardless if
-   the query string begins with the SQL hint which enables caching or not,
-   if the PHP configuration directive
-   <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.cache_by_default</link></literal>
-   is set to <literal>1</literal>. The setting
-   <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.cache_by_default</link></literal>
-   is evaluated by the core of the query cache plugins.
-   Neither the built-in nor user-defined storage handler can overrule the setting.
-  </para>
-  <para>
-   The SQL hint <literal>/*qc=off*/</literal> can be used to disable caching
-   of individual queries if
-   <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.cache_by_default = 1</link></literal>
-   It is recommended to use the PHP constant
-   <literal><link linkend="mysqlnd-qc.constants">MYSQLND_QC_DISABLE_SWITCH</link></literal>
-   instead of using the string value.
-  </para>
-  <para>
-   <example>
-    <title>Using the <literal>MYSQLND_QC_DISABLE_SWITCH</literal> SQL hint</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.cache_by_default=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2)");
-
-/* Will be cached although no SQL hint is present because of mysqlnd_qc.cache_by_default = 1*/
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-
-$mysqli->query("DELETE FROM test WHERE id = 1");
-
-/* Cache hit - no automatic invalidation and still valid! */
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-
-/* Cache miss - query must not be cached because of the SQL hint */
-$res = $mysqli->query("/*" . MYSQLND_QC_DISABLE_SWITCH . "*/SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-?>
-]]>
-    </programlisting>
-     &examples.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-NULL
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   PECL/mysqlnd_qc forbids caching of statements for which at least one
-   column from the statements result set shows no table name in its meta data by default.
-   This is usually the case for columns originating from SQL functions such as
-   <literal>NOW()</literal> or <literal>LAST_INSERT_ID()</literal>. The policy
-   aims to prevent pitfalls if caching by default is used.
-  </para>
-  <para>
-   <example>
-    <title>Example showing which type of statements are not cached</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.cache_by_default=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1)");
-
-for ($i = 0; $i < 3; $i++) {
-
-    $start = microtime(true);
-
-    /* Note: statement will not be cached because of NOW() use */
-    $res = $mysqli->query("SELECT id, NOW() AS _time FROM test");
-    $row = $res->fetch_assoc();
-
-    /* dump results */
-    var_dump($row);
-
-    printf("Total time: %.6fs\n", microtime(true) - $start);
-
-    /* pause one second */
-    sleep(1);
-}
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["id"]=>
-  string(1) "1"
-  ["_time"]=>
-  string(19) "2012-01-11 15:43:10"
-}
-Total time: 0.000540s
-array(2) {
-  ["id"]=>
-  string(1) "1"
-  ["_time"]=>
-  string(19) "2012-01-11 15:43:11"
-}
-Total time: 0.000555s
-array(2) {
-  ["id"]=>
-  string(1) "1"
-  ["_time"]=>
-  string(19) "2012-01-11 15:43:12"
-}
-Total time: 0.000549s
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   It is possible to enable caching for all statements including those
-   which has columns in their result set for which MySQL reports no table, such as
-   the statement from the example. Set
-   <link linkend="ini.mysqlnd-qc.cache-no-table"><literal>mysqlnd_qc.cache_no_table = 1</literal></link>
-   to enable caching of such statements. Please, note the difference in the
-   measured times for the above and below examples.
-  </para>
-  <para>
-   <example>
-    <title>Enabling caching for all statements using the <literal>mysqlnd_qc.cache_no_table</literal> ini setting</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.cache_by_default=1
-mysqlnd_qc.cache_no_table=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1)");
-
-for ($i = 0; $i < 3; $i++) {
-
-    $start = microtime(true);
-
-    /* Note: statement will not be cached because of NOW() use */
-    $res = $mysqli->query("SELECT id, NOW() AS _time FROM test");
-    $row = $res->fetch_assoc();
-
-    /* dump results */
-    var_dump($row);
-
-    printf("Total time: %.6fs\n", microtime(true) - $start);
-
-    /* pause one second */
-    sleep(1);
-}
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["id"]=>
-  string(1) "1"
-  ["_time"]=>
-  string(19) "2012-01-11 15:47:45"
-}
-Total time: 0.000546s
-array(2) {
-  ["id"]=>
-  string(1) "1"
-  ["_time"]=>
-  string(19) "2012-01-11 15:47:45"
-}
-Total time: 0.000187s
-array(2) {
-  ["id"]=>
-  string(1) "1"
-  ["_time"]=>
-  string(19) "2012-01-11 15:47:45"
-}
-Total time: 0.000167s
-]]>
-    </screen>
-   </example>
-  </para>
-  <note>
-   <para>
-    Although <link linkend="ini.mysqlnd-qc.cache-no-table"><literal>mysqlnd_qc.cache_no_table = 1</literal></link>
-    has been created for use with
-    <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.cache_by_default = 1</link></literal>
-    it is bound it. The plugin will evaluate the
-    <link linkend="ini.mysqlnd-qc.cache-no-table"><literal>mysqlnd_qc.cache_no_table</literal></link>
-    whenever a query is to be cached, no matter whether caching has been enabled using a
-    SQL hint or any other measure.
-   </para>
-  </note>
- </section>
-
- <section xml:id="mysqlnd-qc.per-query-ttl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Setting the TTL</title>
-  <para>
-   The default invalidation strategy of the query cache plugin is Time to Live
-   (<literal>TTL</literal>). The built-in storage handlers will use the default
-   <literal>TTL</literal> defined by the PHP configuration value
-   <literal><link linkend="mysqlnd-qc.configuration">mysqlnd_qc.ttl</link></literal>
-   unless the query string contains a hint for setting a different
-   <literal>TTL</literal>. The <literal>TTL</literal> is specified in seconds.
-   By default cache entries expire after <literal>30</literal> seconds
-  </para>
-  <para>
-   The example sets <literal>mysqlnd_qc.ttl=3</literal> to cache
-   statements for three seconds by default. Every second it updates
-   a database table record to hold the current time and executes
-   a <literal>SELECT</literal> statement to fetch the record from the
-   database. The <literal>SELECT</literal> statement is cached for
-   three seconds because it is prefixed with the SQL hint enabling
-   caching. The output verifies that the query results are taken
-   from the cache for the duration of three seconds before they
-   are refreshed.
-  </para>
-  <para>
-   <example>
-    <title>Setting the TTL with the <literal>mysqlnd_qc.ttl</literal> ini setting</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.ttl=3
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id VARCHAR(255))");
-
-for ($i = 0; $i < 7; $i++) {
-
-    /* update DB row  */
-    if (!$mysqli->query("DELETE FROM test") ||
-        !$mysqli->query("INSERT INTO test(id) VALUES (NOW())"))
-      /* Of course, a real-life script should do better error handling */
-      die(sprintf("[%d] %s\n", $mysqli->errno, $mysqli->error));
-
-    /* select latest row but cache results */
-    $query  = "/*" . MYSQLND_QC_ENABLE_SWITCH . "*/";
-    $query .= "SELECT id AS _time FROM test";
-    if (!($res = $mysqli->query($query)) ||
-        !($row = $res->fetch_assoc()))
-    {
-      printf("[%d] %s\n", $mysqli->errno, $mysqli->error);
-    }
-    $res->free();
-    printf("Wall time %s - DB row time %s\n", date("H:i:s"), $row['_time']);
-
-    /* pause one second */
-    sleep(1);
-}
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-Wall time 14:55:59 - DB row time 2012-01-11 14:55:59
-Wall time 14:56:00 - DB row time 2012-01-11 14:55:59
-Wall time 14:56:01 - DB row time 2012-01-11 14:55:59
-Wall time 14:56:02 - DB row time 2012-01-11 14:56:02
-Wall time 14:56:03 - DB row time 2012-01-11 14:56:02
-Wall time 14:56:04 - DB row time 2012-01-11 14:56:02
-Wall time 14:56:05 - DB row time 2012-01-11 14:56:05
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   As can be seen from the example, any <literal>TTL</literal> based cache
-   can serve stale data. Cache entries are not automatically invalidated,
-   if underlying data changes. Applications using the default
-   <literal>TTL</literal> invalidation strategy must be able to work correctly
-   with stale data.
-  </para>
-  <para>
-   A user-defined cache storage handler can implement any invalidation strategy
-   to work around this limitation.
-  </para>
-  <para>
-   The default <literal>TTL</literal> can be overruled using the SQL hint
-   <literal>/*qc_tt=seconds*/</literal>. The SQL hint must be appear immediately
-   after the SQL hint which enables caching. It is recommended to use the PHP constant
-   <literal><link linkend="mysqlnd-qc.constants">MYSQLND_QC_TTL_SWITCH</link></literal>
-   instead of using the string value.
-  </para>
-  <para>
-   <example>
-    <title>Setting TTL with SQL hints</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$start = microtime(true);
-
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2)");
-
-printf("Default TTL\t: %d seconds\n", ini_get("mysqlnd_qc.ttl"));
-
-/* Will be cached for 2 seconds */
-$sql = sprintf("/*%s*//*%s%d*/SELECT id FROM test WHERE id = 1", MYSQLND_QC_ENABLE_SWITCH, MYSQLND_QC_TTL_SWITCH, 2);
-$res = $mysqli->query($sql);
-
-var_dump($res->fetch_assoc());
-$res->free();
-
-$mysqli->query("DELETE FROM test WHERE id = 1");
-sleep(1);
-
-/* Cache hit - no automatic invalidation and still valid! */
-$res = $mysqli->query($sql);
-var_dump($res->fetch_assoc());
-$res->free();
-
-sleep(2);
-
-/* Cache miss - cache entry has expired */
-$res = $mysqli->query($sql);
-var_dump($res->fetch_assoc());
-$res->free();
-
-printf("Script runtime\t: %d seconds\n", microtime(true) - $start);
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-Default TTL     : 30 seconds
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-NULL
-Script runtime  : 3 seconds
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.pattern-based-caching" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Pattern based caching</title>
-  <para>
-   An application has three options for telling PECL/mysqlnd_qc whether a particular
-   statement shall be used. The most basic approach is to cache all statements by
-   setting <literal><link linkend="mysqlnd-qc.configuration">
-   mysqlnd_qc.cache_by_default = 1</link></literal>. This approach is often of little
-   practical value. But it enables users to make a quick estimation about
-   the maximum performance gains from caching. An application designed to
-   use a cache may be able to prefix selected statements with the appropriate SQL
-   hints. However, altering an applications source code may not always be possible
-   or desired, for example, to avoid problems with software updates. Therefore,
-   PECL/mysqlnd_qc allows setting a callback which decides if a query is to be
-   cached.
-  </para>
-  <para>
-   The callback is installed with the <function>mysqlnd_qc_set_is_select</function>
-   function. The callback is given the statement string of every statement
-   inspected by the plugin. Then, the callback can decide whether to cache
-   the function. The callback is supposed to return &false;
-   if the statement shall not be cached. A return value of &true;
-   makes the plugin try to add the statement into the cache. The cache entry
-   will be given the default TTL (<literal><link linkend="mysqlnd-qc.configuration">
-   mysqlnd_qc.ttl</link></literal>). If the callback returns
-   a numerical value it is used as the TTL instead of the global default.
-  </para>
-  <para>
-   <example>
-    <title>Setting a callback with <function>mysqlnd_qc_set_is_select</function></title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.collect_statistics=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* callback which decides if query is cached */
-function is_select($query) {
-    static $patterns = array(
-      /* true - use default from mysqlnd_qc.ttl */
-      "@SELECT\s+.*\s+FROM\s+test@ismU" => true,
-      /* 3 - use TTL = 3 seconds */
-      "@SELECT\s+.*\s+FROM\s+news@ismU" => 3
-    );
-
-    /* check if query does match pattern */
-    foreach ($patterns as $pattern => $ttl) {
-        if (preg_match($pattern, $query)) {
-            printf("is_select(%45s): cache\n", $query);
-            return $ttl;
-        }
-    }
-    printf("is_select(%45s): do not cache\n", $query);
-    return false;
-}
-/* install callback */
-mysqlnd_qc_set_is_select("is_select");
-
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2), (3)");
-
-/* cache put */
-$mysqli->query("SELECT id FROM test WHERE id = 1");
-/* cache hit */
-$mysqli->query("SELECT id FROM test WHERE id = 1");
-/* cache put */
-$mysqli->query("SELECT * FROM test");
-
-$stats = mysqlnd_qc_get_core_stats();
-printf("Cache put: %d\n", $stats['cache_put']);
-printf("Cache hit: %d\n", $stats['cache_hit']);
-?>
-]]>
-    </programlisting>
-   &examples.outputs.similar;
-    <screen>
-<![CDATA[
-is_select(                    DROP TABLE IF EXISTS test): do not cache
-is_select(                    CREATE TABLE test(id INT)): do not cache
-is_select(    INSERT INTO test(id) VALUES (1), (2), (3)): do not cache
-is_select(             SELECT id FROM test WHERE id = 1): cache
-is_select(             SELECT id FROM test WHERE id = 1): cache
-is_select(                           SELECT * FROM test): cache
-Cache put: 2
-Cache hit: 1
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   The examples callback tests if a statement string matches a pattern.
-   If this is the case, it either returns &true; to cache
-   the statement using the global default TTL or an alternative TTL.
-  </para>
-  <para>
-   To minimize application changes the callback can put into and registered
-   in an auto prepend file.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.slam-defense" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Slam defense</title>
-  <para>
-   A badly designed cache can do more harm than good. In the worst case a cache
-   can increase database server load instead of minimizing it. An overload situation
-   can occur if a highly shared cache entry expires (cache stampeding).
-  </para>
-  <para>
-   Cache entries are shared and reused to a different degree depending on
-   the storage used. The default storage handler stores cache entries in process memory.
-   Thus, a cache entry can be reused for the life-span of a process. Other PHP
-   processes cannot access it. If Memcache is used, a cache entry can be shared
-   among multiple PHP processes and even among multiple machines, depending on the
-   set up being used.
-  </para>
-  <para>
-   If a highly shared cache entry stored, for example, in Memcache expires, many
-   clients gets a cache miss. Many client requests can no longer be served from
-   the cache but try to run the underlying query on the database server. Until
-   the cache entry is refreshed, more and more clients contact the database server.
-   In the worst case, a total lost of service is the result.
-  </para>
-  <para>
-   The overload can be avoided using a storage handler which limits the reuse of cache
-   entries to few clients. Then, at the average, its likely that only a limited number
-   of clients will try to refresh a cache entry concurrently.
-  </para>
-  <para>
-   Additionally, the built-in slam defense mechanism can and should be used. If
-   slam defense is activated an expired cache entry is given an extended life time.
-   The first client getting a cache miss for the expired cache entry tries to
-   refresh the cache entry within the extended life time. All other clients requesting
-   the cache entry are temporarily served from the cache although the original
-   <literal>TTL</literal> of the cache entry has expired. The other clients will
-   not experience a cache miss before the extended life time is over.
-  </para>
-  <para>
-   <example>
-    <title>Enabling the slam defense mechanism</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.slam_defense=1
-mysqlnd_qc.slam_defense_ttl=1
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The slam defense mechanism is enabled with the PHP configuration directive
-   <link linkend="ini.mysqlnd-qc.slam-defense"><literal>mysqlnd_qc.slam_defense</literal></link>.
-   The extended life time of a cache entry is set with
-   <link linkend="ini.mysqlnd-qc.slam-defense-ttl"><literal>mysqlnd_qc.slam_defense_ttl</literal></link>.
-  </para>
-  <para>
-   The function
-   <function>mysqlnd_qc_get_core_stats</function> returns an array of
-   statistics. The statistics <literal>slam_stale_refresh</literal> and
-   <literal>slam_stale_hit</literal> are incremented if slam defense takes place.
-  </para>
-  <para>
-   It is not possible to give a one-fits-all recommendation on the slam defense
-   configuration. Users are advised to monitor and test their setup and derive
-   settings accordingly.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.cache-candidates" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Finding cache candidates</title>
-  <para>
-   A statement should be considered for caching if it is executed often and has
-   a long run time. Cache candidates are found by creating a list of statements
-   sorted by the product of the number of executions multiplied by the
-   statements run time. The function
-   <function>mysqlnd_qc_get_query_trace_log</function>
-   returns a query log which help with the task.
-  </para>
-  <para>
-   Collecting a query trace is a slow operation. Thus, it is disabled by default.
-   The PHP configuration directive
-   <link linkend="ini.mysqlnd-qc.collect-query-trace"><literal>mysqlnd_qc.collect_query_trace</literal></link>
-   is used to enable it. The functions trace contains one entry for every
-   query issued before the function is called.
-  </para>
-  <para>
-   <example>
-    <title>Collecting a query trace</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.collect_query_trace=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* connect to MySQL */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-
-/* dummy queries to fill the query trace */
-for ($i = 0; $i < 2; $i++) {
-    $res = $mysqli->query("SELECT 1 AS _one FROM DUAL");
-    $res->free();
-}
-
-/* dump trace */
-var_dump(mysqlnd_qc_get_query_trace_log());
-?>
-]]>
-    </programlisting>
-    &examples.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(8) {
-    ["query"]=>
-    string(26) "SELECT 1 AS _one FROM DUAL"
-    ["origin"]=>
-    string(102) "#0 qc.php(7): mysqli->query('SELECT 1 AS _on...')
-#1 {main}"
-    ["run_time"]=>
-    int(0)
-    ["store_time"]=>
-    int(25)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-  [1]=>
-  array(8) {
-    ["query"]=>
-    string(26) "SELECT 1 AS _one FROM DUAL"
-    ["origin"]=>
-    string(102) "#0 qc.php(7): mysqli->query('SELECT 1 AS _on...')
-#1 {main}"
-    ["run_time"]=>
-    int(0)
-    ["store_time"]=>
-    int(8)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["no_table"]=>
-    bool(false)
-    ["was_added"]=>
-    bool(false)
-    ["was_already_in_cache"]=>
-    bool(false)
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   Assorted information is given in the trace. Among them
-   timings and the origin of the query call. The origin property
-   holds a code backtrace to identify the source of the query.
-   The depth of the backtrace can be limited with
-   the PHP configuration directive
-   <link linkend="ini.mysqlnd-qc.query-trace-bt-depth"><literal>mysqlnd_qc.query_trace_bt_depth</literal></link>.
-   The default depth is <literal>3</literal>.
-  </para>
-  <para>
-   <example>
-    <title>Setting the backtrace depth with the <literal>mysqlnd_qc.query_trace_bt_depth</literal> ini setting</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.collect_query_trace=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* connect to MySQL */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2), (3)");
-
-/* dummy queries to fill the query trace */
-for ($i = 0; $i < 3; $i++) {
-    $res = $mysqli->query("SELECT id FROM test WHERE id = " . $mysqli->real_escape_string($i));
-    $res->free();
-}
-
-$trace = mysqlnd_qc_get_query_trace_log();
-$summary = array();
-foreach ($trace as $entry) {
-    if (!isset($summary[$entry['query']])) {
-        $summary[$entry['query']] = array(
-            "executions" => 1,
-            "time"       => $entry['run_time'] + $entry['store_time'],
-        );
-    } else {
-        $summary[$entry['query']]['executions']++;
-        $summary[$entry['query']]['time'] += $entry['run_time'] + $entry['store_time'];
-    }
-}
-
-foreach ($summary as $query => $details) {
-    printf("%45s: %5dms (%dx)\n",
-    $query, $details['time'], $details['executions']);
-}
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-                    DROP TABLE IF EXISTS test:     0ms (1x)
-                    CREATE TABLE test(id INT):     0ms (1x)
-    INSERT INTO test(id) VALUES (1), (2), (3):     0ms (1x)
-             SELECT id FROM test WHERE id = 0:    25ms (1x)
-             SELECT id FROM test WHERE id = 1:    10ms (1x)
-             SELECT id FROM test WHERE id = 2:     9ms (1x)
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.cache-efficiency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Measuring cache efficiency</title>
-  <para>
-   PECL/mysqlnd_qc offers three ways to measure the cache efficiency.
-   The function
-   <function>mysqlnd_qc_get_normalized_query_trace_log</function>
-   returns statistics aggregated by the normalized query string,
-   <function>mysqlnd_qc_get_cache_info</function>
-   gives storage handler specific information which includes a list
-   of all cached items, depending on the storage handler. Additionally, the
-   core of PECL/mysqlnd_qc collects high-level summary statistics aggregated
-   per PHP process. The high-level statistics are returned by
-   <function>mysqlnd_qc_get_core_stats</function>.
-  </para>
-  <para>
-   The functions
-   <function>mysqlnd_qc_get_normalized_query_trace_log</function>
-   and
-   <function>mysqlnd_qc_get_core_stats</function>
-   will not collect data unless data collection has been
-   enabled through their corresponding PHP configuration directives. Data collection
-   is disabled by default for performance considerations. It is configurable with the
-   <link linkend="ini.mysqlnd-qc.time-statistics">mysqlnd_qc.time_statistics</link> 
-   option, which determines if timing information should be collected.
-   Collection of time statistics is enabled by default
-   but only performed if data collection as such has been enabled.
-   Recording time statistics causes extra system calls. In most cases,
-   the benefit of the monitoring outweighs any potential performance penalty of
-   the additional system calls.
-  </para>
-  <para>
-   <example>
-    <title>Collecting statistics data with the <literal>mysqlnd_qc.time_statistics</literal> ini setting</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.collect_statistics=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* connect to MySQL */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2), (3)");
-
-/* dummy queries */
-for ($i = 1; $i <= 4; $i++) {
-    $query = sprintf("/*%s*/SELECT id FROM test WHERE id = %d", MYSQLND_QC_ENABLE_SWITCH, $i % 2);
-    $res   = $mysqli->query($query);
-    
-    $res->free();
-}
-
-var_dump(mysqlnd_qc_get_core_stats());
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-array(26) {
-  ["cache_hit"]=>
-  string(1) "2"
-  ["cache_miss"]=>
-  string(1) "2"
-  ["cache_put"]=>
-  string(1) "2"
-  ["query_should_cache"]=>
-  string(1) "4"
-  ["query_should_not_cache"]=>
-  string(1) "3"
-  ["query_not_cached"]=>
-  string(1) "3"
-  ["query_could_cache"]=>
-  string(1) "4"
-  ["query_found_in_cache"]=>
-  string(1) "2"
-  ["query_uncached_other"]=>
-  string(1) "0"
-  ["query_uncached_no_table"]=>
-  string(1) "0"
-  ["query_uncached_no_result"]=>
-  string(1) "0"
-  ["query_uncached_use_result"]=>
-  string(1) "0"
-  ["query_aggr_run_time_cache_hit"]=>
-  string(2) "28"
-  ["query_aggr_run_time_cache_put"]=>
-  string(3) "900"
-  ["query_aggr_run_time_total"]=>
-  string(3) "928"
-  ["query_aggr_store_time_cache_hit"]=>
-  string(2) "14"
-  ["query_aggr_store_time_cache_put"]=>
-  string(2) "40"
-  ["query_aggr_store_time_total"]=>
-  string(2) "54"
-  ["receive_bytes_recorded"]=>
-  string(3) "136"
-  ["receive_bytes_replayed"]=>
-  string(3) "136"
-  ["send_bytes_recorded"]=>
-  string(2) "84"
-  ["send_bytes_replayed"]=>
-  string(2) "84"
-  ["slam_stale_refresh"]=>
-  string(1) "0"
-  ["slam_stale_hit"]=>
-  string(1) "0"
-  ["request_counter"]=>
-  int(1)
-  ["process_hash"]=>
-  int(1929695233)
-}
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   For a quick overview, call
-   <function>mysqlnd_qc_get_core_stats</function>. It delivers
-   cache usage, cache timing and traffic related statistics. Values are aggregated
-   on a per process basis for all queries issued by any PHP MySQL API call.
-  </para>
-  <para>
-   Some storage handler, such as the default handler, can report cache entries,
-   statistics related to the entries and meta data for the underlying query through the
-   <function>mysqlnd_qc_get_cache_info</function>
-   function.  Please note, that the information returned depends
-   on the storage handler. Values are aggregated on a per process basis.
-  </para>
-  <para>
-   <example>
-    <title>Example <function>mysqlnd_qc_get_cache_info</function> usage</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* connect to MySQL */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2), (3)");
-
-/* dummy queries to fill the query trace */
-for ($i = 1; $i <= 4; $i++) {
-    $query = sprintf("/*%s*/SELECT id FROM test WHERE id = %d", MYSQLND_QC_ENABLE_SWITCH, $i % 2);
-    $res   = $mysqli->query($query);
-  
-    $res->free();
-}
-
-var_dump(mysqlnd_qc_get_cache_info());
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-array(4) {
-  ["num_entries"]=>
-  int(2)
-  ["handler"]=>
-  string(7) "default"
-  ["handler_version"]=>
-  string(5) "1.0.0"
-  ["data"]=>
-  array(2) {
-    ["Localhost via UNIX socket
-3306
-root
-test|/*qc=on*/SELECT id FROM test WHERE id = 1"]=>
-    array(2) {
-      ["statistics"]=>
-      array(11) {
-        ["rows"]=>
-        int(1)
-        ["stored_size"]=>
-        int(71)
-        ["cache_hits"]=>
-        int(1)
-        ["run_time"]=>
-        int(391)
-        ["store_time"]=>
-        int(27)
-        ["min_run_time"]=>
-        int(16)
-        ["max_run_time"]=>
-        int(16)
-        ["min_store_time"]=>
-        int(8)
-        ["max_store_time"]=>
-        int(8)
-        ["avg_run_time"]=>
-        int(8)
-        ["avg_store_time"]=>
-        int(4)
-      }
-      ["metadata"]=>
-      array(1) {
-        [0]=>
-        array(8) {
-          ["name"]=>
-          string(2) "id"
-          ["orig_name"]=>
-          string(2) "id"
-          ["table"]=>
-          string(4) "test"
-          ["orig_table"]=>
-          string(4) "test"
-          ["db"]=>
-          string(4) "test"
-          ["max_length"]=>
-          int(1)
-          ["length"]=>
-          int(11)
-          ["type"]=>
-          int(3)
-        }
-      }
-    }
-    ["Localhost via UNIX socket
-3306
-root
-test|/*qc=on*/SELECT id FROM test WHERE id = 0"]=>
-    array(2) {
-      ["statistics"]=>
-      array(11) {
-        ["rows"]=>
-        int(0)
-        ["stored_size"]=>
-        int(65)
-        ["cache_hits"]=>
-        int(1)
-        ["run_time"]=>
-        int(299)
-        ["store_time"]=>
-        int(13)
-        ["min_run_time"]=>
-        int(11)
-        ["max_run_time"]=>
-        int(11)
-        ["min_store_time"]=>
-        int(6)
-        ["max_store_time"]=>
-        int(6)
-        ["avg_run_time"]=>
-        int(5)
-        ["avg_store_time"]=>
-        int(3)
-      }
-      ["metadata"]=>
-      array(1) {
-        [0]=>
-        array(8) {
-          ["name"]=>
-          string(2) "id"
-          ["orig_name"]=>
-          string(2) "id"
-          ["table"]=>
-          string(4) "test"
-          ["orig_table"]=>
-          string(4) "test"
-          ["db"]=>
-          string(4) "test"
-          ["max_length"]=>
-          int(0)
-          ["length"]=>
-          int(11)
-          ["type"]=>
-          int(3)
-        }
-      }
-    }
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   It is possible to further break down the granularity of statistics
-   to the level of the normalized statement string.
-   The normalized statement string is the statements string with all parameters
-   replaced with question marks. For example, the two statements
-   <literal>SELECT id FROM test WHERE id = 0</literal> and
-   <literal>SELECT id FROM test WHERE id = 1</literal> are normalized into
-   <literal>SELECT id FROM test WHERE id = ?</literal>. Their both
-   statistics are aggregated into one entry for
-   <literal>SELECT id FROM test WHERE id = ?</literal>.
-  </para>
-  <para>
-   <example>
-    <title>Example <function>mysqlnd_qc_get_normalized_query_trace_log</function> usage</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_qc.enable_qc=1
-mysqlnd_qc.collect_normalized_query_trace=1
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* connect to MySQL */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2), (3)");
-
-/* dummy queries to fill the query trace */
-for ($i = 1; $i <= 4; $i++) {
-    $query = sprintf("/*%s*/SELECT id FROM test WHERE id = %d", MYSQLND_QC_ENABLE_SWITCH, $i % 2);
-    $res   = $mysqli->query($query);
-  
-    $res->free();
-}
-
-var_dump(mysqlnd_qc_get_normalized_query_trace_log());
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  array(9) {
-    ["query"]=>
-    string(25) "DROP TABLE IF EXISTS test"
-    ["occurences"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["avg_run_time"]=>
-    int(0)
-    ["min_run_time"]=>
-    int(0)
-    ["max_run_time"]=>
-    int(0)
-    ["avg_store_time"]=>
-    int(0)
-    ["min_store_time"]=>
-    int(0)
-    ["max_store_time"]=>
-    int(0)
-  }
-  [1]=>
-  array(9) {
-    ["query"]=>
-    string(27) "CREATE TABLE test (id INT )"
-    ["occurences"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["avg_run_time"]=>
-    int(0)
-    ["min_run_time"]=>
-    int(0)
-    ["max_run_time"]=>
-    int(0)
-    ["avg_store_time"]=>
-    int(0)
-    ["min_store_time"]=>
-    int(0)
-    ["max_store_time"]=>
-    int(0)
-  }
-  [2]=>
-  array(9) {
-    ["query"]=>
-    string(46) "INSERT INTO test (id ) VALUES (? ), (? ), (? )"
-    ["occurences"]=>
-    int(0)
-    ["eligible_for_caching"]=>
-    bool(false)
-    ["avg_run_time"]=>
-    int(0)
-    ["min_run_time"]=>
-    int(0)
-    ["max_run_time"]=>
-    int(0)
-    ["avg_store_time"]=>
-    int(0)
-    ["min_store_time"]=>
-    int(0)
-    ["max_store_time"]=>
-    int(0)
-  }
-  [3]=>
-  array(9) {
-    ["query"]=>
-    string(31) "SELECT id FROM test WHERE id =?"
-    ["occurences"]=>
-    int(4)
-    ["eligible_for_caching"]=>
-    bool(true)
-    ["avg_run_time"]=>
-    int(179)
-    ["min_run_time"]=>
-    int(11)
-    ["max_run_time"]=>
-    int(393)
-    ["avg_store_time"]=>
-    int(12)
-    ["min_store_time"]=>
-    int(7)
-    ["max_store_time"]=>
-    int(25)
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   The source distribution of PECL/mysqlnd_qc contains a directory
-   <literal>web/</literal> in which web based monitoring
-   scripts can be found which give an example how to write a cache monitor.
-   Please, follow the instructions given in the source.
-  </para>
-  <para>
-   Since PECL/mysqlnd_qc 1.1.0 it is possible to write statistics into a
-   log file. Please, see <literal><link linkend="ini.mysqlnd-qc.collect-statistics-log-file">
-   mysqlnd_qc.collect_statistics_log_file</link></literal>.
-  </para>
- </section>
-
- <section xml:id="mysqlnd-qc.set-user-handlers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Beyond TTL: user-defined storage</title>
-  <para>
-   The query cache plugin supports the use of user-defined storage handler.
-   User-defined storage handler can use arbitrarily complex invalidation
-   algorithms and support arbitrary storage media.
-  </para>
-  <para>
-   All user-defined storage handlers have to provide a certain interface.
-   The functions of the user-defined storage handler will be called by the
-   core of the cache plugin. The necessary interface consists of seven
-   public functions. Both procedural and object oriented user-defined storage
-   handler must implement the same set of functions.
-  </para>
-  <para>
-   <example>
-    <title>Using a user-defined storage handler</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Enable default caching of all statements */
-ini_set("mysqlnd_qc.cache_by_default", 1);
-
-/* Procedural user defined storage handler functions */
-
-$__cache = array();
-
-function get_hash($host_info, $port, $user, $db, $query) {
-    global $__cache;
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-
-    return md5(sprintf("%s%s%s%s%s", $host_info, $port, $user, $db, $query));
-}
-
-function find_query_in_cache($key) {
-    global $__cache;
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-
-    if (isset($__cache[$key])) {
-        $tmp = $__cache[$key];
-        if ($tmp["valid_until"] < time()) {
-            unset($__cache[$key]);
-            $ret = NULL;
-        } else {
-            $ret = $__cache[$key]["data"];
-        }
-    } else {
-        $ret = NULL;
-    }
-
-    return $ret;
-}
-
-function return_to_cache($key) {
-    /*
-     Called on cache hit after cached data has been processed,
-     may be used for reference counting
-    */
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-}
-
-function add_query_to_cache_if_not_exists($key, $data, $ttl, $run_time, $store_time, $row_count) {
-    global $__cache;
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-
-    $__cache[$key] = array(
-        "data"               => $data,
-        "row_count"          => $row_count,
-        "valid_until"        => time() + $ttl,
-        "hits"               => 0,
-        "run_time"           => $run_time,
-        "store_time"         => $store_time,
-        "cached_run_times"   => array(),
-        "cached_store_times" => array(),
-    );
-
-    return TRUE;
-}
-
-function query_is_select($query) {
-    printf("\t%s('%s'): ", __FUNCTION__, $query);
-
-    $ret = FALSE;
-    if (stristr($query, "SELECT") !== FALSE) {
-        /* cache for 5 seconds */
-        $ret = 5;
-    }
-
-    printf("%s\n", (FALSE === $ret) ? "FALSE" : $ret);
-    return $ret;
-}
-
-function update_query_run_time_stats($key, $run_time, $store_time) {
-    global $__cache;
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-
-    if (isset($__cache[$key])) {
-        $__cache[$key]['hits']++;
-        $__cache[$key]["cached_run_times"][] = $run_time;
-        $__cache[$key]["cached_store_times"][] = $store_time;
-    }
-}
-
-function get_stats($key = NULL) {
-    global $__cache;
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-
-    if ($key && isset($__cache[$key])) {
-        $stats = $__cache[$key];
-    } else {
-        $stats = array();
-        foreach ($__cache as $key => $details) {
-            $stats[$key] = array(
-               'hits'              => $details['hits'],
-               'bytes'             => strlen($details['data']),
-               'uncached_run_time' => $details['run_time'],
-               'cached_run_time'   => (count($details['cached_run_times']))
-                                      ? array_sum($details['cached_run_times']) / count($details['cached_run_times'])
-                                      : 0,
-            );
-        }
-    }
-
-    return $stats;
-}
-
-function clear_cache() {
-    global $__cache;
-    printf("\t%s(%d)\n", __FUNCTION__, func_num_args());
-
-    $__cache = array();
-    return TRUE;
-}
-
-/* Install procedural user-defined storage handler */
-if (!mysqlnd_qc_set_user_handlers("get_hash", "find_query_in_cache",
-    "return_to_cache", "add_query_to_cache_if_not_exists",
-    "query_is_select", "update_query_run_time_stats", "get_stats", "clear_cache")) {
-  
-        printf("Failed to install user-defined storage handler\n");
-}
-
-
-/* Connect, create and populate test table */
-$mysqli = new mysqli("host", "user", "password", "schema", "port", "socket");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1), (2)");
-
-printf("\nCache put/cache miss\n");
-
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-
-/* Delete record to verify we get our data from the cache */
-$mysqli->query("DELETE FROM test WHERE id = 1");
-
-printf("\nCache hit\n");
-
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-
-printf("\nDisplay cache statistics\n");
-var_dump(mysqlnd_qc_get_cache_info());
-
-printf("\nFlushing cache, cache put/cache miss");
-var_dump(mysqlnd_qc_clear_cache());
-
-$res = $mysqli->query("SELECT id FROM test WHERE id = 1");
-var_dump($res->fetch_assoc());
-$res->free();
-?>
-]]>
-    </programlisting>
-    &examples.outputs.similar;
-    <screen>
-<![CDATA[
-        query_is_select('DROP TABLE IF EXISTS test'): FALSE
-        query_is_select('CREATE TABLE test(id INT)'): FALSE
-        query_is_select('INSERT INTO test(id) VALUES (1), (2)'): FALSE
-
-Cache put/cache miss
-        query_is_select('SELECT id FROM test WHERE id = 1'): 5
-        get_hash(5)
-        find_query_in_cache(1)
-        add_query_to_cache_if_not_exists(6)
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-        query_is_select('DELETE FROM test WHERE id = 1'): FALSE
-
-Cache hit
-        query_is_select('SELECT id FROM test WHERE id = 1'): 5
-        get_hash(5)
-        find_query_in_cache(1)
-        return_to_cache(1)
-        update_query_run_time_stats(3)
-array(1) {
-  ["id"]=>
-  string(1) "1"
-}
-
-Display cache statistics
-        get_stats(0)
-array(4) {
-  ["num_entries"]=>
-  int(1)
-  ["handler"]=>
-  string(4) "user"
-  ["handler_version"]=>
-  string(5) "1.0.0"
-  ["data"]=>
-  array(1) {
-    ["18683c177dc89bb352b29965d112fdaa"]=>
-    array(4) {
-      ["hits"]=>
-      int(1)
-      ["bytes"]=>
-      int(71)
-      ["uncached_run_time"]=>
-      int(398)
-      ["cached_run_time"]=>
-      int(4)
-    }
-  }
-}
-
-Flushing cache, cache put/cache miss    clear_cache(0)
-bool(true)
-        query_is_select('SELECT id FROM test WHERE id = 1'): 5
-        get_hash(5)
-        find_query_in_cache(1)
-        add_query_to_cache_if_not_exists(6)
-NULL
-
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/reference.xml b/reference/mysqlnd_qc/reference.xml
deleted file mode 100644
index 559f8e9554..0000000000
--- a/reference/mysqlnd_qc/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mysqlnd-qc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>mysqlnd_qc &Functions;</title>
-
- &reference.mysqlnd-qc.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/setup.xml b/reference/mysqlnd_qc/setup.xml
deleted file mode 100644
index 897945f995..0000000000
--- a/reference/mysqlnd_qc/setup.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-qc.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mysqlnd-qc.requirements">
-  &reftitle.required;
-  <para>
-   <literal>PHP 5.3.3</literal> or a newer version of <literal>PHP</literal>.
-  </para>
-  <para>
-   PECL/mysqlnd_qc is a mysqlnd plugin. It plugs into the mysqlnd library.
-   To use you this plugin with a PHP MySQL extension, the extension (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>, or <link linkend="ref.pdo-mysql">PDO_MYSQL</link>)
-   must enable the mysqlnd library.
-  </para>
-  <para>
-   For using
-   <literal>MEMCACHE</literal> storage handler:
-   Use <literal>libmemcache 0.38</literal> or newer.
-   PECL/mysqlnd_qc 1.2 has been tested with <literal>libmemcache 1.4.0</literal>.
-  </para>
-  <para>
-   For using
-   <literal>sqlite</literal> storage handler:
-   Use the <link linkend="book.sqlite3">sqlite3</link> extension that 
-   bundled with PHP.
-  </para>
- </section>
-
- &reference.mysqlnd-qc.configure;
- &reference.mysqlnd-qc.ini;
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_qc/versions.xml b/reference/mysqlnd_qc/versions.xml
deleted file mode 100644
index d2fede2565..0000000000
--- a/reference/mysqlnd_qc/versions.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
- <!-- Functions -->
- <function name='mysqlnd_qc_clear_cache' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_get_available_handlers' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_get_cache_info' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_get_core_stats' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_get_normalized_query_trace_log' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_get_query_trace_log' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_set_is_select' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_set_storage_handler' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_set_user_handlers' from='PECL mysqlnd_qc &gt;= 1.0.0'/>
- <function name='mysqlnd_qc_set_cache_condition' from='PECL mysqlnd_qc &gt;= 1.1.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/book.xml b/reference/mysqlnd_uh/book.xml
deleted file mode 100644
index cf43ea2fd4..0000000000
--- a/reference/mysqlnd_uh/book.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mysqlnd-uh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd user handler plugin</title>
- <titleabbrev>mysqlnd_uh</titleabbrev>
-
- <preface xml:id="intro.mysqlnd-uh">
-  &reftitle.intro;
-  <para>
-   The mysqlnd user handler plugin (<literal>mysqlnd_uh</literal>)
-   allows users to set hooks for most internal calls of the
-   MySQL native driver for PHP
-   (<literal><link linkend="book.mysqlnd">mysqlnd</link></literal>).
-   Mysqlnd and its plugins, including PECL/mysqlnd_uh, operate on a layer
-   beneath the PHP MySQL extensions. A mysqlnd plugin can be considered
-   as a proxy between the PHP MySQL extensions and the MySQL server
-   as part of the PHP executable on the client-side. Because the plugins
-   operates on their own layer below the PHP MySQL extensions,
-   they can monitor and change application actions without requiring
-   application changes. If the
-   PHP MySQL extensions (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>) are compiled to
-   use <literal>mysqlnd</literal> this can be used for:
-   <itemizedlist>
-    <listitem>
-     <para>
-      Monitoring
-     </para>
-     <para>
-      <itemizedlist>
-       <listitem>
-        <para>
-         Queries executed by any of the PHP MySQL extensions
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         Prepared statements executing by any of the PHP MySQL extensions
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Auditing
-     </para>
-     <para>
-      <itemizedlist>
-       <listitem>
-        <para>
-         Detection of database usage
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         SQL injection protection using black and white lists
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Assorted
-     </para>
-     <para>
-      <itemizedlist>
-       <listitem>
-        <para>
-         Load Balancing connections
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   The MySQL native driver for PHP (<link linkend="book.mysqlnd">mysqlnd</link>)
-   features an internal plugin C API. C plugins, such as the mysqlnd
-   user handler plugin, can extend the functionality of
-   <link linkend="book.mysqlnd">mysqlnd</link>. PECL/mysqlnd_uh
-   makes parts of the internal plugin C API available to the
-   PHP user for plugin development with PHP.
-  </para>
-  <note>
-   <title>Status</title>
-   <para>
-    The mysqlnd user handler plugin is in alpha status.
-    Take appropriate care before using it in production environments.
-   </para>
-  </note>
-
-  <section xml:id="mysqlnd-uh.security">
-   <title>Security considerations</title>
-   <para>
-    PECL/mysqlnd_uh gives users access to MySQL user names, MySQL password
-    used by any of the PHP MySQL extensions to connect to MySQL.
-    It allows monitoring of all queries and prepared statements exposing
-    the statement string to the user. Therefore, the extension should be
-    installed with care. The <literal>PHP_INI_SYSTEM</literal> configuration setting
-    <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-    can be used to prevent users from hooking mysqlnd calls.
-   </para>
-   <para>
-    Code obfuscators and similar technologies are not suitable to prevent
-    monitoring of mysqlnd library activities if PECL/mysqlnd_uh is made
-    available and the user can install a proxy, for example,
-    using <link linkend="ini.auto-prepend-file">auto_prepend_file</link>.
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-uh.docs-note">
-   <title>Documentation note</title>
-   <para>
-    Many of the mysqlnd_uh functions are briefly described because
-    the <link linkend="ref.mysqli">mysqli</link> extension is
-    a thin abstraction layer on top of the MySQL C API that
-    the <literal>mysqlnd</literal> library provides. Therefore,
-    the corresponding <link linkend="ref.mysqli">mysqli</link> documentation
-    (along with the MySQL reference manual) can be consulted
-    to receive more information about a particular function.
-   </para>
-  </section>
-
-  <section xml:id="mysqlnd-uh.name">
-   <title>On the name</title>
-   <para>
-    The shortcut <literal>mysqlnd_uh</literal> stands for
-    <literal>mysqlnd user handler</literal>, and has been the name
-    since early development.
-   </para>
-  </section>
- </preface>
-
- &reference.mysqlnd-uh.quickstart;
- &reference.mysqlnd-uh.setup;
- &reference.mysqlnd-uh.constants;
- &reference.mysqlnd-uh.mysqlnduhconnection;
- &reference.mysqlnd-uh.mysqlnduhpreparedstatement;
- &reference.mysqlnd-uh.reference;
- &reference.mysqlnd-uh.changes;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/changes.xml b/reference/mysqlnd_uh/changes.xml
deleted file mode 100644
index 8e83f8b471..0000000000
--- a/reference/mysqlnd_uh/changes.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-uh.changes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title xmlns="http://docbook.org/ns/docbook">Change History</title>
- <para>
-  The Change History lists major changes users need to be aware if upgrading
-  from one version to another. It is a high level summary of selected changes
-  that may impact applications or might even break backwards compatibility.
-  See also the <filename>CHANGES</filename> file contained in the source
-  for additional changelog information. The commit history is also available.
- </para>
-
- <section xml:id="mysqlnd-uh.changes-one-o">
-  <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_uh 1.0 series</title>
-  <para>
-   1.0.1-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: TBD
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: bug fix release
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   Feature changes
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Support of PHP 5.4.0 or later.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      BC break: <methodname>MysqlndUhConnection::changeUser</methodname> requires
-      additional <literal>passwd_len</literal> parameter.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      BC break: <constant>MYSQLND_UH_VERSION_STR</constant> renamed to <constant>MYSQLND_UH_VERSION</constant>.
-      <constant>MYSQLND_UH_VERSION</constant> renamed to <constant>MYSQLND_UH_VERSION_ID</constant>.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      BC break: <literal>mysqlnd_uh.enabled</literal> configuration setting renamed to <literal>mysqlnd_uh.enable</literal>.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <para>
-   1.0.0-alpha
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      Release date: 08/2010
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      Motto/theme: Initial release
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/configure.xml b/reference/mysqlnd_uh/configure.xml
deleted file mode 100644
index 2aa4e4d374..0000000000
--- a/reference/mysqlnd_uh/configure.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-uh.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mysqlnd-uh">&url.pecl.package;mysqlnd-uh</link>
- </para>
- <para>
-  PECL/mysqlnd_uh is currently not available on Windows.
-  The source code of the extension makes use of <literal>C99</literal>
-  constructs not allowed with PHP Windows builds.
- </para>
-
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/constants.xml b/reference/mysqlnd_uh/constants.xml
deleted file mode 100644
index 58d17e3fe5..0000000000
--- a/reference/mysqlnd_uh/constants.xml
+++ /dev/null
@@ -1,1095 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mysqlnd-uh.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
-  Most of the constants refer to details of the MySQL Client Server Protocol.
-  Please, refer to the MySQL reference manual to learn about their meaning.
-  To avoid content duplication, only short descriptions are given.
- </para>
- <para>
-  <emphasis role="bold"><methodname>MysqlndUhConnection::simpleCommand</methodname> related</emphasis>
- </para>
- <para>
-  The following constants can be used to detect what command is to be send
-  through <methodname>MysqlndUhConnection::simpleCommand</methodname>.
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-sleep">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_SLEEP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_SLEEP.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-quit">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_QUIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_QUIT.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-init-db">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_INIT_DB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_INIT_DB.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-query">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_QUERY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_QUERY.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-field-list">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_FIELD_LIST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_FIELD_LIST.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-create-db">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_CREATE_DB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_CREATE_DB.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-drop-db">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_DROP_DB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_DROP_DB.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-refresh">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_REFRESH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_REFRESH.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-shutdown">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_SHUTDOWN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_SHUTDOWN.
-     </simpara>
-    </listitem>
-   </varlistentry>
-    <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-statistics">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STATISTICS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STATISTICS.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-process-info">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_PROCESS_INFO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_PROCESS_INFO.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-connect">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_CONNECT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_CONNECT.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-process-kill">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_PROCESS_KILL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_PROCESS_KILL.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-debug">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_DEBUG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_DEBUG.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-ping">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_PING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_PING.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-time">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_TIME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_TIME.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-delayed-insert">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_DELAYED_INSERT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_DELAYED_INSERT.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-change-user">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_CHANGE_USER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_CHANGE_USER.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-binlog-dump">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_BINLOG_DUMP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_BINLOG_DUMP.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-table-dump">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_TABLE_DUMP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_TABLE_DUMP.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-connect-out">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_CONNECT_OUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_CONNECT_OUT.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-register-slaved">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_REGISTER_SLAVED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_REGISTER_SLAVED.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-stmt-prepare">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STMT_PREPARE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STMT_PREPARE.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-stmt-execute">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STMT_EXECUTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STMT_EXECUTE.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-stmt-send-long-data">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STMT_SEND_LONG_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STMT_SEND_LONG_DATA.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-stmt-close">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STMT_CLOSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STMT_CLOSE.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-stmt-reset">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STMT_RESET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STMT_RESET.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-set-option">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_SET_OPTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_SET_OPTION.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-stmt-fetch">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_STMT_FETCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_STMT_FETCH.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-daemon">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_DAEMON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_DAEMON.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-com-end">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_COM_END</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol command: COM_END.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
- <para>
-  The following constants can be used to analyze the <literal>ok_packet</literal>
-  argument of <methodname>MysqlndUhConnection::simpleCommand</methodname>.
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-greet-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_GREET_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: greeting.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-auth-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_AUTH_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: authentication.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-ok-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_OK_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: OK.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-eof-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_EOF_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: EOF.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-cmd-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_CMD_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: command.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-rset-header-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_RSET_HEADER_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: result set header.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-rset-fld-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_RSET_FLD_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: resultset field.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-row-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_ROW_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: row.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-stats-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_STATS_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: stats.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prepare-resp-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PREPARE_RESP_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: prepare response.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-chg-user-resp-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_CHG_USER_RESP_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MySQL Client Server protocol packet: change user response.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-prot-last">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_PROT_LAST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      No practical meaning. Last entry marker of internal C data structure list.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <emphasis role="bold"><methodname>MysqlndUhConnection::close</methodname> related</emphasis>
- </para>
- <para>
-  The following constants can be used to detect why a connection has been
-  closed through <literal>MysqlndUhConnection::close()</literal>.
- </para>
- <para>
-  <variablelist>
-    <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-close-explicit">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_CLOSE_EXPLICIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      User has called mysqlnd to close the connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-close-implicit">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_CLOSE_IMPLICIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Implicitly closed, for example, during garbage connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-close-disconnected">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_CLOSE_DISCONNECTED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Connection error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-close-last">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_CLOSE_LAST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      No practical meaning. Last entry marker of internal C data structure list.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <emphasis role="bold">MysqlndUhConnection::setServerOption() related</emphasis>
- </para>
- <para>
-  The following constants can be used to detect which option is set through
-  <literal>MysqlndUhConnection::setServerOption()</literal>.
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-uh-server-option-multi-statements-on">
-    <term>
-     <constant>MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_ON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: enables multi statement support.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-server-option-multi-statements-off">
-    <term>
-     <constant>MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_OFF</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: disables multi statement support.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <emphasis role="bold"><methodname>MysqlndUhConnection::setClientOption</methodname> related</emphasis>
- </para>
- <para>
-  The following constants can be used to detect which option is set through
-  <methodname>MysqlndUhConnection::setClientOption</methodname>.
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-option-opt-connect-timeout">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPTION_OPT_CONNECT_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: connection timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-option-opt-compress">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPTION_OPT_COMPRESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: whether the MySQL compressed protocol is to be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-option-opt-named-pipe">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPTION_OPT_NAMED_PIPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: named pipe to use for connection (Windows).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-option-init-command">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPTION_INIT_COMMAND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: init command to execute upon connect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-read-default-file">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_READ_DEFAULT_FILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: MySQL server default file to read upon connect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-read-default-group">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_READ_DEFAULT_GROUP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: MySQL server default file group to read upon connect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-set-charset-dir">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_SET_CHARSET_DIR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: charset description files directory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-set-charset-name">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_SET_CHARSET_NAME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: charset name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-local-infile">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_LOCAL_INFILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: Whether to allow <literal>LOAD DATA LOCAL INFILE</literal> use.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-protocol">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: supported protocol version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-shared-memory-base-name">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_SHARED_MEMORY_BASE_NAME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: shared memory base name for shared memory connections.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-read-timeout">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_READ_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: connection read timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-write-timeout">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_WRITE_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: connection write timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-use-result">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_USE_RESULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: unbuffered result sets.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-use-remote-connection">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_USE_REMOTE_CONNECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Embedded server related.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-use-embedded-connection">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_USE_EMBEDDED_CONNECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Embedded server related.
-     </simpara>
-    </listitem>
-   </varlistentry>
-      <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-guess-connection">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_GUESS_CONNECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TODO
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-set-client-ip">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_SET_CLIENT_IP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-       TODO
-     </simpara>
-    </listitem>
-   </varlistentry>
-  <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-secure-auth">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_SECURE_AUTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TODO
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-report-data-truncation">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_REPORT_DATA_TRUNCATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: Whether to report data truncation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-reconnect">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_RECONNECT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: Whether to reconnect automatically.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-verify-server-cert">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_VERIFY_SERVER_CERT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: TODO
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-net-cmd-buffer-size">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_NET_CMD_BUFFER_SIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: mysqlnd network buffer size for commands.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-net-read-buffer-size">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_NET_READ_BUFFER_SIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: mysqlnd network buffer size for reading from the server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-key">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_KEY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: SSL key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-cert">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_CERT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: SSL certificate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-ca">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_CA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: SSL CA.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-capath">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_CAPATH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: Path to SSL CA.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-cipher">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_CIPHER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: SSL cipher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-ssl-passphrase">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_SSL_PASSPHRASE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: SSL passphrase.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-server-option-plugin-dir">
-    <term>
-     <constant>MYSQLND_UH_SERVER_OPTION_PLUGIN_DIR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: server plugin directory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-server-option-default-auth">
-    <term>
-     <constant>MYSQLND_UH_SERVER_OPTION_DEFAULT_AUTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: default authentication method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-server-option-set-client-ip">
-    <term>
-     <constant>MYSQLND_UH_SERVER_OPTION_SET_CLIENT_IP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-       TODO
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-max-allowed-packet">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_MAX_ALLOWED_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: maximum allowed packet size. Available as of <literal>PHP 5.4.0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-auth-protocol">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_AUTH_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: TODO. Available as of <literal>PHP 5.4.0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-mysqlnd-opt-int-and-float-native">
-    <term>
-     <constant>MYSQLND_UH_MYSQLND_OPT_INT_AND_FLOAT_NATIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Option: make mysqlnd return integer and float columns as long even
-      when using the MySQL Client Server text protocol. Only
-      available with a custom build of mysqlnd.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  <emphasis role="bold">Other</emphasis>
- </para>
- <para>
-  The plugins version number can be obtained using
-  <constant>MYSQLND_UH_VERSION</constant> or
-  <constant>MYSQLND_UH_VERSION_ID</constant>.
-  <constant>MYSQLND_UH_VERSION</constant>
-  is the string representation of the numerical version number
-  <constant>MYSQLND_UH_VERSION_ID</constant>, which is an integer such as 10000.
-  Developers can calculate the version number as follows.
- </para>
- <para>
-   <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Version (part)</entry>
-      <entry>Example</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Major*10000</entry>
-      <entry>1*10000 = 10000</entry>
-     </row>
-     <row>
-      <entry>Minor*100</entry>
-      <entry>0*100 = 0</entry>
-     </row>
-     <row>
-      <entry>Patch</entry>
-      <entry>0 = 0</entry>
-     </row>
-     <row>
-      <entry><constant>MYSQLND_UH_VERSION_ID</constant></entry>
-      <entry>10000</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.mysqlnd-uh-version">
-    <term>
-     <constant>MYSQLND_UH_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version string, for example, <quote>1.0.0-alpha</quote>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlnd-uh-version-id">
-    <term>
-     <constant>MYSQLND_UH_VERSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Plugin version number, for example, 10000.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/functions/mysqlnd-uh-convert-to-mysqlnd.xml b/reference/mysqlnd_uh/functions/mysqlnd-uh-convert-to-mysqlnd.xml
deleted file mode 100644
index 67450519bd..0000000000
--- a/reference/mysqlnd_uh/functions/mysqlnd-uh-convert-to-mysqlnd.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-uh-convert-to-mysqlnd" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_uh_convert_to_mysqlnd</refname>
-  <refpurpose>Converts a MySQL connection handle into a mysqlnd connection handle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type>
-   <methodname>mysqlnd_uh_convert_to_mysqlnd</methodname>
-   <methodparam><type>mysqli</type><parameter role="reference">mysql_connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Converts a MySQL connection handle into a mysqlnd connection handle.
-   After conversion you can execute mysqlnd library calls on the connection handle.
-   This can be used to access mysqlnd functionality not made available
-   through user space API calls.
-  </para>
-  <para>
-   The function can be disabled with
-   <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>.
-   If <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-   is set to &false; the function will not install the proxy and
-   always return &true;. Additionally, an error of the
-   type <literal>E_WARNING</literal> may be emitted. The error message may
-   read like <literal>PHP Warning:  mysqlnd_uh_convert_to_mysqlnd(): (Mysqlnd User Handler)
-   The plugin has been disabled by setting the configuration parameter mysqlnd_uh.enable = false.
-   You are not allowed to call this function [...]</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>MySQL connection handle</parameter></term>
-    <listitem>
-     <para>
-      A MySQL connection handle of type mysql, mysqli or PDO_MySQL.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A mysqlnd connection handle.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.4.0</entry>
-       <entry>
-        The <parameter>mysql_connection</parameter> parameter can now be of type
-        <literal>mysql</literal>, <literal>PDO_MySQL</literal>, or <literal>mysqli</literal>.
-        Before, only the <literal>mysqli</literal> type was allowed.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_uh_convert_to_mysqlnd</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* PDO user API gives no access to connection thread id */
-$mysql_connection = new PDO("mysql:host=localhost;dbname=test", "root", "");
-
-/* Convert PDO MySQL handle to mysqlnd handle */
-$mysqlnd = mysqlnd_uh_convert_to_mysqlnd($mysql_connection);
-
-/* Create Proxy to call mysqlnd connection class methods */
-$obj = new MySQLndUHConnection();
-/* Call mysqlnd_conn::get_thread_id */
-var_dump($obj->getThreadId($mysqlnd));
-
-/* Use SQL to fetch connection thread id */
-var_dump($mysql_connection->query("SELECT CONNECTION_ID()")->fetchAll());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(27054)
-array(1) {
-  [0]=>
-  array(2) {
-    ["CONNECTION_ID()"]=>
-    string(5) "27054"
-    [0]=>
-    string(5) "27054"
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/functions/mysqlnd-uh-set-connection-proxy.xml b/reference/mysqlnd_uh/functions/mysqlnd-uh-set-connection-proxy.xml
deleted file mode 100644
index 1e0f1bdc34..0000000000
--- a/reference/mysqlnd_uh/functions/mysqlnd-uh-set-connection-proxy.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-uh-set-connection-proxy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_uh_set_connection_proxy</refname>
-  <refpurpose>Installs a proxy for mysqlnd connections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysqlnd_uh_set_connection_proxy</methodname>
-   <methodparam><type>MysqlndUhConnection</type><parameter role="reference">connection_proxy</parameter></methodparam>
-   <methodparam choice="opt"><type>mysqli</type><parameter role="reference">mysqli_connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Installs a proxy object to hook mysqlnd's connection objects methods.
-   Once installed, the proxy will be used for all MySQL connections
-   opened with <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link> or
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>, assuming that the listed
-   extensions are compiled to use the <link linkend="book.mysqlnd">mysqlnd</link>
-   library.
-  </para>
-  <para>
-   The function can be disabled with
-   <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>.
-   If <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-   is set to &false; the function will not install the proxy and
-   always return &true;. Additionally, an error of the
-   type <literal>E_WARNING</literal> may be emitted. The error message may
-   read like <literal>PHP Warning:  mysqlnd_uh_set_connection_proxy(): (Mysqlnd User Handler)
-   The plugin has been disabled by setting the configuration parameter mysqlnd_uh.enable = false.
-   The proxy has not been installed [...]</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection_proxy</parameter></term>
-    <listitem>
-     <para>
-      A proxy object of type <classname>MysqlndUhConnection</classname>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mysqli_connection</parameter></term>
-    <listitem>
-     <para>
-      Object of type <literal>mysqli</literal>.
-      If given, the proxy will be set for this particular connection only.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>mysqlnd_uh_set_connection_proxy</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->query("SELECT 'No proxy installed, yet'");
-
-class proxy extends MysqlndUhConnection {
- public function query($res, $query) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::query($res, $query);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli->query("SELECT 'mysqlnd rocks!'");
-
-$mysql = mysql_connect("localhost", "root", "", "test");
-mysql_query("SELECT 'Ahoy Andrey!'", $mysql);
-
-$pdo = new PDO("mysql:host=localhost;dbname=test", "root", "");
-$pdo->query("SELECT 'Moin Johannes!'");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::query(array (
-  0 => NULL,
-  1 => 'SELECT \'mysqlnd rocks!\'',
-))
-proxy::query returns true
-proxy::query(array (
-  0 => NULL,
-  1 => 'SELECT \'Ahoy Andrey!\'',
-))
-proxy::query returns true
-proxy::query(array (
-  0 => NULL,
-  1 => 'SELECT \'Moin Johannes!\'',
-))
-proxy::query returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_statement_proxy</function>
-    </member>
-    <member>
-     <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/functions/mysqlnd-uh-set-statement-proxy.xml b/reference/mysqlnd_uh/functions/mysqlnd-uh-set-statement-proxy.xml
deleted file mode 100644
index c132ae558a..0000000000
--- a/reference/mysqlnd_uh/functions/mysqlnd-uh-set-statement-proxy.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysqlnd-uh-set-statement-proxy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysqlnd_uh_set_statement_proxy</refname>
-  <refpurpose>Installs a proxy for mysqlnd statements</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysqlnd_uh_set_statement_proxy</methodname>
-   <methodparam><type>MysqlndUhStatement</type><parameter role="reference">statement_proxy</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Installs a proxy for mysqlnd statements.
-   The proxy object will be used for all mysqlnd prepared
-   statement objects, regardless which PHP MySQL extension
-   (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>)
-   has created them as long as the extension is compiled
-   to use the <link linkend="book.mysqlnd">mysqlnd</link>
-   library.
-  </para>
-  <para>
-   The function can be disabled with
-   <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>.
-   If <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-   is set to &false; the function will not install the proxy and
-   always return &true;. Additionally, an error of the
-   type <literal>E_WARNING</literal> may be emitted. The error message may
-   read like <literal>PHP Warning:  mysqlnd_uh_set_statement_proxy(): (Mysqlnd User Handler)
-   The plugin has been disabled by setting the configuration parameter mysqlnd_uh.enable = false.
-   The proxy has not been installed [...]</literal>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>statement_proxy</parameter></term>
-    <listitem>
-     <para>
-      The mysqlnd statement proxy object of type <literal>MysqlndUhStatement</literal>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/ini.xml b/reference/mysqlnd_uh/ini.xml
deleted file mode 100644
index 5f09cab4c7..0000000000
--- a/reference/mysqlnd_uh/ini.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysqlnd-uh.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Mysqlnd_uh &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mysqlnd-uh.configuration.list">
-     <row>
-      <entry><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysqlnd-uh.report-wrong-types">mysqlnd_uh.report_wrong_types</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.mysqlnd-uh.enable">
-     <term>
-      <parameter>mysqlnd_uh.enable</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Enables or disables the plugin. If set to disabled, the extension will not
-       allow users to plug into
-       <link linkend="book.mysqlnd">mysqlnd</link> to hook
-       <link linkend="book.mysqlnd">mysqlnd</link> calls.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.mysqlnd-uh.report-wrong-types">
-     <term>
-      <parameter>mysqlnd_uh.report_wrong_types</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Whether to report wrong return value types of user hooks as 
-       <constant>E_WARNING</constant> level errors. This is recommended
-       for detecting errors.
-      </para>
-     </listitem>
-    </varlistentry>
-
-  </variablelist>
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/changeuser.xml b/reference/mysqlnd_uh/mysqlnduhconnection/changeuser.xml
deleted file mode 100644
index 63b34b8bdd..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/changeuser.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.changeuser" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::changeUser</refname>
-  <refpurpose>Changes the user of the specified mysqlnd database connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::changeUser</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>user</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>silent</parameter></methodparam>
-   <methodparam><type>int</type><parameter>passwd_len</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes the user of the specified mysqlnd database connection
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user</parameter></term>
-    <listitem>
-     <para>
-      The MySQL user name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <para>
-      The MySQL password.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <para>
-      The MySQL database to change to.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>silent</parameter></term>
-    <listitem>
-     <para>
-      Controls if mysqlnd is allowed to emit errors or not.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passwd_len</parameter></term>
-    <listitem>
-     <para>
-      Length of the MySQL password.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::changeUser</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- /* Hook mysqlnd's connection::change_user call */
- public function changeUser($res, $user, $passwd, $db, $silent, $passwd_len) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::changeUser($res, $user, $passwd, $db, $silent, $passwd_len);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-/* Install proxy/hooks to be used with all future mysqlnd connection */
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-/* Create mysqli connection which is using the mysqlnd library */
-$mysqli = new mysqli("localhost", "root", "", "test");
-
-/* Example of a user API call which triggers the hooked mysqlnd call */
-var_dump($mysqli->change_user("root", "bar", "test"));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::changeUser(array (
-  0 => NULL,
-  1 => 'root',
-  2 => 'bar',
-  3 => 'test',
-  4 => false,
-  5 => 3,
-))
-proxy::changeUser returns false
-bool(false)
-
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_change_user</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/charsetname.xml b/reference/mysqlnd_uh/mysqlnduhconnection/charsetname.xml
deleted file mode 100644
index c1bad58bd4..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/charsetname.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.charsetname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::charsetName</refname>
-  <refpurpose>Returns the default character set for the database connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::charsetName</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the default character set for the database connection.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-       Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The default character set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::charsetName</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
-  public function charsetName($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::charsetName($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump(mysqli_character_set_name($mysqli));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::charsetName(array (
-  0 => NULL,
-))
-proxy::charsetName returns 'latin1'
-string(6) "latin1"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_character_set_name</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/close.xml b/reference/mysqlnd_uh/mysqlnduhconnection/close.xml
deleted file mode 100644
index 797d896fdf..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/close.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::close</refname>
-  <refpurpose>Closes a previously opened database connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::close</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>close_type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes a previously opened database connection.
-  </para>
-  <note>
-   <para>
-    Failing to call the parent implementation may cause memory leaks or
-    crash PHP. This is not considered a bug. Please, keep in mind that
-    the <literal>mysqlnd</literal> library functions have never been designed
-    to be exposed to the user space.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      The connection to be closed. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close_type</parameter></term>
-    <listitem>
-     <para>
-      Why the connection is to be closed. The value
-      of <parameter>close_type</parameter> is one of
-      <constant>MYSQLND_UH_MYSQLND_CLOSE_EXPLICIT</constant>,
-      <constant>MYSQLND_UH_MYSQLND_CLOSE_IMPLICIT</constant>,
-      <constant>MYSQLND_UH_MYSQLND_CLOSE_DISCONNECTED</constant> or
-       <constant>MYSQLND_UH_MYSQLND_CLOSE_LAST</constant>. The
-       latter should never be seen, unless the default
-       behaviour of the <literal>mysqlnd</literal> library
-       has been changed by a plugin.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::close</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-function close_type_to_string($close_type) {
- $mapping = array(
-  MYSQLND_UH_MYSQLND_CLOSE_DISCONNECTED => "MYSQLND_UH_MYSQLND_CLOSE_DISCONNECTED",
-  MYSQLND_UH_MYSQLND_CLOSE_EXPLICIT => "MYSQLND_UH_MYSQLND_CLOSE_EXPLICIT",
-  MYSQLND_UH_MYSQLND_CLOSE_IMPLICIT => "MYSQLND_UH_MYSQLND_CLOSE_IMPLICIT",
-  MYSQLND_UH_MYSQLND_CLOSE_LAST => "MYSQLND_UH_MYSQLND_CLOSE_IMPLICIT"
- );
- return (isset($mapping[$close_type])) ? $mapping[$close_type] : 'unknown';
-}
-
-class proxy extends MysqlndUhConnection {
-  public function close($res, $close_type) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   printf("close_type = %s\n", close_type_to_string($close_type));
-   /* WARNING: you must call the parent */
-   $ret = parent::close($res, $close_type);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::close(array (
-  0 => NULL,
-  1 => 0,
-))
-close_type = MYSQLND_UH_MYSQLND_CLOSE_EXPLICIT
-proxy::close returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_close</function>
-    </member>
-    <member>
-     <function>mysql_close</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/connect.xml b/reference/mysqlnd_uh/mysqlnduhconnection/connect.xml
deleted file mode 100644
index 5e2b3961ee..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/connect.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::connect</refname>
-  <refpurpose>Open a new connection to the MySQL server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::connect</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>string</type><parameter>use"</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>socket</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mysql_flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Open a new connection to the MySQL server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-       Can be either a host name or an IP address. Passing the NULL value or
-       the string &quot;localhost&quot; to this parameter,
-       the local host is assumed. When possible, pipes will be used
-       instead of the TCP/IP protocol.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user</parameter></term>
-    <listitem>
-     <para>
-      The MySQL user name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <para>
-      If not provided or &null;,
-      the MySQL server will attempt to authenticate
-      the user against those user records which have no password only.
-      This allows one username to be used with different permissions
-      (depending on if a password as provided or not).
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <para>
-      If provided will specify the default database to be used when performing queries.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      Specifies the port number to attempt to connect to the MySQL server.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>socket</parameter></term>
-    <listitem>
-     <para>
-      Specifies the socket or named pipe that should be used.
-      If &null;, mysqlnd will default to
-      <literal>/tmp/mysql.sock</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mysql_flags</parameter></term>
-    <listitem>
-     <para>
-      Connection options.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::connect</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function connect($res, $host, $user, $passwd, $db, $port, $socket, $mysql_flags) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::connect($res, $host, $user, $passwd, $db, $port, $socket, $mysql_flags);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::connect(array (
-  0 => NULL,
-  1 => 'localhost',
-  2 => 'root',
-  3 => '',
-  4 => 'test',
-  5 => 3306,
-  6 => NULL,
-  7 => 131072,
-))
-proxy::connect returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_connect</function>
-    </member>
-    <member>
-     <function>mysql_connect</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/endpsession.xml b/reference/mysqlnd_uh/mysqlnduhconnection/endpsession.xml
deleted file mode 100644
index 1126be2ddc..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/endpsession.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.endpsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::endPSession</refname>
-  <refpurpose>End a persistent connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::endPSession</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   End a persistent connection
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::endPSession</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function endPSession($conn) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::endPSession($conn);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("p:localhost", "root", "", "test");
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::endPSession(array (
-  0 => NULL,
-))
-proxy::endPSession returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/escapestring.xml b/reference/mysqlnd_uh/mysqlnduhconnection/escapestring.xml
deleted file mode 100644
index ce38061718..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/escapestring.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.escapestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::escapeString</refname>
-  <refpurpose>
-   Escapes special characters in a string for use in an SQL statement,
-   taking into account the current charset of the connection
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::escapeString</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>escape_string</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Escapes special characters in a string for use in an SQL statement,
-   taking into account the current charset of the connection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>MYSQLND_UH_RES_MYSQLND_NAME</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>escape_string</parameter></term>
-    <listitem>
-     <para>
-      The string to be escaped.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The escaped string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::escapeString</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function escapeString($res, $string) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::escapeString($res, $string);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->set_charset("latin1");
-$mysqli->real_escape_string("test0'test");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::escapeString(array (
-  0 => NULL,
-  1 => 'test0\'test',
-))
-proxy::escapeString returns 'test0\\\'test'
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_real_escape_string</function>
-    </member>
-    <member>
-     <function>mysql_real_escape_string</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getaffectedrows.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getaffectedrows.xml
deleted file mode 100644
index 0f5102a1c8..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getaffectedrows.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getaffectedrows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getAffectedRows</refname>
-  <refpurpose>Gets the number of affected rows in a previous MySQL operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getAffectedRows</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the number of affected rows in a previous MySQL operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of affected rows.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getAffectedRows</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getAffectedRows($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getAffectedRows($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT)");
-$mysqli->query("INSERT INTO test(id) VALUES (1)");
-var_dump($mysqli->affected_rows);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getAffectedRows(array (
-  0 => NULL,
-))
-proxy::getAffectedRows returns 1
-int(1)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_affected_rows</function>
-    </member>
-    <member>
-     <function>mysql_affected_rows</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/geterrornumber.xml b/reference/mysqlnd_uh/mysqlnduhconnection/geterrornumber.xml
deleted file mode 100644
index b8db793995..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/geterrornumber.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.geterrornumber" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getErrorNumber</refname>
-  <refpurpose>Returns the error code for the most recent function call</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getErrorNumber</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the error code for the most recent function call.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Error code for the most recent function call.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <function>MysqlndUhConnection::getErrorNumber</function> is not only executed
-   after the invocation of a user space API call which maps directly to it but also
-   called internally.
-  </para>
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getErrorNumber</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getErrorNumber($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getErrorNumber($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-printf("connect...\n");
-$mysqli = new mysqli("localhost", "root", "", "test");
-printf("query...\n");
-$mysqli->query("PLEASE_LET_THIS_BE_INVALID_SQL");
-printf("errno...\n");
-var_dump($mysqli->errno);
-printf("close...\n");
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-connect...
-proxy::getErrorNumber(array (
-  0 => NULL,
-))
-proxy::getErrorNumber returns 0
-query...
-errno...
-proxy::getErrorNumber(array (
-  0 => NULL,
-))
-proxy::getErrorNumber returns 1064
-int(1064)
-close...
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>MysqlndUhConnection::getErrorString</function>
-    </member>
-    <member>
-     <function>mysqli_errno</function>
-    </member>
-    <member>
-     <function>mysql_errno</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/geterrorstring.xml b/reference/mysqlnd_uh/mysqlnduhconnection/geterrorstring.xml
deleted file mode 100644
index 2174505d00..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/geterrorstring.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.geterrorstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getErrorString</refname>
-  <refpurpose>Returns a string description of the last error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::getErrorString</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a string description of the last error.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Error string for the most recent function call.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <function>MysqlndUhConnection::getErrorString</function> is not only executed
-   after the invocation of a user space API call which maps directly to it but also
-   called internally.
-  </para>
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getErrorString</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getErrorString($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getErrorString($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-printf("connect...\n");
-$mysqli = new mysqli("localhost", "root", "", "test");
-printf("query...\n");
-$mysqli->query("WILL_I_EVER_LEARN_SQL?");
-printf("errno...\n");
-var_dump($mysqli->error);
-printf("close...\n");
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-connect...
-proxy::getErrorString(array (
-  0 => NULL,
-))
-proxy::getErrorString returns ''
-query...
-errno...
-proxy::getErrorString(array (
-  0 => NULL,
-))
-proxy::getErrorString returns 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'WILL_I_EVER_LEARN_SQL?\' at line 1'
-string(168) "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WILL_I_EVER_LEARN_SQL?' at line 1"
-close...
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>MysqlndUhConnection::getErrorNumber</function>
-    </member>
-    <member>
-     <function>mysqli_error</function>
-    </member>
-    <member>
-     <function>mysql_error</function>
-    </member>
-   </simplelist>
-  </para>
-  </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getfieldcount.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getfieldcount.xml
deleted file mode 100644
index 0649312acf..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getfieldcount.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getfieldcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getFieldCount</refname>
-  <refpurpose>Returns the number of columns for the most recent query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getFieldCount</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of columns for the most recent query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of columns.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <function>MysqlndUhConnection::getFieldCount</function> is not only executed
-   after the invocation of a user space API call which maps directly to it but also
-   called internally.
-  </para>
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getFieldCount</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getFieldCount($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getFieldCount($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->query("WILL_I_EVER_LEARN_SQL?");
-var_dump($mysqli->field_count);
-$mysqli->query("SELECT 1, 2, 3 FROM DUAL");
-var_dump($mysqli->field_count);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getFieldCount(array (
-  0 => NULL,
-))
-proxy::getFieldCount returns 0
-int(0)
-proxy::getFieldCount(array (
-  0 => NULL,
-))
-proxy::getFieldCount returns 3
-proxy::getFieldCount(array (
-  0 => NULL,
-))
-proxy::getFieldCount returns 3
-int(3)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_field_count</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/gethostinformation.xml b/reference/mysqlnd_uh/mysqlnduhconnection/gethostinformation.xml
deleted file mode 100644
index b36cbdfc1d..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/gethostinformation.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.gethostinformation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getHostInformation</refname>
-  <refpurpose>Returns a string representing the type of connection used</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::getHostInformation</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a string representing the type of connection used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Connection description.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getHostInformation</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getHostInformation($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getHostInformation($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->host_info);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getHostInformation(array (
-  0 => NULL,
-))
-proxy::getHostInformation returns 'Localhost via UNIX socket'
-string(25) "Localhost via UNIX socket"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_get_host_info</function>
-    </member>
-    <member>
-     <function>mysql_get_host_info</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getlastinsertid.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getlastinsertid.xml
deleted file mode 100644
index 82f59edf0f..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getlastinsertid.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getlastinsertid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getLastInsertId</refname>
-  <refpurpose>Returns the auto generated id used in the last query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getLastInsertId</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the auto generated id used in the last query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Last insert id.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getLastInsertId</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getLastInsertId($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getLastInsertId($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->query("DROP TABLE IF EXISTS test");
-$mysqli->query("CREATE TABLE test(id INT AUTO_INCREMENT PRIMARY KEY, col VARCHAR(255))");
-$mysqli->query("INSERT INTO test(col) VALUES ('a')");
-var_dump($mysqli->insert_id);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getLastInsertId(array (
-  0 => NULL,
-))
-proxy::getLastInsertId returns 1
-int(1)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_insert_id</function>
-    </member>
-    <member>
-     <function>mysql_insert_id</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getlastmessage.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getlastmessage.xml
deleted file mode 100644
index 14a7328f45..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getlastmessage.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getlastmessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getLastMessage</refname>
-  <refpurpose>Retrieves information about the most recently executed query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MysqlndUhConnection::getLastMessage</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves information about the most recently executed query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Last message. Trying to return a string longer than 511 bytes
-   will cause an error of the type <literal>E_WARNING</literal> and
-   result in the string being truncated.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getLastMessage</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getLastMessage($res) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::getLastMessage($res);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->info);
-$mysqli->query("DROP TABLE IF EXISTS test");
-var_dump($mysqli->info);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getLastMessage(array (
-  0 => NULL,
-))
-proxy::getLastMessage returns ''
-string(0) ""
-proxy::getLastMessage(array (
-  0 => NULL,
-))
-proxy::getLastMessage returns ''
-string(0) ""
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_info</function>
-    </member>
-    <member>
-     <function>mysql_info</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getprotocolinformation.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getprotocolinformation.xml
deleted file mode 100644
index f8accb264b..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getprotocolinformation.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getprotocolinformation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getProtocolInformation</refname>
-  <refpurpose>Returns the version of the MySQL protocol used</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::getProtocolInformation</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the version of the MySQL protocol used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The protocol version.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getProtocolInformation</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getProtocolInformation($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getProtocolInformation($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->protocol_version);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getProtocolInformation(array (
-  0 => NULL,
-))
-proxy::getProtocolInformation returns 10
-int(10)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_get_proto_info</function>
-    </member>
-    <member>
-     <function>mysql_get_proto_info</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getserverinformation.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getserverinformation.xml
deleted file mode 100644
index 8a1e3f77cf..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getserverinformation.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getserverinformation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getServerInformation</refname>
-  <refpurpose>Returns the version of the MySQL server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::getServerInformation</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the version of the MySQL server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The server version.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getServerInformation</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getServerInformation($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getServerInformation($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->server_info);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getServerInformation(array (
-  0 => NULL,
-))
-proxy::getServerInformation returns '5.1.45-debug-log'
-string(16) "5.1.45-debug-log"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_get_server_info</function>
-    </member>
-    <member>
-     <function>mysql_get_server_info</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getserverstatistics.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getserverstatistics.xml
deleted file mode 100644
index 4fb5fed520..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getserverstatistics.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getserverstatistics" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getServerStatistics</refname>
-  <refpurpose>Gets the current system status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::getServerStatistics</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the current system status.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The system status message.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getServerStatistics</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getServerStatistics($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getServerStatistics($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump(mysqli_stat($mysqli));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getServerStatistics(array (
-  0 => NULL,
-))
-proxy::getServerStatistics returns 'Uptime: 2059995  Threads: 1  Questions: 126157  Slow queries: 0  Opens: 6377  Flush tables: 1  Open tables: 18  Queries per second avg: 0.61'
-string(140) "Uptime: 2059995  Threads: 1  Questions: 126157  Slow queries: 0  Opens: 6377  Flush tables: 1  Open tables: 18  Queries per second avg: 0.61"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_stat</function>
-    </member>
-    <member>
-     <function>mysql_stat</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getserverversion.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getserverversion.xml
deleted file mode 100644
index abc44406a6..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getserverversion.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getserverversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getServerVersion</refname>
-  <refpurpose>Returns the version of the MySQL server as an integer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getServerVersion</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the version of the MySQL server as an integer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The MySQL version.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getServerVersion</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getServerVersion($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getServerVersion($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->server_version);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getServerVersion(array (
-  0 => NULL,
-))
-proxy::getServerVersion returns 50145
-int(50145)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_get_server_version</function>
-    </member>
-    <member>
-     <function>mysql_get_server_version</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getsqlstate.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getsqlstate.xml
deleted file mode 100644
index 12b591d73b..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getsqlstate.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getsqlstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getSqlstate</refname>
-  <refpurpose>Returns the SQLSTATE error from previous MySQL operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>MysqlndUhConnection::getSqlstate</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the SQLSTATE error from previous MySQL operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The SQLSTATE code.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getSqlstate</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getSqlstate($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getSqlstate($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->sqlstate);
-$mysqli->query("AN_INVALID_REQUEST_TO_PROVOKE_AN_ERROR");
-var_dump($mysqli->sqlstate);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getSqlstate(array (
-  0 => NULL,
-))
-proxy::getSqlstate returns '00000'
-string(5) "00000"
-proxy::getSqlstate(array (
-  0 => NULL,
-))
-proxy::getSqlstate returns '42000'
-string(5) "42000"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_sql_state</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getstatistics.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getstatistics.xml
deleted file mode 100644
index d0c214515b..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getstatistics.xml
+++ /dev/null
@@ -1,600 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getstatistics" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getStatistics</refname>
-  <refpurpose>Returns statistics about the client connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MysqlndUhConnection::getStatistics</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns statistics about the client connection.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Connection statistics collected by mysqlnd.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getStatistics</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getStatistics($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getStatistics($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->get_connection_stats());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getStatistics(array (
-  0 => NULL,
-))
-proxy::getStatistics returns array (
-  'bytes_sent' => '73',
-  'bytes_received' => '77',
-  'packets_sent' => '2',
-  'packets_received' => '2',
-  'protocol_overhead_in' => '8',
-  'protocol_overhead_out' => '8',
-  'bytes_received_ok_packet' => '0',
-  'bytes_received_eof_packet' => '0',
-  'bytes_received_rset_header_packet' => '0',
-  'bytes_received_rset_field_meta_packet' => '0',
-  'bytes_received_rset_row_packet' => '0',
-  'bytes_received_prepare_response_packet' => '0',
-  'bytes_received_change_user_packet' => '0',
-  'packets_sent_command' => '0',
-  'packets_received_ok' => '0',
-  'packets_received_eof' => '0',
-  'packets_received_rset_header' => '0',
-  'packets_received_rset_field_meta' => '0',
-  'packets_received_rset_row' => '0',
-  'packets_received_prepare_response' => '0',
-  'packets_received_change_user' => '0',
-  'result_set_queries' => '0',
-  'non_result_set_queries' => '0',
-  'no_index_used' => '0',
-  'bad_index_used' => '0',
-  'slow_queries' => '0',
-  'buffered_sets' => '0',
-  'unbuffered_sets' => '0',
-  'ps_buffered_sets' => '0',
-  'ps_unbuffered_sets' => '0',
-  'flushed_normal_sets' => '0',
-  'flushed_ps_sets' => '0',
-  'ps_prepared_never_executed' => '0',
-  'ps_prepared_once_executed' => '0',
-  'rows_fetched_from_server_normal' => '0',
-  'rows_fetched_from_server_ps' => '0',
-  'rows_buffered_from_client_normal' => '0',
-  'rows_buffered_from_client_ps' => '0',
-  'rows_fetched_from_client_normal_buffered' => '0',
-  'rows_fetched_from_client_normal_unbuffered' => '0',
-  'rows_fetched_from_client_ps_buffered' => '0',
-  'rows_fetched_from_client_ps_unbuffered' => '0',
-  'rows_fetched_from_client_ps_cursor' => '0',
-  'rows_affected_normal' => '0',
-  'rows_affected_ps' => '0',
-  'rows_skipped_normal' => '0',
-  'rows_skipped_ps' => '0',
-  'copy_on_write_saved' => '0',
-  'copy_on_write_performed' => '0',
-  'command_buffer_too_small' => '0',
-  'connect_success' => '1',
-  'connect_failure' => '0',
-  'connection_reused' => '0',
-  'reconnect' => '0',
-  'pconnect_success' => '0',
-  'active_connections' => '1',
-  'active_persistent_connections' => '0',
-  'explicit_close' => '0',
-  'implicit_close' => '0',
-  'disconnect_close' => '0',
-  'in_middle_of_command_close' => '0',
-  'explicit_free_result' => '0',
-  'implicit_free_result' => '0',
-  'explicit_stmt_close' => '0',
-  'implicit_stmt_close' => '0',
-  'mem_emalloc_count' => '0',
-  'mem_emalloc_amount' => '0',
-  'mem_ecalloc_count' => '0',
-  'mem_ecalloc_amount' => '0',
-  'mem_erealloc_count' => '0',
-  'mem_erealloc_amount' => '0',
-  'mem_efree_count' => '0',
-  'mem_efree_amount' => '0',
-  'mem_malloc_count' => '0',
-  'mem_malloc_amount' => '0',
-  'mem_calloc_count' => '0',
-  'mem_calloc_amount' => '0',
-  'mem_realloc_count' => '0',
-  'mem_realloc_amount' => '0',
-  'mem_free_count' => '0',
-  'mem_free_amount' => '0',
-  'mem_estrndup_count' => '0',
-  'mem_strndup_count' => '0',
-  'mem_estndup_count' => '0',
-  'mem_strdup_count' => '0',
-  'proto_text_fetched_null' => '0',
-  'proto_text_fetched_bit' => '0',
-  'proto_text_fetched_tinyint' => '0',
-  'proto_text_fetched_short' => '0',
-  'proto_text_fetched_int24' => '0',
-  'proto_text_fetched_int' => '0',
-  'proto_text_fetched_bigint' => '0',
-  'proto_text_fetched_decimal' => '0',
-  'proto_text_fetched_float' => '0',
-  'proto_text_fetched_double' => '0',
-  'proto_text_fetched_date' => '0',
-  'proto_text_fetched_year' => '0',
-  'proto_text_fetched_time' => '0',
-  'proto_text_fetched_datetime' => '0',
-  'proto_text_fetched_timestamp' => '0',
-  'proto_text_fetched_string' => '0',
-  'proto_text_fetched_blob' => '0',
-  'proto_text_fetched_enum' => '0',
-  'proto_text_fetched_set' => '0',
-  'proto_text_fetched_geometry' => '0',
-  'proto_text_fetched_other' => '0',
-  'proto_binary_fetched_null' => '0',
-  'proto_binary_fetched_bit' => '0',
-  'proto_binary_fetched_tinyint' => '0',
-  'proto_binary_fetched_short' => '0',
-  'proto_binary_fetched_int24' => '0',
-  'proto_binary_fetched_int' => '0',
-  'proto_binary_fetched_bigint' => '0',
-  'proto_binary_fetched_decimal' => '0',
-  'proto_binary_fetched_float' => '0',
-  'proto_binary_fetched_double' => '0',
-  'proto_binary_fetched_date' => '0',
-  'proto_binary_fetched_year' => '0',
-  'proto_binary_fetched_time' => '0',
-  'proto_binary_fetched_datetime' => '0',
-  'proto_binary_fetched_timestamp' => '0',
-  'proto_binary_fetched_string' => '0',
-  'proto_binary_fetched_blob' => '0',
-  'proto_binary_fetched_enum' => '0',
-  'proto_binary_fetched_set' => '0',
-  'proto_binary_fetched_geometry' => '0',
-  'proto_binary_fetched_other' => '0',
-  'init_command_executed_count' => '0',
-  'init_command_failed_count' => '0',
-  'com_quit' => '0',
-  'com_init_db' => '0',
-  'com_query' => '0',
-  'com_field_list' => '0',
-  'com_create_db' => '0',
-  'com_drop_db' => '0',
-  'com_refresh' => '0',
-  'com_shutdown' => '0',
-  'com_statistics' => '0',
-  'com_process_info' => '0',
-  'com_connect' => '0',
-  'com_process_kill' => '0',
-  'com_debug' => '0',
-  'com_ping' => '0',
-  'com_time' => '0',
-  'com_delayed_insert' => '0',
-  'com_change_user' => '0',
-  'com_binlog_dump' => '0',
-  'com_table_dump' => '0',
-  'com_connect_out' => '0',
-  'com_register_slave' => '0',
-  'com_stmt_prepare' => '0',
-  'com_stmt_execute' => '0',
-  'com_stmt_send_long_data' => '0',
-  'com_stmt_close' => '0',
-  'com_stmt_reset' => '0',
-  'com_stmt_set_option' => '0',
-  'com_stmt_fetch' => '0',
-  'com_deamon' => '0',
-  'bytes_received_real_data_normal' => '0',
-  'bytes_received_real_data_ps' => '0',
-)
-array(160) {
-  ["bytes_sent"]=>
-  string(2) "73"
-  ["bytes_received"]=>
-  string(2) "77"
-  ["packets_sent"]=>
-  string(1) "2"
-  ["packets_received"]=>
-  string(1) "2"
-  ["protocol_overhead_in"]=>
-  string(1) "8"
-  ["protocol_overhead_out"]=>
-  string(1) "8"
-  ["bytes_received_ok_packet"]=>
-  string(1) "0"
-  ["bytes_received_eof_packet"]=>
-  string(1) "0"
-  ["bytes_received_rset_header_packet"]=>
-  string(1) "0"
-  ["bytes_received_rset_field_meta_packet"]=>
-  string(1) "0"
-  ["bytes_received_rset_row_packet"]=>
-  string(1) "0"
-  ["bytes_received_prepare_response_packet"]=>
-  string(1) "0"
-  ["bytes_received_change_user_packet"]=>
-  string(1) "0"
-  ["packets_sent_command"]=>
-  string(1) "0"
-  ["packets_received_ok"]=>
-  string(1) "0"
-  ["packets_received_eof"]=>
-  string(1) "0"
-  ["packets_received_rset_header"]=>
-  string(1) "0"
-  ["packets_received_rset_field_meta"]=>
-  string(1) "0"
-  ["packets_received_rset_row"]=>
-  string(1) "0"
-  ["packets_received_prepare_response"]=>
-  string(1) "0"
-  ["packets_received_change_user"]=>
-  string(1) "0"
-  ["result_set_queries"]=>
-  string(1) "0"
-  ["non_result_set_queries"]=>
-  string(1) "0"
-  ["no_index_used"]=>
-  string(1) "0"
-  ["bad_index_used"]=>
-  string(1) "0"
-  ["slow_queries"]=>
-  string(1) "0"
-  ["buffered_sets"]=>
-  string(1) "0"
-  ["unbuffered_sets"]=>
-  string(1) "0"
-  ["ps_buffered_sets"]=>
-  string(1) "0"
-  ["ps_unbuffered_sets"]=>
-  string(1) "0"
-  ["flushed_normal_sets"]=>
-  string(1) "0"
-  ["flushed_ps_sets"]=>
-  string(1) "0"
-  ["ps_prepared_never_executed"]=>
-  string(1) "0"
-  ["ps_prepared_once_executed"]=>
-  string(1) "0"
-  ["rows_fetched_from_server_normal"]=>
-  string(1) "0"
-  ["rows_fetched_from_server_ps"]=>
-  string(1) "0"
-  ["rows_buffered_from_client_normal"]=>
-  string(1) "0"
-  ["rows_buffered_from_client_ps"]=>
-  string(1) "0"
-  ["rows_fetched_from_client_normal_buffered"]=>
-  string(1) "0"
-  ["rows_fetched_from_client_normal_unbuffered"]=>
-  string(1) "0"
-  ["rows_fetched_from_client_ps_buffered"]=>
-  string(1) "0"
-  ["rows_fetched_from_client_ps_unbuffered"]=>
-  string(1) "0"
-  ["rows_fetched_from_client_ps_cursor"]=>
-  string(1) "0"
-  ["rows_affected_normal"]=>
-  string(1) "0"
-  ["rows_affected_ps"]=>
-  string(1) "0"
-  ["rows_skipped_normal"]=>
-  string(1) "0"
-  ["rows_skipped_ps"]=>
-  string(1) "0"
-  ["copy_on_write_saved"]=>
-  string(1) "0"
-  ["copy_on_write_performed"]=>
-  string(1) "0"
-  ["command_buffer_too_small"]=>
-  string(1) "0"
-  ["connect_success"]=>
-  string(1) "1"
-  ["connect_failure"]=>
-  string(1) "0"
-  ["connection_reused"]=>
-  string(1) "0"
-  ["reconnect"]=>
-  string(1) "0"
-  ["pconnect_success"]=>
-  string(1) "0"
-  ["active_connections"]=>
-  string(1) "1"
-  ["active_persistent_connections"]=>
-  string(1) "0"
-  ["explicit_close"]=>
-  string(1) "0"
-  ["implicit_close"]=>
-  string(1) "0"
-  ["disconnect_close"]=>
-  string(1) "0"
-  ["in_middle_of_command_close"]=>
-  string(1) "0"
-  ["explicit_free_result"]=>
-  string(1) "0"
-  ["implicit_free_result"]=>
-  string(1) "0"
-  ["explicit_stmt_close"]=>
-  string(1) "0"
-  ["implicit_stmt_close"]=>
-  string(1) "0"
-  ["mem_emalloc_count"]=>
-  string(1) "0"
-  ["mem_emalloc_amount"]=>
-  string(1) "0"
-  ["mem_ecalloc_count"]=>
-  string(1) "0"
-  ["mem_ecalloc_amount"]=>
-  string(1) "0"
-  ["mem_erealloc_count"]=>
-  string(1) "0"
-  ["mem_erealloc_amount"]=>
-  string(1) "0"
-  ["mem_efree_count"]=>
-  string(1) "0"
-  ["mem_efree_amount"]=>
-  string(1) "0"
-  ["mem_malloc_count"]=>
-  string(1) "0"
-  ["mem_malloc_amount"]=>
-  string(1) "0"
-  ["mem_calloc_count"]=>
-  string(1) "0"
-  ["mem_calloc_amount"]=>
-  string(1) "0"
-  ["mem_realloc_count"]=>
-  string(1) "0"
-  ["mem_realloc_amount"]=>
-  string(1) "0"
-  ["mem_free_count"]=>
-  string(1) "0"
-  ["mem_free_amount"]=>
-  string(1) "0"
-  ["mem_estrndup_count"]=>
-  string(1) "0"
-  ["mem_strndup_count"]=>
-  string(1) "0"
-  ["mem_estndup_count"]=>
-  string(1) "0"
-  ["mem_strdup_count"]=>
-  string(1) "0"
-  ["proto_text_fetched_null"]=>
-  string(1) "0"
-  ["proto_text_fetched_bit"]=>
-  string(1) "0"
-  ["proto_text_fetched_tinyint"]=>
-  string(1) "0"
-  ["proto_text_fetched_short"]=>
-  string(1) "0"
-  ["proto_text_fetched_int24"]=>
-  string(1) "0"
-  ["proto_text_fetched_int"]=>
-  string(1) "0"
-  ["proto_text_fetched_bigint"]=>
-  string(1) "0"
-  ["proto_text_fetched_decimal"]=>
-  string(1) "0"
-  ["proto_text_fetched_float"]=>
-  string(1) "0"
-  ["proto_text_fetched_double"]=>
-  string(1) "0"
-  ["proto_text_fetched_date"]=>
-  string(1) "0"
-  ["proto_text_fetched_year"]=>
-  string(1) "0"
-  ["proto_text_fetched_time"]=>
-  string(1) "0"
-  ["proto_text_fetched_datetime"]=>
-  string(1) "0"
-  ["proto_text_fetched_timestamp"]=>
-  string(1) "0"
-  ["proto_text_fetched_string"]=>
-  string(1) "0"
-  ["proto_text_fetched_blob"]=>
-  string(1) "0"
-  ["proto_text_fetched_enum"]=>
-  string(1) "0"
-  ["proto_text_fetched_set"]=>
-  string(1) "0"
-  ["proto_text_fetched_geometry"]=>
-  string(1) "0"
-  ["proto_text_fetched_other"]=>
-  string(1) "0"
-  ["proto_binary_fetched_null"]=>
-  string(1) "0"
-  ["proto_binary_fetched_bit"]=>
-  string(1) "0"
-  ["proto_binary_fetched_tinyint"]=>
-  string(1) "0"
-  ["proto_binary_fetched_short"]=>
-  string(1) "0"
-  ["proto_binary_fetched_int24"]=>
-  string(1) "0"
-  ["proto_binary_fetched_int"]=>
-  string(1) "0"
-  ["proto_binary_fetched_bigint"]=>
-  string(1) "0"
-  ["proto_binary_fetched_decimal"]=>
-  string(1) "0"
-  ["proto_binary_fetched_float"]=>
-  string(1) "0"
-  ["proto_binary_fetched_double"]=>
-  string(1) "0"
-  ["proto_binary_fetched_date"]=>
-  string(1) "0"
-  ["proto_binary_fetched_year"]=>
-  string(1) "0"
-  ["proto_binary_fetched_time"]=>
-  string(1) "0"
-  ["proto_binary_fetched_datetime"]=>
-  string(1) "0"
-  ["proto_binary_fetched_timestamp"]=>
-  string(1) "0"
-  ["proto_binary_fetched_string"]=>
-  string(1) "0"
-  ["proto_binary_fetched_blob"]=>
-  string(1) "0"
-  ["proto_binary_fetched_enum"]=>
-  string(1) "0"
-  ["proto_binary_fetched_set"]=>
-  string(1) "0"
-  ["proto_binary_fetched_geometry"]=>
-  string(1) "0"
-  ["proto_binary_fetched_other"]=>
-  string(1) "0"
-  ["init_command_executed_count"]=>
-  string(1) "0"
-  ["init_command_failed_count"]=>
-  string(1) "0"
-  ["com_quit"]=>
-  string(1) "0"
-  ["com_init_db"]=>
-  string(1) "0"
-  ["com_query"]=>
-  string(1) "0"
-  ["com_field_list"]=>
-  string(1) "0"
-  ["com_create_db"]=>
-  string(1) "0"
-  ["com_drop_db"]=>
-  string(1) "0"
-  ["com_refresh"]=>
-  string(1) "0"
-  ["com_shutdown"]=>
-  string(1) "0"
-  ["com_statistics"]=>
-  string(1) "0"
-  ["com_process_info"]=>
-  string(1) "0"
-  ["com_connect"]=>
-  string(1) "0"
-  ["com_process_kill"]=>
-  string(1) "0"
-  ["com_debug"]=>
-  string(1) "0"
-  ["com_ping"]=>
-  string(1) "0"
-  ["com_time"]=>
-  string(1) "0"
-  ["com_delayed_insert"]=>
-  string(1) "0"
-  ["com_change_user"]=>
-  string(1) "0"
-  ["com_binlog_dump"]=>
-  string(1) "0"
-  ["com_table_dump"]=>
-  string(1) "0"
-  ["com_connect_out"]=>
-  string(1) "0"
-  ["com_register_slave"]=>
-  string(1) "0"
-  ["com_stmt_prepare"]=>
-  string(1) "0"
-  ["com_stmt_execute"]=>
-  string(1) "0"
-  ["com_stmt_send_long_data"]=>
-  string(1) "0"
-  ["com_stmt_close"]=>
-  string(1) "0"
-  ["com_stmt_reset"]=>
-  string(1) "0"
-  ["com_stmt_set_option"]=>
-  string(1) "0"
-  ["com_stmt_fetch"]=>
-  string(1) "0"
-  ["com_deamon"]=>
-  string(1) "0"
-  ["bytes_received_real_data_normal"]=>
-  string(1) "0"
-  ["bytes_received_real_data_ps"]=>
-  string(1) "0"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_get_connection_stats</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getthreadid.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getthreadid.xml
deleted file mode 100644
index 65f8561e8c..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getthreadid.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getthreadid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getThreadId</refname>
-  <refpurpose>Returns the thread ID for the current connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getThreadId</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the thread ID for the current connection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Connection thread id.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getThreadId</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getThreadId($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getThreadId($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->thread_id);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getThreadId(array (
-  0 => NULL,
-))
-proxy::getThreadId returns 27646
-int(27646)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_thread_id</function>
-    </member>
-    <member>
-     <function>mysql_thread_id</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/getwarningcount.xml b/reference/mysqlnd_uh/mysqlnduhconnection/getwarningcount.xml
deleted file mode 100644
index 2e12111631..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/getwarningcount.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.getwarningcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::getWarningCount</refname>
-  <refpurpose>Returns the number of warnings from the last query for the given link</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MysqlndUhConnection::getWarningCount</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of warnings from the last query for the given link.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of warnings.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::getWarningCount</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function getWarningCount($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::getWarningCount($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-var_dump($mysqli->warning_count);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::getWarningCount(array (
-  0 => NULL,
-))
-proxy::getWarningCount returns 0
-int(0)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_warning_count</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/init.xml b/reference/mysqlnd_uh/mysqlnduhconnection/init.xml
deleted file mode 100644
index a3007605c1..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/init.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.init" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::init</refname>
-  <refpurpose>Initialize mysqlnd connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::init</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Initialize mysqlnd connection. This is an mysqlnd internal call to initialize
-   the connection object.
-  </para>
-  <note>
-   <para>
-    Failing to call the parent implementation may cause memory leaks or
-    crash PHP. This is not considered a bug. Please, keep in mind that
-    the <literal>mysqlnd</literal> library functions have never been designed
-    to be exposed to the user space.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::init</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function init($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::init($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::init(array (
-  0 => NULL,
-))
-proxy::init returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/killconnection.xml b/reference/mysqlnd_uh/mysqlnduhconnection/killconnection.xml
deleted file mode 100644
index 523764bae5..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/killconnection.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.killconnection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::killConnection</refname>
-  <refpurpose>Asks the server to kill a MySQL thread</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::killConnection</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pid</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Asks the server to kill a MySQL thread.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pid</parameter></term>
-    <listitem>
-     <para>
-      Thread Id of the connection to be killed.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::kill</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function killConnection($res, $pid) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::killConnection($res, $pid);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->kill($mysqli->thread_id);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::killConnection(array (
-  0 => NULL,
-  1 => 27650,
-))
-proxy::killConnection returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_kill</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/listfields.xml b/reference/mysqlnd_uh/mysqlnduhconnection/listfields.xml
deleted file mode 100644
index 6f0a5c05ef..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/listfields.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.listfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::listFields</refname>
-  <refpurpose>List MySQL table fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MysqlndUhConnection::listFields</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>table</parameter></methodparam>
-   <methodparam><type>string</type><parameter>achtung_wild</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   List MySQL table fields.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table</parameter></term>
-    <listitem>
-     <para>
-      The name of the table that's being queried.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pattern</parameter></term>
-    <listitem>
-     <para>
-      Name pattern.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::listFields</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function listFields($res, $table, $pattern) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::listFields($res, $table, $pattern);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysql = mysql_connect("localhost", "root", "");
-mysql_select_db("test", $mysql);
-mysql_query("DROP TABLE IF EXISTS test_a", $mysql);
-mysql_query("CREATE TABLE test_a(id INT, col1 VARCHAR(255))", $mysql);
-$res = mysql_list_fields("test", "test_a", $mysql);
-printf("num_rows = %d\n", mysql_num_rows($res));
-while ($row = mysql_fetch_assoc($res))
- var_dump($row);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::listFields(array (
-  0 => NULL,
-  1 => 'test_a',
-  2 => '',
-))
-proxy::listFields returns NULL
-num_rows = 0
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysql_list_fields</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/listmethod.xml b/reference/mysqlnd_uh/mysqlnduhconnection/listmethod.xml
deleted file mode 100644
index 278fc149a1..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/listmethod.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.listmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::listMethod</refname>
-  <refpurpose>Wrapper for assorted list commands</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MysqlndUhConnection::listMethod</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam><type>string</type><parameter>achtung_wild</parameter></methodparam>
-   <methodparam><type>string</type><parameter>par1</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Wrapper for assorted list commands.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      SHOW command to be executed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>achtung_wild</parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>par1</parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   TODO
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::listMethod</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function listMethod($res, $query, $pattern, $par1) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::listMethod($res, $query, $pattern, $par1);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysql = mysql_connect("localhost", "root", "");
-$res = mysql_list_dbs($mysql);
-printf("num_rows = %d\n", mysql_num_rows($res));
-while ($row = mysql_fetch_assoc($res))
- var_dump($row);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::listMethod(array (
-  0 => NULL,
-  1 => 'SHOW DATABASES',
-  2 => '',
-  3 => '',
-))
-proxy::listMethod returns NULL
-num_rows = 6
-array(1) {
-  ["Database"]=>
-  string(18) "information_schema"
-}
-array(1) {
-  ["Database"]=>
-  string(5) "mysql"
-}
-array(1) {
-  ["Database"]=>
-  string(8) "oxid_new"
-}
-array(1) {
-  ["Database"]=>
-  string(7) "phptest"
-}
-array(1) {
-  ["Database"]=>
-  string(7) "pushphp"
-}
-array(1) {
-  ["Database"]=>
-  string(4) "test"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysql_list_dbs</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/moreresults.xml b/reference/mysqlnd_uh/mysqlnduhconnection/moreresults.xml
deleted file mode 100644
index bfc7dd7cab..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/moreresults.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.moreresults" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::moreResults</refname>
-  <refpurpose>Check if there are any more query results from a multi query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::moreResults</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Check if there are any more query results from a multi query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::moreResults</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function moreResults($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::moreResults($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->multi_query("SELECT 1 AS _one; SELECT 2 AS _two");
-do {
-  $res = $mysqli->store_result();
-  var_dump($res->fetch_assoc());
-  printf("%s\n", str_repeat("-", 40));
-} while ($mysqli->more_results() && $mysqli->next_result());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  ["_one"]=>
-  string(1) "1"
-}
-----------------------------------------
-proxy::moreResults(array (
-  0 => NULL,
-))
-proxy::moreResults returns true
-proxy::moreResults(array (
-  0 => NULL,
-))
-proxy::moreResults returns true
-array(1) {
-  ["_two"]=>
-  string(1) "2"
-}
-----------------------------------------
-proxy::moreResults(array (
-  0 => NULL,
-))
-proxy::moreResults returns false
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_more_results</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/nextresult.xml b/reference/mysqlnd_uh/mysqlnduhconnection/nextresult.xml
deleted file mode 100644
index f974597666..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/nextresult.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.nextresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::nextResult</refname>
-  <refpurpose>Prepare next result from multi_query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::nextResult</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Prepare next result from multi_query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::nextResult</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function nextResult($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::nextResult($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->multi_query("SELECT 1 AS _one; SELECT 2 AS _two");
-do {
-  $res = $mysqli->store_result();
-  var_dump($res->fetch_assoc());
-  printf("%s\n", str_repeat("-", 40));
-} while ($mysqli->more_results() && $mysqli->next_result());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  ["_one"]=>
-  string(1) "1"
-}
-----------------------------------------
-proxy::nextResult(array (
-  0 => NULL,
-))
-proxy::nextResult returns true
-array(1) {
-  ["_two"]=>
-  string(1) "2"
-}
-----------------------------------------
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_next_result</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/ping.xml b/reference/mysqlnd_uh/mysqlnduhconnection/ping.xml
deleted file mode 100644
index 63727b8168..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/ping.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.ping" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::ping</refname>
-  <refpurpose>Pings a server connection, or tries to reconnect if the connection has gone down</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::ping</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Pings a server connection, or tries to reconnect if the connection has gone down.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::ping</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function ping($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::ping($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->ping();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::ping(array (
-  0 => NULL,
-))
-proxy::ping returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_ping</function>
-    </member>
-    <member>
-     <function>mysql_ping</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/query.xml b/reference/mysqlnd_uh/mysqlnduhconnection/query.xml
deleted file mode 100644
index d57c0422a3..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/query.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::query</refname>
-  <refpurpose>Performs a query on the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::query</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Performs a query on the database (COM_QUERY).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      The query string.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::query</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function query($res, $query) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $query = "SELECT 'How about query rewriting?'";
-  $ret = parent::query($res, $query);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$res = $mysqli->query("SELECT 'Welcome mysqlnd_uh!' FROM DUAL");
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::query(array (
-  0 => NULL,
-  1 => 'SELECT \'Welcome mysqlnd_uh!\' FROM DUAL',
-))
-proxy::query returns true
-array(1) {
-  ["How about query rewriting?"]=>
-  string(26) "How about query rewriting?"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_query</function>
-    </member>
-    <member>
-     <function>mysql_query</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/queryreadresultsetheader.xml b/reference/mysqlnd_uh/mysqlnduhconnection/queryreadresultsetheader.xml
deleted file mode 100644
index 9f360e872f..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/queryreadresultsetheader.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.queryreadresultsetheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::queryReadResultsetHeader</refname>
-  <refpurpose>Read a result set header</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::queryReadResultsetHeader</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>mysqlnd_statement</type><parameter>mysqlnd_stmt</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Read a result set header.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mysqlnd_stmt</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd statement handle. Do not modify!
-      Set to &null;, if function
-      is not used in the context of a prepared statement.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::queryReadResultsetHeader</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function queryReadResultsetHeader($res, $stmt) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::queryReadResultsetHeader($res, $stmt);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$res = $mysqli->query("SELECT 'Welcome mysqlnd_uh!' FROM DUAL");
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::queryReadResultsetHeader(array (
-  0 => NULL,
-  1 => NULL,
-))
-proxy::queryReadResultsetHeader returns true
-array(1) {
-  ["Welcome mysqlnd_uh!"]=>
-  string(19) "Welcome mysqlnd_uh!"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/reapquery.xml b/reference/mysqlnd_uh/mysqlnduhconnection/reapquery.xml
deleted file mode 100644
index aa2914625d..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/reapquery.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.reapquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::reapQuery</refname>
-  <refpurpose>Get result from async query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::reapQuery</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get result from async query.
-  </para>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::reapQuery</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function reapQuery($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::reapQuery($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$conn1 = new mysqli("localhost", "root", "", "test");
-$conn2 = new mysqli("localhost", "root", "", "test");
-
-$conn1->query("SELECT 1 as 'one', SLEEP(1) AS _sleep FROM DUAL", MYSQLI_ASYNC |  MYSQLI_USE_RESULT);
-$conn2->query("SELECT 1.1 as 'one dot one' FROM DUAL", MYSQLI_ASYNC |  MYSQLI_USE_RESULT);
-
-$links = array(
- $conn1->thread_id => array('link' => $conn1, 'processed' => false),
- $conn2->thread_id => array('link' => $conn2, 'processed' => false)
-);
-
-$saved_errors = array();
-do {
- $poll_links = $poll_errors = $poll_reject = array();
- foreach ($links as $thread_id => $link) {
-  if (!$link['processed']) {
-   $poll_links[] = $link['link'];
-   $poll_errors[] = $link['link'];
-   $poll_reject[] = $link['link'];
-  }
- }
- if (0 == count($poll_links))
-  break;
-
- if (0 == ($num_ready = mysqli_poll($poll_links, $poll_errors, $poll_reject, 0, 200000)))
-  continue;
-
- if (!empty($poll_errors)) {
-  die(var_dump($poll_errors));
- }
-
- foreach ($poll_links as $link) {
-  $thread_id = mysqli_thread_id($link);
-  $links[$thread_id]['processed'] = true;
-
-  if (is_object($res = mysqli_reap_async_query($link))) {
-   // result set object
-   while ($row = mysqli_fetch_assoc($res)) {
-    // eat up all results
-    var_dump($row);
-   }
-   mysqli_free_result($res);
-  } else {
-   // either there is no result (no SELECT) or there is an error
-   if (mysqli_errno($link) > 0) {
-    $saved_errors[$thread_id] = mysqli_errno($link);
-    printf("'%s' caused %d\n", $links[$thread_id]['query'],     mysqli_errno($link));
-   }
-  }
- }
-} while (true);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::reapQuery(array (
-  0 => NULL,
-))
-proxy::reapQuery returns true
-array(1) {
-  ["one dot one"]=>
-  string(3) "1.1"
-}
-proxy::reapQuery(array (
-  0 => NULL,
-))
-proxy::reapQuery returns true
-array(2) {
-  ["one"]=>
-  string(1) "1"
-  ["_sleep"]=>
-  string(1) "0"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_real_async_query</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/refreshserver.xml b/reference/mysqlnd_uh/mysqlnduhconnection/refreshserver.xml
deleted file mode 100644
index 6372cf09b2..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/refreshserver.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.refreshserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::refreshServer</refname>
-  <refpurpose>Flush or reset tables and caches</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::refreshServer</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Flush or reset tables and caches.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      What to refresh.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::refreshServer</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function refreshServer($res, $option) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::refreshServer($res, $option);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-mysqli_refresh($mysqli, 1);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::refreshServer(array (
-  0 => NULL,
-  1 => 1,
-))
-proxy::refreshServer returns false
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/restartpsession.xml b/reference/mysqlnd_uh/mysqlnduhconnection/restartpsession.xml
deleted file mode 100644
index 0234796f31..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/restartpsession.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.restartpsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::restartPSession</refname>
-  <refpurpose>Restart a persistent mysqlnd connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::restartPSession</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Restart a persistent mysqlnd connection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::restartPSession</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function ping($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::ping($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->ping();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::restartPSession(array (
-  0 => NULL,
-))
-proxy::restartPSession returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/selectdb.xml b/reference/mysqlnd_uh/mysqlnduhconnection/selectdb.xml
deleted file mode 100644
index dbfb3d8b6b..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/selectdb.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.selectdb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::selectDb</refname>
-  <refpurpose>Selects the default database for database queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::selectDb</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Selects the default database for database queries.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <para>
-      The database name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-<refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::selectDb</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function selectDb($res, $database) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::selectDb($res, $database);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->select_db("mysql");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::selectDb(array (
-  0 => NULL,
-  1 => 'mysql',
-))
-proxy::selectDb returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_select_db</function>
-    </member>
-    <member>
-     <function>mysql_select_db</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/sendclose.xml b/reference/mysqlnd_uh/mysqlnduhconnection/sendclose.xml
deleted file mode 100644
index 853f5d930e..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/sendclose.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.sendclose" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::sendClose</refname>
-  <refpurpose>Sends a close command to MySQL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::sendClose</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sends a close command to MySQL.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::sendClose</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function sendClose($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::sendClose($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::sendClose(array (
-  0 => NULL,
-))
-proxy::sendClose returns true
-proxy::sendClose(array (
-  0 => NULL,
-))
-proxy::sendClose returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/sendquery.xml b/reference/mysqlnd_uh/mysqlnduhconnection/sendquery.xml
deleted file mode 100644
index 1a6bed765f..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/sendquery.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.sendquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::sendQuery</refname>
-  <refpurpose>Sends a query to MySQL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::sendQuery</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sends a query to MySQL.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      The query string.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::sendQuery</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function sendQuery($res, $query) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::sendQuery($res, $query);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->query("SELECT 1");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::sendQuery(array (
-  0 => NULL,
-  1 => 'SELECT 1',
-))
-proxy::sendQuery returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/serverdumpdebuginformation.xml b/reference/mysqlnd_uh/mysqlnduhconnection/serverdumpdebuginformation.xml
deleted file mode 100644
index b8491435ad..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/serverdumpdebuginformation.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.serverdumpdebuginformation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::serverDumpDebugInformation</refname>
-  <refpurpose>Dump debugging information into the log for the MySQL server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::serverDumpDebugInformation</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Dump debugging information into the log for the MySQL server.
-  </para>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::serverDumpDebugInformation</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function serverDumpDebugInformation($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::serverDumpDebugInformation($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->dump_debug_info();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::serverDumpDebugInformation(array (
-  0 => NULL,
-))
-proxy::serverDumpDebugInformation returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_dump_debug_info</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/setautocommit.xml b/reference/mysqlnd_uh/mysqlnduhconnection/setautocommit.xml
deleted file mode 100644
index 794f94f170..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/setautocommit.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.setautocommit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::setAutocommit</refname>
-  <refpurpose>Turns on or off auto-committing database modifications</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::setAutocommit</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Turns on or off auto-committing database modifications
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <para>
-      Whether to turn on auto-commit or not.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::setAutocommit</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function setAutocommit($res, $mode) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::setAutocommit($res, $mode);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->autocommit(false);
-$mysqli->autocommit(true);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::setAutocommit(array (
-  0 => NULL,
-  1 => 0,
-))
-proxy::setAutocommit returns true
-proxy::setAutocommit(array (
-  0 => NULL,
-  1 => 1,
-))
-proxy::setAutocommit returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_autocommit</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/setcharset.xml b/reference/mysqlnd_uh/mysqlnduhconnection/setcharset.xml
deleted file mode 100644
index 4f8f05c328..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/setcharset.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.setcharset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::setCharset</refname>
-  <refpurpose>Sets the default client character set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::setCharset</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>charset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the default client character set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>charset</parameter></term>
-    <listitem>
-     <para>
-      The charset to be set as default.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::setCharset</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function setCharset($res, $charset) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::setCharset($res, $charset);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->set_charset("latin1");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::setCharset(array (
-  0 => NULL,
-  1 => 'latin1',
-))
-proxy::setCharset returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_set_charset</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/setclientoption.xml b/reference/mysqlnd_uh/mysqlnduhconnection/setclientoption.xml
deleted file mode 100644
index 9e93fdf4f0..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/setclientoption.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.setclientoption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::setClientOption</refname>
-  <refpurpose>Sets a client option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::setClientOption</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets a client option.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <para>
-      The option to be set.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      Optional option value, if required.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::setClientOption</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-function client_option_to_string($option) {
- static $mapping = array(
-  MYSQLND_UH_MYSQLND_OPTION_OPT_CONNECT_TIMEOUT => "MYSQLND_UH_MYSQLND_OPTION_OPT_CONNECT_TIMEOUT",
-  MYSQLND_UH_MYSQLND_OPTION_OPT_COMPRESS => "MYSQLND_UH_MYSQLND_OPTION_OPT_COMPRESS",
-  MYSQLND_UH_MYSQLND_OPTION_OPT_NAMED_PIPE => "MYSQLND_UH_MYSQLND_OPTION_OPT_NAMED_PIPE",
-  MYSQLND_UH_MYSQLND_OPTION_INIT_COMMAND => "MYSQLND_UH_MYSQLND_OPTION_INIT_COMMAND",
-  MYSQLND_UH_MYSQLND_READ_DEFAULT_FILE => "MYSQLND_UH_MYSQLND_READ_DEFAULT_FILE",
-  MYSQLND_UH_MYSQLND_READ_DEFAULT_GROUP => "MYSQLND_UH_MYSQLND_READ_DEFAULT_GROUP",
-  MYSQLND_UH_MYSQLND_SET_CHARSET_DIR => "MYSQLND_UH_MYSQLND_SET_CHARSET_DIR",
-  MYSQLND_UH_MYSQLND_SET_CHARSET_NAME => "MYSQLND_UH_MYSQLND_SET_CHARSET_NAME",
-  MYSQLND_UH_MYSQLND_OPT_LOCAL_INFILE => "MYSQLND_UH_MYSQLND_OPT_LOCAL_INFILE",
-  MYSQLND_UH_MYSQLND_OPT_PROTOCOL => "MYSQLND_UH_MYSQLND_OPT_PROTOCOL",
-  MYSQLND_UH_MYSQLND_SHARED_MEMORY_BASE_NAME => "MYSQLND_UH_MYSQLND_SHARED_MEMORY_BASE_NAME",
-  MYSQLND_UH_MYSQLND_OPT_READ_TIMEOUT => "MYSQLND_UH_MYSQLND_OPT_READ_TIMEOUT",
-  MYSQLND_UH_MYSQLND_OPT_WRITE_TIMEOUT => "MYSQLND_UH_MYSQLND_OPT_WRITE_TIMEOUT",
-  MYSQLND_UH_MYSQLND_OPT_USE_RESULT => "MYSQLND_UH_MYSQLND_OPT_USE_RESULT",
-  MYSQLND_UH_MYSQLND_OPT_USE_REMOTE_CONNECTION => "MYSQLND_UH_MYSQLND_OPT_USE_REMOTE_CONNECTION",
-  MYSQLND_UH_MYSQLND_OPT_USE_EMBEDDED_CONNECTION => "MYSQLND_UH_MYSQLND_OPT_USE_EMBEDDED_CONNECTION",
-  MYSQLND_UH_MYSQLND_OPT_GUESS_CONNECTION => "MYSQLND_UH_MYSQLND_OPT_GUESS_CONNECTION",
-  MYSQLND_UH_MYSQLND_SET_CLIENT_IP => "MYSQLND_UH_MYSQLND_SET_CLIENT_IP",
-  MYSQLND_UH_MYSQLND_SECURE_AUTH => "MYSQLND_UH_MYSQLND_SECURE_AUTH",
-  MYSQLND_UH_MYSQLND_REPORT_DATA_TRUNCATION => "MYSQLND_UH_MYSQLND_REPORT_DATA_TRUNCATION",
-  MYSQLND_UH_MYSQLND_OPT_RECONNECT => "MYSQLND_UH_MYSQLND_OPT_RECONNECT",
-  MYSQLND_UH_MYSQLND_OPT_SSL_VERIFY_SERVER_CERT => "MYSQLND_UH_MYSQLND_OPT_SSL_VERIFY_SERVER_CERT",
-  MYSQLND_UH_MYSQLND_OPT_NET_CMD_BUFFER_SIZE => "MYSQLND_UH_MYSQLND_OPT_NET_CMD_BUFFER_SIZE",
-  MYSQLND_UH_MYSQLND_OPT_NET_READ_BUFFER_SIZE => "MYSQLND_UH_MYSQLND_OPT_NET_READ_BUFFER_SIZE",
-  MYSQLND_UH_MYSQLND_OPT_SSL_KEY => "MYSQLND_UH_MYSQLND_OPT_SSL_KEY",
-  MYSQLND_UH_MYSQLND_OPT_SSL_CERT => "MYSQLND_UH_MYSQLND_OPT_SSL_CERT",
-  MYSQLND_UH_MYSQLND_OPT_SSL_CA => "MYSQLND_UH_MYSQLND_OPT_SSL_CA",
-  MYSQLND_UH_MYSQLND_OPT_SSL_CAPATH => "MYSQLND_UH_MYSQLND_OPT_SSL_CAPATH",
-  MYSQLND_UH_MYSQLND_OPT_SSL_CIPHER => "MYSQLND_UH_MYSQLND_OPT_SSL_CIPHER",
-  MYSQLND_UH_MYSQLND_OPT_SSL_PASSPHRASE => "MYSQLND_UH_MYSQLND_OPT_SSL_PASSPHRASE",
-  MYSQLND_UH_SERVER_OPTION_PLUGIN_DIR => "MYSQLND_UH_SERVER_OPTION_PLUGIN_DIR",
-  MYSQLND_UH_SERVER_OPTION_DEFAULT_AUTH => "MYSQLND_UH_SERVER_OPTION_DEFAULT_AUTH",
-  MYSQLND_UH_SERVER_OPTION_SET_CLIENT_IP => "MYSQLND_UH_SERVER_OPTION_SET_CLIENT_IP"
- );
- if (version_compare(PHP_VERSION, '5.3.99-dev', '>')) {
-  $mapping[MYSQLND_UH_MYSQLND_OPT_MAX_ALLOWED_PACKET] = "MYSQLND_UH_MYSQLND_OPT_MAX_ALLOWED_PACKET";
-  $mapping[MYSQLND_UH_MYSQLND_OPT_AUTH_PROTOCOL] = "MYSQLND_UH_MYSQLND_OPT_AUTH_PROTOCOL";
- }
- if (defined("MYSQLND_UH_MYSQLND_OPT_INT_AND_FLOAT_NATIVE")) {
-  /* special mysqlnd build */
-  $mapping["MYSQLND_UH_MYSQLND_OPT_INT_AND_FLOAT_NATIVE"] = "MYSQLND_UH_MYSQLND_OPT_INT_AND_FLOAT_NATIVE";
- }
- return (isset($mapping[$option])) ? $mapping[$option] : 'unknown';
-}
-
-class proxy extends MysqlndUhConnection {
- public function setClientOption($res, $option, $value) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  printf("Option '%s' set to %s\n", client_option_to_string($option), var_export($value, true));
-  $ret = parent::setClientOption($res, $option, $value);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::setClientOption(array (
-  0 => NULL,
-  1 => 210,
-  2 => 3221225472,
-))
-Option 'MYSQLND_UH_MYSQLND_OPT_MAX_ALLOWED_PACKET' set to 3221225472
-proxy::setClientOption returns true
-proxy::setClientOption(array (
-  0 => NULL,
-  1 => 211,
-  2 => 'mysql_native_password',
-))
-Option 'MYSQLND_UH_MYSQLND_OPT_AUTH_PROTOCOL' set to 'mysql_native_password'
-proxy::setClientOption returns true
-proxy::setClientOption(array (
-  0 => NULL,
-  1 => 8,
-  2 => 1,
-))
-Option 'MYSQLND_UH_MYSQLND_OPT_LOCAL_INFILE' set to 1
-proxy::setClientOption returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_real_connect</function>
-    </member>
-    <member>
-     <function>mysqli_options</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/setserveroption.xml b/reference/mysqlnd_uh/mysqlnduhconnection/setserveroption.xml
deleted file mode 100644
index a362336b3f..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/setserveroption.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.setserveroption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::setServerOption</refname>
-  <refpurpose>Sets a server option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MysqlndUhConnection::setServerOption</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a server option.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <para>
-      The option to be set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::setServerOption</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-function server_option_to_string($option) {
- $ret = 'unknown';
- switch ($option) {
-  case MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_ON:
-   $ret = 'MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_ON';
-   break;
-  case MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_OFF:
-   $ret = 'MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_ON';
-   break;
- }
- return $ret;
-}
-
-class proxy extends MysqlndUhConnection {
- public function setServerOption($res, $option) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  printf("Option '%s' set\n", server_option_to_string($option));
-  $ret = parent::setServerOption($res, $option);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->multi_query("SELECT 1; SELECT 2");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::setServerOption(array (
-  0 => NULL,
-  1 => 0,
-))
-Option 'MYSQLND_UH_SERVER_OPTION_MULTI_STATEMENTS_ON' set
-proxy::setServerOption returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_real_connect</function>
-    </member>
-    <member>
-     <function>mysqli_options</function>
-    </member>
-    <member>
-     <function>mysqli_multi_query</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/simplecommand.xml b/reference/mysqlnd_uh/mysqlnduhconnection/simplecommand.xml
deleted file mode 100644
index 85ec7e76cd..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/simplecommand.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.simplecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::simpleCommand</refname>
-  <refpurpose>Sends a basic COM_* command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::simpleCommand</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>command</parameter></methodparam>
-   <methodparam><type>string</type><parameter>arg</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ok_packet</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>silent</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>ignore_upsert_status</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sends a basic COM_* command to MySQL.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>command</parameter></term>
-    <listitem>
-     <para>
-      The COM command to be send.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>arg</parameter></term>
-    <listitem>
-     <para>
-      Optional COM command arguments.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ok_packet</parameter></term>
-    <listitem>
-     <para>
-      The OK packet type.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>silent</parameter></term>
-    <listitem>
-     <para>
-      Whether mysqlnd may emit errors.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ignore_upsert_status</parameter></term>
-    <listitem>
-     <para>
-      Whether to ignore <literal>UPDATE</literal>/<literal>INSERT</literal> status.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-<refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::simpleCommand</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-function server_cmd_2_string($command) {
- $mapping = array(
-  MYSQLND_UH_MYSQLND_COM_SLEEP => "MYSQLND_UH_MYSQLND_COM_SLEEP",
-  MYSQLND_UH_MYSQLND_COM_QUIT => "MYSQLND_UH_MYSQLND_COM_QUIT",
-  MYSQLND_UH_MYSQLND_COM_INIT_DB => "MYSQLND_UH_MYSQLND_COM_INIT_DB",
-  MYSQLND_UH_MYSQLND_COM_QUERY => "MYSQLND_UH_MYSQLND_COM_QUERY",
-  MYSQLND_UH_MYSQLND_COM_FIELD_LIST => "MYSQLND_UH_MYSQLND_COM_FIELD_LIST",
-  MYSQLND_UH_MYSQLND_COM_CREATE_DB => "MYSQLND_UH_MYSQLND_COM_CREATE_DB",
-  MYSQLND_UH_MYSQLND_COM_DROP_DB => "MYSQLND_UH_MYSQLND_COM_DROP_DB",
-  MYSQLND_UH_MYSQLND_COM_REFRESH => "MYSQLND_UH_MYSQLND_COM_REFRESH",
-  MYSQLND_UH_MYSQLND_COM_SHUTDOWN => "MYSQLND_UH_MYSQLND_COM_SHUTDOWN",
-  MYSQLND_UH_MYSQLND_COM_STATISTICS => "MYSQLND_UH_MYSQLND_COM_STATISTICS",
-  MYSQLND_UH_MYSQLND_COM_PROCESS_INFO => "MYSQLND_UH_MYSQLND_COM_PROCESS_INFO",
-  MYSQLND_UH_MYSQLND_COM_CONNECT => "MYSQLND_UH_MYSQLND_COM_CONNECT",
-  MYSQLND_UH_MYSQLND_COM_PROCESS_KILL => "MYSQLND_UH_MYSQLND_COM_PROCESS_KILL",
-  MYSQLND_UH_MYSQLND_COM_DEBUG => "MYSQLND_UH_MYSQLND_COM_DEBUG",
-  MYSQLND_UH_MYSQLND_COM_PING => "MYSQLND_UH_MYSQLND_COM_PING",
-  MYSQLND_UH_MYSQLND_COM_TIME => "MYSQLND_UH_MYSQLND_COM_TIME",
-  MYSQLND_UH_MYSQLND_COM_DELAYED_INSERT => "MYSQLND_UH_MYSQLND_COM_DELAYED_INSERT",
-  MYSQLND_UH_MYSQLND_COM_CHANGE_USER => "MYSQLND_UH_MYSQLND_COM_CHANGE_USER",
-  MYSQLND_UH_MYSQLND_COM_BINLOG_DUMP => "MYSQLND_UH_MYSQLND_COM_BINLOG_DUMP",
-  MYSQLND_UH_MYSQLND_COM_TABLE_DUMP => "MYSQLND_UH_MYSQLND_COM_TABLE_DUMP",
-  MYSQLND_UH_MYSQLND_COM_CONNECT_OUT => "MYSQLND_UH_MYSQLND_COM_CONNECT_OUT",
-  MYSQLND_UH_MYSQLND_COM_REGISTER_SLAVED => "MYSQLND_UH_MYSQLND_COM_REGISTER_SLAVED",
-  MYSQLND_UH_MYSQLND_COM_STMT_PREPARE => "MYSQLND_UH_MYSQLND_COM_STMT_PREPARE",
-  MYSQLND_UH_MYSQLND_COM_STMT_EXECUTE => "MYSQLND_UH_MYSQLND_COM_STMT_EXECUTE",
-  MYSQLND_UH_MYSQLND_COM_STMT_SEND_LONG_DATA => "MYSQLND_UH_MYSQLND_COM_STMT_SEND_LONG_DATA",
-  MYSQLND_UH_MYSQLND_COM_STMT_CLOSE => "MYSQLND_UH_MYSQLND_COM_STMT_CLOSE",
-  MYSQLND_UH_MYSQLND_COM_STMT_RESET => "MYSQLND_UH_MYSQLND_COM_STMT_RESET",
-  MYSQLND_UH_MYSQLND_COM_SET_OPTION => "MYSQLND_UH_MYSQLND_COM_SET_OPTION",
-  MYSQLND_UH_MYSQLND_COM_STMT_FETCH => "MYSQLND_UH_MYSQLND_COM_STMT_FETCH",
-  MYSQLND_UH_MYSQLND_COM_DAEMON => "MYSQLND_UH_MYSQLND_COM_DAEMON",
-  MYSQLND_UH_MYSQLND_COM_END => "MYSQLND_UH_MYSQLND_COM_END",
- );
- return (isset($mapping[$command])) ? $mapping[$command] : 'unknown';
-}
-
-function ok_packet_2_string($ok_packet) {
- $mapping = array(
-  MYSQLND_UH_MYSQLND_PROT_GREET_PACKET => "MYSQLND_UH_MYSQLND_PROT_GREET_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_AUTH_PACKET => "MYSQLND_UH_MYSQLND_PROT_AUTH_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_OK_PACKET => "MYSQLND_UH_MYSQLND_PROT_OK_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_EOF_PACKET => "MYSQLND_UH_MYSQLND_PROT_EOF_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_CMD_PACKET => "MYSQLND_UH_MYSQLND_PROT_CMD_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_RSET_HEADER_PACKET => "MYSQLND_UH_MYSQLND_PROT_RSET_HEADER_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_RSET_FLD_PACKET => "MYSQLND_UH_MYSQLND_PROT_RSET_FLD_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_ROW_PACKET => "MYSQLND_UH_MYSQLND_PROT_ROW_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_STATS_PACKET => "MYSQLND_UH_MYSQLND_PROT_STATS_PACKET",
-  MYSQLND_UH_MYSQLND_PREPARE_RESP_PACKET => "MYSQLND_UH_MYSQLND_PREPARE_RESP_PACKET",
-  MYSQLND_UH_MYSQLND_CHG_USER_RESP_PACKET => "MYSQLND_UH_MYSQLND_CHG_USER_RESP_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_LAST => "MYSQLND_UH_MYSQLND_PROT_LAST",
- );
- return (isset($mapping[$ok_packet])) ? $mapping[$ok_packet] : 'unknown';
-}
-
-class proxy extends MysqlndUhConnection {
- public function simpleCommand($conn, $command, $arg, $ok_packet, $silent, $ignore_upsert_status) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  printf("Command '%s'\n", server_cmd_2_string($command));
-  printf("OK packet '%s'\n",  ok_packet_2_string($ok_packet));
-  $ret = parent::simpleCommand($conn, $command, $arg, $ok_packet, $silent, $ignore_upsert_status);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->query("SELECT 1");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::simpleCommand(array (
-  0 => NULL,
-  1 => 3,
-  2 => 'SELECT 1',
-  3 => 13,
-  4 => false,
-  5 => false,
-))
-Command 'MYSQLND_UH_MYSQLND_COM_QUERY'
-OK packet 'MYSQLND_UH_MYSQLND_PROT_LAST'
-proxy::simpleCommand returns true
-:)proxy::simpleCommand(array (
-  0 => NULL,
-  1 => 1,
-  2 => '',
-  3 => 13,
-  4 => true,
-  5 => true,
-))
-Command 'MYSQLND_UH_MYSQLND_COM_QUIT'
-OK packet 'MYSQLND_UH_MYSQLND_PROT_LAST'
-proxy::simpleCommand returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/simplecommandhandleresponse.xml b/reference/mysqlnd_uh/mysqlnduhconnection/simplecommandhandleresponse.xml
deleted file mode 100644
index 3ec32431dc..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/simplecommandhandleresponse.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.simplecommandhandleresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::simpleCommandHandleResponse</refname>
-  <refpurpose>Process a response for a basic COM_* command send to the client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::simpleCommandHandleResponse</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ok_packet</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>silent</parameter></methodparam>
-   <methodparam><type>int</type><parameter>command</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>ignore_upsert_status</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Process a response for a basic COM_* command send to the client.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ok_packet</parameter></term>
-    <listitem>
-     <para>
-      The OK packet type.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>silent</parameter></term>
-    <listitem>
-     <para>
-      Whether mysqlnd may emit errors.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>command</parameter></term>
-    <listitem>
-     <para>
-      The COM command to process results from.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ignore_upsert_status</parameter></term>
-    <listitem>
-     <para>
-      Whether to ignore <literal>UPDATE</literal>/<literal>INSERT</literal> status.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-<refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::simpleCommandHandleResponse</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-function server_cmd_2_string($command) {
- $mapping = array(
-  MYSQLND_UH_MYSQLND_COM_SLEEP => "MYSQLND_UH_MYSQLND_COM_SLEEP",
-  MYSQLND_UH_MYSQLND_COM_QUIT => "MYSQLND_UH_MYSQLND_COM_QUIT",
-  MYSQLND_UH_MYSQLND_COM_INIT_DB => "MYSQLND_UH_MYSQLND_COM_INIT_DB",
-  MYSQLND_UH_MYSQLND_COM_QUERY => "MYSQLND_UH_MYSQLND_COM_QUERY",
-  MYSQLND_UH_MYSQLND_COM_FIELD_LIST => "MYSQLND_UH_MYSQLND_COM_FIELD_LIST",
-  MYSQLND_UH_MYSQLND_COM_CREATE_DB => "MYSQLND_UH_MYSQLND_COM_CREATE_DB",
-  MYSQLND_UH_MYSQLND_COM_DROP_DB => "MYSQLND_UH_MYSQLND_COM_DROP_DB",
-  MYSQLND_UH_MYSQLND_COM_REFRESH => "MYSQLND_UH_MYSQLND_COM_REFRESH",
-  MYSQLND_UH_MYSQLND_COM_SHUTDOWN => "MYSQLND_UH_MYSQLND_COM_SHUTDOWN",
-  MYSQLND_UH_MYSQLND_COM_STATISTICS => "MYSQLND_UH_MYSQLND_COM_STATISTICS",
-  MYSQLND_UH_MYSQLND_COM_PROCESS_INFO => "MYSQLND_UH_MYSQLND_COM_PROCESS_INFO",
-  MYSQLND_UH_MYSQLND_COM_CONNECT => "MYSQLND_UH_MYSQLND_COM_CONNECT",
-  MYSQLND_UH_MYSQLND_COM_PROCESS_KILL => "MYSQLND_UH_MYSQLND_COM_PROCESS_KILL",
-  MYSQLND_UH_MYSQLND_COM_DEBUG => "MYSQLND_UH_MYSQLND_COM_DEBUG",
-  MYSQLND_UH_MYSQLND_COM_PING => "MYSQLND_UH_MYSQLND_COM_PING",
-  MYSQLND_UH_MYSQLND_COM_TIME => "MYSQLND_UH_MYSQLND_COM_TIME",
-  MYSQLND_UH_MYSQLND_COM_DELAYED_INSERT => "MYSQLND_UH_MYSQLND_COM_DELAYED_INSERT",
-  MYSQLND_UH_MYSQLND_COM_CHANGE_USER => "MYSQLND_UH_MYSQLND_COM_CHANGE_USER",
-  MYSQLND_UH_MYSQLND_COM_BINLOG_DUMP => "MYSQLND_UH_MYSQLND_COM_BINLOG_DUMP",
-  MYSQLND_UH_MYSQLND_COM_TABLE_DUMP => "MYSQLND_UH_MYSQLND_COM_TABLE_DUMP",
-  MYSQLND_UH_MYSQLND_COM_CONNECT_OUT => "MYSQLND_UH_MYSQLND_COM_CONNECT_OUT",
-  MYSQLND_UH_MYSQLND_COM_REGISTER_SLAVED => "MYSQLND_UH_MYSQLND_COM_REGISTER_SLAVED",
-  MYSQLND_UH_MYSQLND_COM_STMT_PREPARE => "MYSQLND_UH_MYSQLND_COM_STMT_PREPARE",
-  MYSQLND_UH_MYSQLND_COM_STMT_EXECUTE => "MYSQLND_UH_MYSQLND_COM_STMT_EXECUTE",
-  MYSQLND_UH_MYSQLND_COM_STMT_SEND_LONG_DATA => "MYSQLND_UH_MYSQLND_COM_STMT_SEND_LONG_DATA",
-  MYSQLND_UH_MYSQLND_COM_STMT_CLOSE => "MYSQLND_UH_MYSQLND_COM_STMT_CLOSE",
-  MYSQLND_UH_MYSQLND_COM_STMT_RESET => "MYSQLND_UH_MYSQLND_COM_STMT_RESET",
-  MYSQLND_UH_MYSQLND_COM_SET_OPTION => "MYSQLND_UH_MYSQLND_COM_SET_OPTION",
-  MYSQLND_UH_MYSQLND_COM_STMT_FETCH => "MYSQLND_UH_MYSQLND_COM_STMT_FETCH",
-  MYSQLND_UH_MYSQLND_COM_DAEMON => "MYSQLND_UH_MYSQLND_COM_DAEMON",
-  MYSQLND_UH_MYSQLND_COM_END => "MYSQLND_UH_MYSQLND_COM_END",
- );
- return (isset($mapping[$command])) ? $mapping[$command] : 'unknown';
-}
-
-function ok_packet_2_string($ok_packet) {
- $mapping = array(
-  MYSQLND_UH_MYSQLND_PROT_GREET_PACKET => "MYSQLND_UH_MYSQLND_PROT_GREET_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_AUTH_PACKET => "MYSQLND_UH_MYSQLND_PROT_AUTH_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_OK_PACKET => "MYSQLND_UH_MYSQLND_PROT_OK_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_EOF_PACKET => "MYSQLND_UH_MYSQLND_PROT_EOF_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_CMD_PACKET => "MYSQLND_UH_MYSQLND_PROT_CMD_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_RSET_HEADER_PACKET => "MYSQLND_UH_MYSQLND_PROT_RSET_HEADER_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_RSET_FLD_PACKET => "MYSQLND_UH_MYSQLND_PROT_RSET_FLD_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_ROW_PACKET => "MYSQLND_UH_MYSQLND_PROT_ROW_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_STATS_PACKET => "MYSQLND_UH_MYSQLND_PROT_STATS_PACKET",
-  MYSQLND_UH_MYSQLND_PREPARE_RESP_PACKET => "MYSQLND_UH_MYSQLND_PREPARE_RESP_PACKET",
-  MYSQLND_UH_MYSQLND_CHG_USER_RESP_PACKET => "MYSQLND_UH_MYSQLND_CHG_USER_RESP_PACKET",
-  MYSQLND_UH_MYSQLND_PROT_LAST => "MYSQLND_UH_MYSQLND_PROT_LAST",
- );
- return (isset($mapping[$ok_packet])) ? $mapping[$ok_packet] : 'unknown';
-}
-
-class proxy extends MysqlndUhConnection {
- public function simpleCommandHandleResponse($conn, $ok_packet, $silent, $command, $ignore_upsert_status) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  printf("Command '%s'\n", server_cmd_2_string($command));
-  printf("OK packet '%s'\n",  ok_packet_2_string($ok_packet));
-  $ret = parent::simpleCommandHandleResponse($conn, $ok_packet, $silent, $command, $ignore_upsert_status);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysql = mysql_connect("localhost", "root", "");
-mysql_query("SELECT 1 FROM DUAL", $mysql);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::simpleCommandHandleResponse(array (
-  0 => NULL,
-  1 => 5,
-  2 => false,
-  3 => 27,
-  4 => true,
-))
-Command 'MYSQLND_UH_MYSQLND_COM_SET_OPTION'
-OK packet 'MYSQLND_UH_MYSQLND_PROT_EOF_PACKET'
-proxy::simpleCommandHandleResponse returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/sslset.xml b/reference/mysqlnd_uh/mysqlnduhconnection/sslset.xml
deleted file mode 100644
index 8e1b16f3d6..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/sslset.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.sslset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::sslSet</refname>
-  <refpurpose>Used for establishing secure connections using SSL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::sslSet</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cert</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ca</parameter></methodparam>
-   <methodparam><type>string</type><parameter>capath</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Used for establishing secure connections using SSL.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      The path name to the key file.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cert</parameter></term>
-    <listitem>
-     <para>
-      The path name to the certificate file.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ca</parameter></term>
-    <listitem>
-     <para>
-      The path name to the certificate authority file.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>capath</parameter></term>
-    <listitem>
-     <para>
-       The pathname to a directory that contains trusted SSL CA certificates in PEM format.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     <para>
-      A list of allowable ciphers to use for SSL encryption.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::sslSet</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function sslSet($conn, $key, $cert, $ca, $capath, $cipher) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::sslSet($conn, $key, $cert, $ca, $capath, $cipher);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->ssl_set("key", "cert", "ca", "capath", "cipher");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::sslSet(array (
-  0 => NULL,
-  1 => 'key',
-  2 => 'cert',
-  3 => 'ca',
-  4 => 'capath',
-  5 => 'cipher',
-))
-proxy::sslSet returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_ssl_set</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/stmtinit.xml b/reference/mysqlnd_uh/mysqlnduhconnection/stmtinit.xml
deleted file mode 100644
index 712c2841b3..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/stmtinit.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.stmtinit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::stmtInit</refname>
-  <refpurpose>Initializes a statement and returns a resource for use with mysqli_statement::prepare</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>resource</type><methodname>MysqlndUhConnection::stmtInit</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Initializes a statement and returns a resource for use with mysqli_statement::prepare.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Resource of type <literal>Mysqlnd Prepared Statement (internal only - you must not modify it!)</literal>.
-   The documentation may also refer to such resources using the alias name
-   <literal>mysqlnd_prepared_statement</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::stmtInit</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function stmtInit($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  var_dump($res);
-  $ret = parent::stmtInit($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  var_dump($ret);
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-$mysqli = new mysqli("localhost", "root", "", "test");
-$stmt = $mysqli->prepare("SELECT 1 AS _one FROM DUAL");
-$stmt->execute();
-$one = NULL;
-$stmt->bind_result($one);
-$stmt->fetch();
-var_dump($one);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::stmtInit(array (
-  0 => NULL,
-))
-resource(19) of type (Mysqlnd Connection)
-proxy::stmtInit returns NULL
-resource(246) of type (Mysqlnd Prepared Statement (internal only - you must not modify it!))
-int(1)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_stmt_init</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/storeresult.xml b/reference/mysqlnd_uh/mysqlnduhconnection/storeresult.xml
deleted file mode 100644
index 096e7d5c4a..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/storeresult.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.storeresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::storeResult</refname>
-  <refpurpose>Transfers a result set from the last query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>resource</type><methodname>MysqlndUhConnection::storeResult</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Transfers a result set from the last query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Resource of type <literal>Mysqlnd Resultset (internal only - you must not modify it!)</literal>.
-   The documentation may also refer to such resources using the alias name
-   <literal>mysqlnd_resultset</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::storeResult</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function storeResult($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::storeResult($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  var_dump($ret);
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$res = $mysqli->query("SELECT 'Also called buffered result' AS _msg FROM DUAL");
-var_dump($res->fetch_assoc());
-
-$mysqli->real_query("SELECT 'Good morning!' AS _msg FROM DUAL");
-$res = $mysqli->store_result();
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::storeResult(array (
-  0 => NULL,
-))
-proxy::storeResult returns NULL
-resource(475) of type (Mysqlnd Resultset (internal only - you must not modify it!))
-array(1) {
-  ["_msg"]=>
-  string(27) "Also called buffered result"
-}
-proxy::storeResult(array (
-  0 => NULL,
-))
-proxy::storeResult returns NULL
-resource(730) of type (Mysqlnd Resultset (internal only - you must not modify it!))
-array(1) {
-  ["_msg"]=>
-  string(13) "Good morning!"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_store_result</function>
-    </member>
-    <member>
-     <function>mysqli_real_query</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/txcommit.xml b/reference/mysqlnd_uh/mysqlnduhconnection/txcommit.xml
deleted file mode 100644
index a6cc565b0a..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/txcommit.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.txcommit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::txCommit</refname>
-  <refpurpose>Commits the current transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::txCommit</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Commits the current transaction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::txCommit</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function txCommit($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::txCommit($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->commit();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::txCommit(array (
-  0 => NULL,
-))
-proxy::txCommit returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_commit</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/txrollback.xml b/reference/mysqlnd_uh/mysqlnduhconnection/txrollback.xml
deleted file mode 100644
index ea5ec30795..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/txrollback.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.txrollback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::txRollback</refname>
-  <refpurpose>Rolls back current transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhConnection::txRollback</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Rolls back current transaction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::txRollback</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function txRollback($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::txRollback($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->rollback();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::txRollback(array (
-  0 => NULL,
-))
-proxy::txRollback returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_commit</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/useresult.xml b/reference/mysqlnd_uh/mysqlnduhconnection/useresult.xml
deleted file mode 100644
index 51cc712b3b..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhconnection/useresult.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhconnection.useresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhConnection::useResult</refname>
-  <refpurpose>Initiate a result set retrieval</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>resource</type><methodname>MysqlndUhConnection::useResult</methodname>
-   <methodparam><type>mysqlnd_connection</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Initiate a result set retrieval.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd connection handle. Do not modify!
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Resource of type <literal>Mysqlnd Resultset (internal only - you must not modify it!)</literal>.
-   The documentation may also refer to such resources using the alias name
-   <literal>mysqlnd_resultset</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhConnection::useResult</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function useResult($res) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $ret = parent::useResult($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  var_dump($ret);
-  return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->real_query("SELECT 'Good morning!' AS _msg FROM DUAL");
-$res = $mysqli->use_result();
-var_dump($res->fetch_assoc());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::useResult(array (
-  0 => NULL,
-))
-proxy::useResult returns NULL
-resource(425) of type (Mysqlnd Resultset (internal only - you must not modify it!))
-array(1) {
-  ["_msg"]=>
-  string(13) "Good morning!"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_connection_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_use_result</function>
-    </member>
-    <member>
-     <function>mysqli_real_query</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhpreparedstatement.xml b/reference/mysqlnd_uh/mysqlnduhpreparedstatement.xml
deleted file mode 100644
index 2aa5e68da8..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhpreparedstatement.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.mysqlnduhpreparedstatement" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MysqlndUhPreparedStatement class</title>
- <titleabbrev>MysqlndUhPreparedStatement</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MysqlndUhPreparedStatement intro -->
-  <section xml:id="mysqlnduhpreparedstatement.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysqlnduhpreparedstatement.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MysqlndUhPreparedStatement</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MysqlndUhPreparedStatement</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysqlnduhpreparedstatement')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysqlnd-uh.entities.mysqlnduhpreparedstatement;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhpreparedstatement/execute.xml b/reference/mysqlnd_uh/mysqlnduhpreparedstatement/execute.xml
deleted file mode 100644
index 66c9968b0a..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhpreparedstatement/execute.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhpreparedstatement.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhPreparedStatement::execute</refname>
-  <refpurpose>Executes a prepared Query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhPreparedStatement::execute</methodname>
-   <methodparam><type>mysqlnd_prepared_statement</type><parameter>statement</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Executes a prepared Query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>statement</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd prepared statement handle. Do not modify!
-      Resource of type <literal>Mysqlnd Prepared Statement (internal only - you must not modify it!)</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhPreparedStatement::execute</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class stmt_proxy extends MysqlndUhPreparedStatement {
- public function execute($res) {
-  printf("%s(", __METHOD__);
-  var_dump($res);
-  printf(")\n");
-  $ret = parent::execute($res);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  var_dump($ret);
-  return $ret;
- }
-}
-mysqlnd_uh_set_statement_proxy(new stmt_proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$stmt = $mysqli->prepare("SELECT 'Labskaus' AS _msg FROM DUAL");
-$stmt->execute();
-$msg = NULL;
-$stmt->bind_result($msg);
-$stmt->fetch();
-var_dump($msg);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-stmt_proxy::execute(resource(256) of type (Mysqlnd Prepared Statement (internal only - you must not modify it!))
-)
-stmt_proxy::execute returns true
-bool(true)
-string(8) "Labskaus"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_statement_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_stmt_execute</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/mysqlnduhpreparedstatement/prepare.xml b/reference/mysqlnd_uh/mysqlnduhpreparedstatement/prepare.xml
deleted file mode 100644
index 4c0d24a47a..0000000000
--- a/reference/mysqlnd_uh/mysqlnduhpreparedstatement/prepare.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysqlnduhpreparedstatement.prepare" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MysqlndUhPreparedStatement::prepare</refname>
-  <refpurpose>Prepare an SQL statement for execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MysqlndUhPreparedStatement::prepare</methodname>
-   <methodparam><type>mysqlnd_prepared_statement</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Prepare an SQL statement for execution.
-  </para>
-</refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>statement</parameter></term>
-    <listitem>
-     <para>
-      Mysqlnd prepared statement handle. Do not modify!
-      Resource of type <literal>Mysqlnd Prepared Statement (internal only - you must not modify it!)</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      The query to be prepared.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success.
-   Otherwise, returns &false;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>MysqlndUhPreparedStatement::prepare</function> example</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class stmt_proxy extends MysqlndUhPreparedStatement {
- public function prepare($res, $query) {
-  printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-  $query = "SELECT 'No more you-know-what-I-mean for lunch, please' AS _msg FROM DUAL";
-  $ret = parent::prepare($res, $query);
-  printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-  var_dump($ret);
-  return $ret;
- }
-}
-mysqlnd_uh_set_statement_proxy(new stmt_proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$stmt = $mysqli->prepare("SELECT 'Labskaus' AS _msg FROM DUAL");
-$stmt->execute();
-$msg = NULL;
-$stmt->bind_result($msg);
-$stmt->fetch();
-var_dump($msg);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-stmt_proxy::prepare(array (
-  0 => NULL,
-  1 => 'SELECT \'Labskaus\' AS _msg FROM DUAL',
-))
-stmt_proxy::prepare returns true
-bool(true)
-string(46) "No more you-know-what-I-mean for lunch, please"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     <function>mysqlnd_uh_set_statement_proxy</function>
-    </member>
-    <member>
-     <function>mysqli_stmt_prepare</function>
-    </member>
-    <member>
-     <function>mysqli_prepare</function>
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/quickstart.xml b/reference/mysqlnd_uh/quickstart.xml
deleted file mode 100644
index 62acc5efcf..0000000000
--- a/reference/mysqlnd_uh/quickstart.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="mysqlnd-uh.quickstart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Quickstart and Examples</title>
- <para>
-  The mysqlnd user handler plugin can be understood as a client-side proxy
-  for all PHP MySQL extensions (<link linkend="ref.mysqli">mysqli</link>,
-  <link linkend="ref.mysql">mysql</link>,
-  <link linkend="ref.pdo-mysql">PDO_MYSQL</link>), if they are compiled to
-  use the <link linkend="book.mysqlnd">mysqlnd</link> library. The
-  extensions use the <literal>mysqlnd</literal> library internally, at the C
-  level, to communicate with the MySQL server. PECL/mysqlnd_uh
-  allows it to hook many <literal>mysqlnd</literal> calls. Therefore,
-  most activities of the PHP MySQL extensions can be monitored.
- </para>
- <para>
-  Because monitoring happens at the level of the library, at a layer below the
-  application, it is possible to monitor applications without changing them.
- </para>
- <para>
-  On the C level, the <literal>mysqlnd</literal> library is structured in modules
-  or classes. The extension hooks almost all methods of the <literal>mysqlnd</literal>
-  internal <literal>connection</literal> class and exposes them through the
-  user space class <classname>MysqlndUhConnection</classname>. Some few methods of
-  the mysqlnd internal <literal>statement</literal> class are made available
-  to the PHP user with the class <classname>MysqlndUhPreparedStatement</classname>.
-  By subclassing the classes <classname>MysqlndUhConnection</classname> and
-  <classname>MysqlndUhPreparedStatement</classname> users get access to
-  <literal>mysqlnd</literal> internal function calls.
- </para>
- <note>
-  <para>
-   The internal <literal>mysqlnd</literal> function calls are not designed
-   to be exposed to the PHP user. Manipulating their activities may
-   cause PHP to crash or leak memory. Often, this is not considered a bug. Please,
-   keep in mind that you are accessing C library functions through
-   PHP which are expected to take certain actions, which you may not be able to
-   emulate in user space. Therefore, it is strongly recommended to always call
-   the parent method implementation when subclassing <classname>MysqlndUhConnection</classname>
-   or <classname>MysqlndUhPreparedStatement</classname>. To prevent the worst
-   case, the extension performs some sanity checks. Please, see also the
-   <link linkend="mysqlnd-uh.configuration">Mysqlnd_uh &ConfigureOptions;</link>.
-  </para>
- </note>
-
-
- <section xml:id="mysqlnd-uh.quickstart.configuration">
-  <title>Setup</title>
-  <para>
-   The plugin is implemented as a PHP extension. See the
-   <link linkend="mysqlnd-uh.installation">installation instructions</link> to
-   install the
-   <link xlink:href="&url.pecl.package;mysqlnd_ms">PECL/mysqlnd_uh</link> extension.
-   Then, load the extension into PHP and activate the plugin in the PHP configuration
-   file using the PHP configuration directive named
-   <link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link>.
-   The below example shows the default settings of the extension.
-  </para>
-  <para>
-   <example>
-    <title>Enabling the plugin (php.ini)</title>
-    <programlisting role="ini">
-<![CDATA[
-mysqlnd_uh.enable=1
-mysqlnd_uh.report_wrong_types=1
-]]>
-    </programlisting>
-    </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-uh.quickstart.how-it-works">
-  <title>How it works</title>
-  <para>
-   This describes the background and inner workings of the mysqlnd_uh
-   extension.
-  </para>
-  <para>
-   Two classes are provided by the extension: <classname>MysqlndUhConnection</classname>
-   and <classname>MysqlndUhPreparedStatement</classname>. <classname>MysqlndUhConnection</classname> lets
-   you access almost all methods of the <literal>mysqlnd</literal>
-   internal <literal>connection</literal> class. The latter exposes some selected
-   methods of the  <literal>mysqlnd</literal> internal <literal>statement</literal> class.
-   For example, <methodname>MysqlndUhConnection::connect</methodname> maps to
-   the <literal>mysqlnd</literal> library C function
-   <literal>mysqlnd_conn__connect</literal>.
-  </para>
-  <para>
-   As a mysqlnd plugin, the PECL/mysqlnd_uh extension replaces <literal>mysqlnd</literal>
-   library C functions with its own functions. Whenever a
-   PHP MySQL extension compiled to use <literal>mysqlnd</literal> calls
-   a mysqlnd function, the functions installed by the plugin are executed
-   instead of the original <literal>mysqlnd</literal> ones. For example,
-   <function>mysqli_connect</function> invokes <literal>mysqlnd_conn__connect</literal>,
-   so the connect function installed by PECL/mysqlnd_uh will be called.
-   The functions installed by PECL/mysqlnd_uh are the methods of the built-in classes.
-  </para>
-  <para>
-   The built-in PHP classes and their methods do nothing but call their
-   <literal>mysqlnd</literal> C library counterparts, to behave exactly
-   like the original <literal>mysqlnd</literal> function they replace.
-   The code below illustrates in pseudo-code what the extension does.
-  </para>
-  <para>
-   <example>
-    <title>Pseudo-code: what a built-in class does</title>
-    <programlisting>
-<![CDATA[
-class MysqlndUhConnection {
-  public function connect(($conn, $host, $user, $passwd, $db, $port, $socket, $mysql_flags) {
-    MYSQLND* c_mysqlnd_connection = convert_from_php_to_c($conn);
-    ...
-    return call_c_function(mysqlnd_conn__connect(c_mysqlnd_connection, ...));
-  }
-}
-]]>
-    </programlisting>
-    </example>
-  </para>
-  <para>
-   The build-in classes behave like a transparent proxy. It is possible for
-   you to replace the proxy with your own. This is done by subclassing
-   <classname>MysqlndUhConnection</classname> or
-   <classname>MysqlndUhPreparedStatement</classname> to extend the functionality
-   of the proxy, followed by registering a new proxy object.
-   Proxy objects are installed by
-   <function>mysqlnd_uh_set_connection_proxy</function>
-   and
-   <function>mysqlnd_uh_set_statement_proxy</function>.
-  </para>
-  <para>
-   <example>
-    <title>Installing a proxy</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
- public function connect($res, $host, $user, $passwd, $db, $port, $socket, $mysql_flags) {
-   printf("%s(%s)\n", __METHOD__, var_export(func_get_args(), true));
-   $ret = parent::connect($res, $host, $user, $passwd, $db, $port, $socket, $mysql_flags);
-   printf("%s returns %s\n", __METHOD__, var_export($ret, true));
-   return $ret;
- }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-proxy::connect(array (
-  0 => NULL,
-  1 => 'localhost',
-  2 => 'root',
-  3 => '',
-  4 => 'test',
-  5 => 3306,
-  6 => NULL,
-  7 => 131072,
-))
-proxy::connect returns true
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-uh.quickstart.proxy-installation">
-  <title>Installing a proxy</title>
-  <para>
-   The extension provides two built-in classes: <classname>MysqlndUhConnection</classname>
-   and <classname>MysqlndUhPreparedStatement</classname>. The classes are used
-   for hooking <literal>mysqlnd</literal> library calls. Their methods correspond
-   to <literal>mysqlnd</literal> internal functions. By default they act like
-   a transparent proxy and do nothing but call their <literal>mysqlnd</literal> counterparts.
-   By subclassing the classes you can install your own proxy to monitor <literal>mysqlnd</literal>.
-  </para>
-  <para>
-   See also the <link linkend="mysqlnd-uh.quickstart.how-it-works">How it works</link>
-   guide to learn about the inner workings of this extension.
-  </para>
-  <para>
-   Connection proxies are objects of the type <classname>MysqlndUhConnection</classname>.
-   Connection proxy objects are installed by
-   <function>mysqlnd_uh_set_connection_proxy</function>.
-   If you install the built-in class <classname>MysqlndUhConnection</classname>
-   as a proxy, nothing happens. It behaves like a transparent proxy.
-  </para>
- <para>
-   <example>
-    <title>Proxy registration, mysqlnd_uh.enable=1</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-mysqlnd_uh_set_connection_proxy(new MysqlndUhConnection());
-$mysqli = new mysqli("localhost", "root", "", "test");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   The <literal>PHP_INI_SYSTEM</literal> configuration setting
-   <literal><link linkend="ini.mysqlnd-uh.enable">mysqlnd_uh.enable</link></literal>
-   controls whether a proxy may be set. If disabled, the extension
-   will throw errors of type <literal>E_WARNING</literal>
-  </para>
-  <para>
-   <example>
-    <title>Proxy installation disabled</title>
-     <programlisting role="ini">
-<![CDATA[
-mysqlnd_uh.enable=0
-]]>
-    </programlisting>
-        <programlisting role="php">
-<![CDATA[
-<?php
-mysqlnd_uh_set_connection_proxy(new MysqlndUhConnection());
-$mysqli = new mysqli("localhost", "root", "", "test");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-PHP Warning:  MysqlndUhConnection::__construct(): (Mysqlnd User Handler) The plugin has been disabled by setting the configuration parameter mysqlnd_uh.enabled = false.  You must not use any of the base classes in %s on line %d
-PHP Warning:  mysqlnd_uh_set_connection_proxy(): (Mysqlnd User Handler) The plugin has been disabled by setting the configuration parameter mysqlnd_uh.enable = false. The proxy has not been installed  in %s on line %d
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   To monitor <literal>mysqlnd</literal>, you have to write your own
-   proxy object subclassing <classname>MysqlndUhConnection</classname>.
-   Please, see the function reference for a the list of methods that
-   can be subclassed. Alternatively, you can use reflection to inspect
-   the built-in <classname>MysqlndUhConnection</classname>.
-  </para>
-  <para>
-    Create a new class <literal>proxy</literal>. Derive it from the
-    built-in class <classname>MysqlndUhConnection</classname>.
-    Replace the
-    <function>MysqlndUhConnection::connect</function>.
-    method. Print out the host parameter value passed to the method.
-    Make sure that you call the parent implementation of the <literal>connect</literal>
-    method. Failing to do so may give unexpected and undesired results, including
-    memory leaks and crashes.
-  </para>
-  <para>
-   Register your proxy and open three connections using the PHP MySQL
-   extensions <link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>. If the extensions have been
-   compiled to use the <literal>mysqlnd</literal> library, the
-   <literal>proxy::connect</literal> method will be called three times, once
-   for each connection opened.
-  </para>
-  <para>
-   <example>
-    <title>Connection proxy</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class proxy extends MysqlndUhConnection {
-  public function connect($res, $host, $user, $passwd, $db, $port, $socket, $mysql_flags) {
-   printf("Connection opened to '%s'\n", $host);
-   /* Always call the parent implementation! */
-   return parent::connect($res, $host, $user, $passwd, $db, $port, $socket, $mysql_flags);
-  }
-}
-mysqlnd_uh_set_connection_proxy(new proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysql = mysql_connect("localhost", "root", "");
-$pdo = new PDO("mysql:host=localhost;dbname=test", "root", "");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Connection opened to 'localhost'
-Connection opened to 'localhost'
-Connection opened to 'localhost'
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   The use of prepared statement proxies follows the same pattern: create a
-   proxy object of the type <classname>MysqlndUhPreparedStatement</classname>
-   and install the proxy using
-   <function>mysqlnd_uh_set_statement_proxy</function>.
-  </para>
-  <para>
-   <example>
-    <title>Prepared statement proxy</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class stmt_proxy extends MysqlndUhPreparedStatement {
- public function prepare($res, $query) {
-  printf("%s(%s)\n", __METHOD__, $query);
-  return parent::prepare($res, $query);
- }
-}
-mysqlnd_uh_set_statement_proxy(new stmt_proxy());
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$stmt = $mysqli->prepare("SELECT 'mysqlnd hacking made easy' AS _msg FROM DUAL");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-stmt_proxy::prepare(SELECT 'mysqlnd hacking made easy' AS _msg FROM DUAL)
-]]>
-    </screen>
-   </example>
-  </para>
- </section>
-
- <section xml:id="mysqlnd-uh.quickstart.query-monitoring">
-  <title>Basic query monitoring</title>
-  <para>
-   Basic monitoring of a query statement is easy with PECL/mysqlnd_uh.
-   Combined with <function>debug_print_backtrace</function> it can become a powerful
-   tool, for example, to find the origin of certain statement. This may
-   be desired when searching for slow queries but also after database
-   refactoring to find code still accessing deprecated databases or
-   tables. The latter may be a complicated matter to do otherwise, especially if
-   the application uses auto-generated queries.
-  </para>
-  <para>
-   <example>
-    <title>Basic Monitoring</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class conn_proxy extends MysqlndUhConnection {
- public function query($res, $query) {
-  debug_print_backtrace();
-  return parent::query($res, $query);
- }
-}
-class stmt_proxy extends MysqlndUhPreparedStatement {
- public function prepare($res, $query) {
-  debug_print_backtrace();
-  return parent::prepare($res, $query);
- }
-}
-mysqlnd_uh_set_connection_proxy(new conn_proxy());
-mysqlnd_uh_set_statement_proxy(new stmt_proxy());
-
-printf("Proxies installed...\n");
-$pdo = new PDO("mysql:host=localhost;dbname=test", "root", "");
-var_dump($pdo->query("SELECT 1 AS _one FROM DUAL")->fetchAll(PDO::FETCH_ASSOC));
-
-$mysqli = new mysqli("localhost", "root", "", "test");
-$mysqli->prepare("SELECT 1 AS _two FROM DUAL");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-#0  conn_proxy->query(Resource id #19, SELECT 1 AS _one FROM DUAL)
-#1  PDO->query(SELECT 1 AS _one FROM DUAL) called at [example.php:19]
-array(1) {
-  [0]=>
-  array(1) {
-    ["_one"]=>
-    string(1) "1"
-  }
-}
-#0  stmt_proxy->prepare(Resource id #753, SELECT 1 AS _two FROM DUAL)
-#1  mysqli->prepare(SELECT 1 AS _two FROM DUAL) called at [example.php:22]
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   For basic query monitoring you should install a connection and a prepared statement
-   proxy. The connection proxy should subclass <function>MysqlndUhConnection::query</function>.
-   All database queries not using native prepared statements will call this method.
-   In the example the <literal>query</literal> function is invoked by a PDO call.
-   By default, <literal>PDO_MySQL</literal> is using prepared statement emulation.
-  </para>
-  <para>
-   All native prepared statements are prepared with the <literal>prepare</literal>
-   method of <literal>mysqlnd</literal> exported through
-   <methodname>MysqlndUhPreparedStatement::prepare</methodname>. Subclass
-   <classname>MysqlndUhPreparedStatement</classname> and overwrite <literal>prepare</literal>
-   for native prepared statement monitoring.
-  </para>
- </section>
-
-
-</chapter>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/reference.xml b/reference/mysqlnd_uh/reference.xml
deleted file mode 100644
index 0f3ec4ce56..0000000000
--- a/reference/mysqlnd_uh/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mysqlnd-uh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysqlnd_uh &Functions;</title>
-
- &reference.mysqlnd-uh.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/setup.xml b/reference/mysqlnd_uh/setup.xml
deleted file mode 100644
index c1c3da73fe..0000000000
--- a/reference/mysqlnd_uh/setup.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysqlnd-uh.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mysqlnd-uh.requirements">
-  &reftitle.required;
-  <para>
-    <literal>PHP 5.3.3</literal> or later.
-    It is recommended to use <literal>PHP 5.4.0</literal> or later
-    to get access to the latest mysqlnd features.
-  </para>
-  <para>
-   The <literal>mysqlnd_uh</literal> user handler
-   plugin supports all PHP applications and all available PHP MySQL extensions
-   (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>,
-   <link linkend="ref.pdo-mysql">PDO_MYSQL</link>).
-   The PHP MySQL extension must be configured to use
-   <link linkend="book.mysqlnd">mysqlnd</link>  in order to be able
-   to use the <literal>mysqlnd_uh</literal> plugin for
-   <link linkend="book.mysqlnd">mysqlnd</link>.
-  </para>
-  <para>
-    The alpha versions makes use of some <link linkend="ref.mysqli">mysqli</link> features.
-    You must enable <link linkend="ref.mysqli">mysqli</link> to compile the plugin.
-    This requirement may be removed in the future. Note, that this requirement
-    does not restrict you to use the plugin only with <literal>mysqli</literal>.
-    You can use the plugin to monitor <literal>mysql</literal>, <literal>mysqli</literal>
-    and <literal>PDO_MYSQL</literal>.
-  </para>
- </section>
-
- &reference.mysqlnd-uh.configure;
- &reference.mysqlnd-uh.ini;
-
- <section xml:id="mysqlnd-uh.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysqlnd_uh/versions.xml b/reference/mysqlnd_uh/versions.xml
deleted file mode 100644
index 80cc9c0d97..0000000000
--- a/reference/mysqlnd_uh/versions.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
- <!-- Functions -->
- <function name='mysqlnd_uh_set_connection_proxy' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnd_uh_set_statement_proxy' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnd_uh_convert_to_mysqlnd' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <!-- Methods -->
- <function name='mysqlnduhconnection::__construct' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::query' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::init' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::connect' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::escapestring' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::setcharset' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::sendquery' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::reapquery' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::useresult' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::storeresult' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::nextresult' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::moreresults' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::stmtinit' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::shutdownserver' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::refreshserver' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::ping' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::killconnection' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::selectdb' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::serverdumpdebuginformation' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::changeuser' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::geterrornumber' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::geterrorstring' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getsqlstate' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getthreadid' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getstatistics' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getserverversion' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getserverinformation' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getserverstatistics' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::gethostinformation' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getprotocolinformation' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getlastmessage' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::charsetname' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::listfields' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::listmethod' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getlastinsertid' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getaffectedrows' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getwarningcount' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::getfieldcount' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::setserveroption' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::setclientoption' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::close' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::queryreadresultsetheader' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::simplecommand' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::simplecommandhandleresponse' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::restartpsession' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::endpsession' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::sendclose' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::sslset' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhconnection::setAutocommit' from='PECL mysqlnd-uh &gt;= 1.0.1-alpha'/>
- <function name='mysqlnduhconnection::txCommit' from='PECL mysqlnd-uh &gt;= 1.0.1-alpha'/>
- <function name='mysqlnduhconnection::txRollback' from='PECL mysqlnd-uh &gt;= 1.0.1-alpha'/>
- <function name='mysqlnduhpreparedstatement::__construct' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhpreparedstatement::execute' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhpreparedstatement::prepare' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- 
- <!-- Classes -->
- <function name='mysqlnduhconnection' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
- <function name='mysqlnduhpreparedstatement' from='PECL mysqlnd-uh &gt;= 1.0.0-alpha'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/book.xml b/reference/ncurses/book.xml
deleted file mode 100644
index e995e96aea..0000000000
--- a/reference/ncurses/book.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
- 
-<book xml:id="book.ncurses" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Ncurses Terminal Screen Control</title>
- <titleabbrev>Ncurses</titleabbrev>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.ncurses">
-  &reftitle.intro;
-  <para>
-   ncurses (new curses) is a free software emulation of curses in
-   System V Rel 4.0 (and above). It uses terminfo format, supports pads,
-   colors, multiple highlights, form characters and function key mapping.
-   Because of the interactive nature of this library, it will be of little
-   use for writing Web applications, but may be useful when writing scripts meant
-   <link linkend="features.commandline">using PHP from the command line</link>.
-  </para>
-  <para>
-   The features available, such as colors, depend on the terminal that
-   you are using. Use functions such as <function>ncurses_has_colors</function>,
-   <function>ncurses_can_change_color</function>, and
-   <function>ncurses_has_ic</function> to check for individual capabilities.
-  </para>
-  <note>
-   <para>
-    &pecl.moved-ver;5.3.0.
-   </para>
-  </note>
-  <para>
-   ncurses is available for the following platforms:
-   <itemizedlist>
-    <listitem><simpara>AIX</simpara></listitem> 
-    <listitem><simpara>BeOS</simpara></listitem>
-    <listitem><simpara>BSD variants (FreeBSD, NetBSD, OpenBSD)</simpara></listitem>
-    <listitem><simpara>Cygwin</simpara></listitem> 
-    <listitem><simpara>Digital Unix (aka OSF1)</simpara></listitem>
-    <listitem><simpara>GNU/Linux</simpara></listitem>
-    <listitem><simpara>HPUX</simpara></listitem>
-    <listitem><simpara>IRIX64</simpara></listitem>
-    <listitem><simpara>macOS</simpara></listitem>
-    <listitem><simpara>OS/2</simpara></listitem>
-    <listitem><simpara>QNX</simpara></listitem>
-    <listitem><simpara>SCO OpenServer</simpara></listitem>
-    <listitem><simpara>Solaris</simpara></listitem>
-    <listitem><simpara>Tru64</simpara></listitem>
-   </itemizedlist>
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.ncurses.setup;
- &reference.ncurses.constants;
- &reference.ncurses.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ncurses/configure.xml b/reference/ncurses/configure.xml
deleted file mode 100644
index c9fd736dca..0000000000
--- a/reference/ncurses/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="ncurses.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;ncurses">&url.pecl.package;ncurses</link>.
- </para>
- <para>
-  Wide character <acronym>CRT</acronym> screen handling (ncursesw) support
-  was added in version 1.0.1 of this PECL extension.
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ncurses/constants.xml b/reference/ncurses/constants.xml
deleted file mode 100644
index 58ec160a5c..0000000000
--- a/reference/ncurses/constants.xml
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="ncurses.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <section xml:id="ncurses.errconsts">
-  <title>Error codes</title>
-   <para>
-    On error ncurses functions return <literal>-1</literal>.
-    Some functions return <literal>0</literal> on success. See the relevant
-    pages in the documentation for actual return values.
-   </para>
- </section>
-  <section xml:id="ncurses.colorconsts">
-   <title>Colors</title>
-    <table>
-     <title>ncurses color constants</title>
-     <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>constant</entry>
-         <entry>meaning</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row xml:id="constant.ncurses-color-black">
-         <entry><constant>NCURSES_COLOR_BLACK</constant></entry>
-         <entry>no color (black)</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-white">
-         <entry><constant>NCURSES_COLOR_WHITE</constant></entry>
-         <entry>white</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-red">
-         <entry><constant>NCURSES_COLOR_RED</constant></entry>
-         <entry>red - supported when terminal is in color mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-green">
-         <entry><constant>NCURSES_COLOR_GREEN</constant></entry>
-         <entry>green - supported when terminal is in color mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-yellow">
-         <entry><constant>NCURSES_COLOR_YELLOW</constant></entry>
-         <entry>yellow - supported when terminal is in color mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-blue">
-         <entry><constant>NCURSES_COLOR_BLUE</constant></entry>
-         <entry>blue - supported when terminal is in color mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-cyan">
-         <entry><constant>NCURSES_COLOR_CYAN</constant></entry>
-         <entry>cyan - supported when terminal is in color mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-color-magenta">
-         <entry><constant>NCURSES_COLOR_MAGENTA</constant></entry>
-         <entry>magenta - supported when terminal is in color mode</entry>
-        </row>
-       </tbody>
-     </tgroup>
-    </table>
-  </section>
-  <section xml:id="ncurses.keyconsts">
-  <title>Keys</title>
-    <table>
-     <title>ncurses key constants</title>
-     <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>constant</entry>
-         <entry>meaning</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row xml:id="constant.ncurses-key-f0">
-         <entry><constant>NCURSES_KEY_F0</constant> - <constant>NCURSES_KEY_F64</constant></entry>
-         <entry>function keys F1 - F64</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-down">
-         <entry><constant>NCURSES_KEY_DOWN</constant></entry>
-         <entry>down arrow</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-up">
-         <entry><constant>NCURSES_KEY_UP</constant></entry>
-         <entry>up arrow</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-left">
-         <entry><constant>NCURSES_KEY_LEFT</constant></entry>
-         <entry>left arrow</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-right">
-         <entry><constant>NCURSES_KEY_RIGHT</constant></entry>
-         <entry>right arrow</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-home">
-         <entry><constant>NCURSES_KEY_HOME</constant></entry>
-         <entry>home key (upward+left arrow)</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-backspace">
-         <entry><constant>NCURSES_KEY_BACKSPACE</constant></entry>
-         <entry>backspace</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-dl">
-         <entry><constant>NCURSES_KEY_DL</constant></entry>
-         <entry>delete line</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-il">
-         <entry><constant>NCURSES_KEY_IL</constant></entry>
-         <entry>insert line</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-dc">
-         <entry><constant>NCURSES_KEY_DC</constant></entry>
-         <entry>delete character</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-ic">
-         <entry><constant>NCURSES_KEY_IC</constant></entry>
-         <entry>insert char or enter insert mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-eic">
-         <entry><constant>NCURSES_KEY_EIC</constant></entry>
-         <entry>exit insert char mode</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-clear">
-         <entry><constant>NCURSES_KEY_CLEAR</constant></entry>
-         <entry>clear screen</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-eos">
-         <entry><constant>NCURSES_KEY_EOS</constant></entry>
-         <entry>clear to end of screen</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-eol">
-         <entry><constant>NCURSES_KEY_EOL</constant></entry>
-         <entry>clear to end of line</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sf">
-         <entry><constant>NCURSES_KEY_SF</constant></entry>
-         <entry>scroll one line forward</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sr">
-         <entry><constant>NCURSES_KEY_SR</constant></entry>
-         <entry>scroll one line backward</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-npage">
-         <entry><constant>NCURSES_KEY_NPAGE</constant></entry>
-         <entry>next page</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-ppage">
-         <entry><constant>NCURSES_KEY_PPAGE</constant></entry>
-         <entry>previous page</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-stab">
-         <entry><constant>NCURSES_KEY_STAB</constant></entry>
-         <entry>set tab</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-ctab">
-         <entry><constant>NCURSES_KEY_CTAB</constant></entry>
-         <entry>clear tab</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-catab">
-         <entry><constant>NCURSES_KEY_CATAB</constant></entry>
-         <entry>clear all tabs</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sreset">
-         <entry><constant>NCURSES_KEY_SRESET</constant></entry>
-         <entry>soft (partial) reset</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-reset">
-         <entry><constant>NCURSES_KEY_RESET</constant></entry>
-         <entry>reset or hard reset</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-print">
-         <entry><constant>NCURSES_KEY_PRINT</constant></entry>
-         <entry>print</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-ll">
-         <entry><constant>NCURSES_KEY_LL</constant></entry>
-         <entry>lower left</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-a1">
-         <entry><constant>NCURSES_KEY_A1</constant></entry>
-         <entry>upper left of keypad</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-a3">
-         <entry><constant>NCURSES_KEY_A3</constant></entry>
-         <entry>upper right of keypad</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-b2">
-         <entry><constant>NCURSES_KEY_B2</constant></entry>
-         <entry>center of keypad</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-c1">
-         <entry><constant>NCURSES_KEY_C1</constant></entry>
-         <entry>lower left of keypad</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-c3">
-         <entry><constant>NCURSES_KEY_C3</constant></entry>
-         <entry>lower right of keypad</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-btab">
-         <entry><constant>NCURSES_KEY_BTAB</constant></entry>
-         <entry>back tab</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-beg">
-         <entry><constant>NCURSES_KEY_BEG</constant></entry>
-         <entry>beginning</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-cancel">
-         <entry><constant>NCURSES_KEY_CANCEL</constant></entry>
-         <entry>cancel</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-close">
-         <entry><constant>NCURSES_KEY_CLOSE</constant></entry>
-         <entry>close</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-command">
-         <entry><constant>NCURSES_KEY_COMMAND</constant></entry>
-         <entry>cmd (command)</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-copy">
-         <entry><constant>NCURSES_KEY_COPY</constant></entry>
-         <entry>copy</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-create">
-         <entry><constant>NCURSES_KEY_CREATE</constant></entry>
-         <entry>create</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-end">
-         <entry><constant>NCURSES_KEY_END</constant></entry>
-         <entry>end</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-exit">
-         <entry><constant>NCURSES_KEY_EXIT</constant></entry>
-         <entry>exit</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-find">
-         <entry><constant>NCURSES_KEY_FIND</constant></entry>
-         <entry>find</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-help">
-         <entry><constant>NCURSES_KEY_HELP</constant></entry>
-         <entry>help</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-mark">
-         <entry><constant>NCURSES_KEY_MARK</constant></entry>
-         <entry>mark</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-message">
-         <entry><constant>NCURSES_KEY_MESSAGE</constant></entry>
-         <entry>message</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-move">
-         <entry><constant>NCURSES_KEY_MOVE</constant></entry>
-         <entry>move</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-next">
-         <entry><constant>NCURSES_KEY_NEXT</constant></entry>
-         <entry>next</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-open">
-         <entry><constant>NCURSES_KEY_OPEN</constant></entry>
-         <entry>open</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-options">
-         <entry><constant>NCURSES_KEY_OPTIONS</constant></entry>
-         <entry>options</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-previous">
-         <entry><constant>NCURSES_KEY_PREVIOUS</constant></entry>
-         <entry>previous</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-redo">
-         <entry><constant>NCURSES_KEY_REDO</constant></entry>
-         <entry>redo</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-reference">
-         <entry><constant>NCURSES_KEY_REFERENCE</constant></entry>
-         <entry>ref (reference)</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-refresh">
-         <entry><constant>NCURSES_KEY_REFRESH</constant></entry>
-         <entry>refresh</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-replace">
-         <entry><constant>NCURSES_KEY_REPLACE</constant></entry>
-         <entry>replace</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-restart">
-         <entry><constant>NCURSES_KEY_RESTART</constant></entry>
-         <entry>restart</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-resume">
-         <entry><constant>NCURSES_KEY_RESUME</constant></entry>
-         <entry>resume</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-save">
-         <entry><constant>NCURSES_KEY_SAVE</constant></entry>
-         <entry>save</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sbeg">
-         <entry><constant>NCURSES_KEY_SBEG</constant></entry>
-         <entry>shiftet beg (beginning)</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-scancel">
-         <entry><constant>NCURSES_KEY_SCANCEL</constant></entry>
-         <entry>shifted cancel</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-scommand">
-         <entry><constant>NCURSES_KEY_SCOMMAND</constant></entry>
-         <entry>shifted command</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-scopy">
-         <entry><constant>NCURSES_KEY_SCOPY</constant></entry>
-         <entry>shifted copy</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-screate">
-         <entry><constant>NCURSES_KEY_SCREATE</constant></entry>
-         <entry>shifted create</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sdc">
-         <entry><constant>NCURSES_KEY_SDC</constant></entry>
-         <entry>shifted delete char</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sdl">
-         <entry><constant>NCURSES_KEY_SDL</constant></entry>
-         <entry>shifted delete line</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-select">
-         <entry><constant>NCURSES_KEY_SELECT</constant></entry>
-         <entry>select</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-send">
-         <entry><constant>NCURSES_KEY_SEND</constant></entry>
-         <entry>shifted end</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-seol">
-         <entry><constant>NCURSES_KEY_SEOL</constant></entry>
-         <entry>shifted end of line</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sexit">
-         <entry><constant>NCURSES_KEY_SEXIT</constant></entry>
-         <entry>shifted exit</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sfind">
-         <entry><constant>NCURSES_KEY_SFIND</constant></entry>
-         <entry>shifted find</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-shelp">
-         <entry><constant>NCURSES_KEY_SHELP</constant></entry>
-         <entry>shifted help</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-shome">
-         <entry><constant>NCURSES_KEY_SHOME</constant></entry>
-         <entry>shifted home</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sic">
-         <entry><constant>NCURSES_KEY_SIC</constant></entry>
-         <entry>shifted input</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sleft">
-         <entry><constant>NCURSES_KEY_SLEFT</constant></entry>
-         <entry>shifted left arrow</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-smessage">
-         <entry><constant>NCURSES_KEY_SMESSAGE</constant></entry>
-         <entry>shifted message</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-smove">
-         <entry><constant>NCURSES_KEY_SMOVE</constant></entry>
-         <entry>shifted move</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-snext">
-         <entry><constant>NCURSES_KEY_SNEXT</constant></entry>
-         <entry>shifted next</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-soptions">
-         <entry><constant>NCURSES_KEY_SOPTIONS</constant></entry>
-         <entry>shifted options</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sprevious">
-         <entry><constant>NCURSES_KEY_SPREVIOUS</constant></entry>
-         <entry>shifted previous</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sprint">
-         <entry><constant>NCURSES_KEY_SPRINT</constant></entry>
-         <entry>shifted print</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sredo">
-         <entry><constant>NCURSES_KEY_SREDO</constant></entry>
-         <entry>shifted redo</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sreplace">
-         <entry><constant>NCURSES_KEY_SREPLACE</constant></entry>
-         <entry>shifted replace</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-sright">
-         <entry><constant>NCURSES_KEY_SRIGHT</constant></entry>
-         <entry>shifted right arrow</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-srsume">
-         <entry><constant>NCURSES_KEY_SRSUME</constant></entry>
-         <entry>shifted resume</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-ssave">
-         <entry><constant>NCURSES_KEY_SSAVE</constant></entry>
-         <entry>shifted save</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-ssuspend">
-         <entry><constant>NCURSES_KEY_SSUSPEND</constant></entry>
-         <entry>shifted suspend</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-undo">
-         <entry><constant>NCURSES_KEY_UNDO</constant></entry>
-         <entry>undo</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-mouse">
-         <entry><constant>NCURSES_KEY_MOUSE</constant></entry>
-         <entry>mouse event has occurred</entry>
-        </row>
-        <row xml:id="constant.ncurses-key-max">
-         <entry><constant>NCURSES_KEY_MAX</constant></entry>
-         <entry>maximum key value</entry>
-        </row>
-       </tbody>
-     </tgroup>
-    </table>
-  </section>
-  <section xml:id="ncurses.mouseconsts">
-   <title>Mouse</title>
-   <table>
-    <title>mouse constants</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>meaning</entry>
-      </row>
-     </thead>
-     <tbody>
-        <row xml:id="constant.ncurses-button1-released">
-         <entry><constant>NCURSES_BUTTON1_RELEASED</constant> - <constant>NCURSES_BUTTON4_RELEASED</constant></entry>
-         <entry>button (1-4) released</entry>
-        </row>
-        <row xml:id="constant.ncurses-button1-pressed">
-         <entry><constant>NCURSES_BUTTON1_PRESSED</constant> - <constant>NCURSES_BUTTON4_PRESSED</constant></entry>
-         <entry>button (1-4) pressed</entry>
-        </row>
-        <row xml:id="constant.ncurses-button1-clicked">
-         <entry><constant>NCURSES_BUTTON1_CLICKED</constant> - <constant>NCURSES_BUTTON4_CLICKED</constant></entry>
-         <entry>button (1-4) clicked</entry>
-        </row>
-        <row xml:id="constant.ncurses-button1-double-clicked">
-         <entry><constant>NCURSES_BUTTON1_DOUBLE_CLICKED</constant> -
-         <constant>NCURSES_BUTTON4_DOUBLE_CLICKED</constant></entry>
-         <entry>button (1-4) double clicked</entry>
-        </row>
-        <row xml:id="constant.ncurses-button1-triple-clicked">
-         <entry><constant>NCURSES_BUTTON1_TRIPLE_CLICKED</constant> -
-         <constant>NCURSES_BUTTON4_TRIPLE_CLICKED</constant></entry>
-         <entry>button (1-4) triple clicked</entry>
-        </row>
-        <row xml:id="constant.ncurses-button-ctrl">
-         <entry><constant>NCURSES_BUTTON_CTRL</constant></entry>
-         <entry>ctrl pressed during click</entry>
-        </row>
-        <row xml:id="constant.ncurses-button-shift">
-         <entry><constant>NCURSES_BUTTON_SHIFT</constant></entry>
-         <entry>shift pressed during click</entry>
-        </row>
-        <row xml:id="constant.ncurses-button-alt">
-         <entry><constant>NCURSES_BUTTON_ALT</constant></entry>
-         <entry>alt pressed during click</entry>
-        </row>
-        <row xml:id="constant.ncurses-all-mouse-events">
-         <entry><constant>NCURSES_ALL_MOUSE_EVENTS</constant></entry>
-         <entry>report all mouse events</entry>
-        </row>
-        <row xml:id="constant.ncurses-report-mouse-position">
-         <entry><constant>NCURSES_REPORT_MOUSE_POSITION</constant></entry>
-         <entry>report mouse position</entry>
-        </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </section>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-addch.xml b/reference/ncurses/functions/ncurses-addch.xml
deleted file mode 100644
index 9be4571428..0000000000
--- a/reference/ncurses/functions/ncurses-addch.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-addch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_addch</refname>
-  <refpurpose>Add character at current position and advance cursor </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_addch</methodname>
-   <methodparam><type>int</type><parameter>ch</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ch</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-addchnstr.xml b/reference/ncurses/functions/ncurses-addchnstr.xml
deleted file mode 100644
index 013ff8a7f5..0000000000
--- a/reference/ncurses/functions/ncurses-addchnstr.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-addchnstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_addchnstr</refname>
-  <refpurpose>Add attributed string with specified length at current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_addchnstr</methodname>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-addchstr.xml b/reference/ncurses/functions/ncurses-addchstr.xml
deleted file mode 100644
index d96b4828fc..0000000000
--- a/reference/ncurses/functions/ncurses-addchstr.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-addchstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_addchstr</refname>
-  <refpurpose>Add attributed string at current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_addchstr</methodname>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-addnstr.xml b/reference/ncurses/functions/ncurses-addnstr.xml
deleted file mode 100644
index 6220eb91c5..0000000000
--- a/reference/ncurses/functions/ncurses-addnstr.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-addnstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_addnstr</refname>
-  <refpurpose>Add string with specified length at current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_addnstr</methodname>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-addstr.xml b/reference/ncurses/functions/ncurses-addstr.xml
deleted file mode 100644
index fb1f36748e..0000000000
--- a/reference/ncurses/functions/ncurses-addstr.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-addstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_addstr</refname>
-  <refpurpose>Output text at current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_addstr</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-assume-default-colors.xml b/reference/ncurses/functions/ncurses-assume-default-colors.xml
deleted file mode 100644
index 3177580c91..0000000000
--- a/reference/ncurses/functions/ncurses-assume-default-colors.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-assume-default-colors" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_assume_default_colors</refname>
-  <refpurpose>Define default colors for color 0 </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_assume_default_colors</methodname>
-   <methodparam><type>int</type><parameter>fg</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-attroff.xml b/reference/ncurses/functions/ncurses-attroff.xml
deleted file mode 100644
index 032e6c48d5..0000000000
--- a/reference/ncurses/functions/ncurses-attroff.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-attroff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_attroff</refname>
-  <refpurpose>Turn off the given attributes</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_attroff</methodname>
-   <methodparam><type>int</type><parameter>attributes</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attributes</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-attron.xml b/reference/ncurses/functions/ncurses-attron.xml
deleted file mode 100644
index 1db50e20dc..0000000000
--- a/reference/ncurses/functions/ncurses-attron.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-attron" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_attron</refname>
-  <refpurpose>Turn on the given attributes</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_attron</methodname>
-   <methodparam><type>int</type><parameter>attributes</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attributes</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-attrset.xml b/reference/ncurses/functions/ncurses-attrset.xml
deleted file mode 100644
index 443eeeeae6..0000000000
--- a/reference/ncurses/functions/ncurses-attrset.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-attrset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_attrset</refname>
-  <refpurpose>Set given attributes</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_attrset</methodname>
-   <methodparam><type>int</type><parameter>attributes</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attributes</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-baudrate.xml b/reference/ncurses/functions/ncurses-baudrate.xml
deleted file mode 100644
index aa8cfba997..0000000000
--- a/reference/ncurses/functions/ncurses-baudrate.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-baudrate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_baudrate</refname>
-  <refpurpose>Returns baudrate of terminal </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_baudrate</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-beep.xml b/reference/ncurses/functions/ncurses-beep.xml
deleted file mode 100644
index c8c30024f0..0000000000
--- a/reference/ncurses/functions/ncurses-beep.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-beep" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_beep</refname>
-  <refpurpose>Let the terminal beep </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_beep</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   <function>ncurses_beep</function> sends an audible alert (bell)
-   and if its not possible flashes the screen.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_flash</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-bkgd.xml b/reference/ncurses/functions/ncurses-bkgd.xml
deleted file mode 100644
index 892d999f2f..0000000000
--- a/reference/ncurses/functions/ncurses-bkgd.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-bkgd" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_bkgd</refname>
-  <refpurpose>Set background property for terminal screen </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_bkgd</methodname>
-   <methodparam><type>int</type><parameter>attrchar</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attrchar</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-bkgdset.xml b/reference/ncurses/functions/ncurses-bkgdset.xml
deleted file mode 100644
index 16e33b8d4e..0000000000
--- a/reference/ncurses/functions/ncurses-bkgdset.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-bkgdset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_bkgdset</refname>
-  <refpurpose>Control screen background </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_bkgdset</methodname>
-   <methodparam><type>int</type><parameter>attrchar</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attrchar</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-border.xml b/reference/ncurses/functions/ncurses-border.xml
deleted file mode 100644
index f6fe9f0cbd..0000000000
--- a/reference/ncurses/functions/ncurses-border.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-border" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_border</refname>
-  <refpurpose>Draw a border around the screen using attributed characters</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_border</methodname>
-   <methodparam><type>int</type><parameter>left</parameter></methodparam>
-   <methodparam><type>int</type><parameter>right</parameter></methodparam>
-   <methodparam><type>int</type><parameter>top</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bottom</parameter></methodparam>
-   <methodparam><type>int</type><parameter>tl_corner</parameter></methodparam>
-   <methodparam><type>int</type><parameter>tr_corner</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bl_corner</parameter></methodparam>
-   <methodparam><type>int</type><parameter>br_corner</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Draws the specified lines and corners around the main window. 
-  </para>
-  <para>
-   Use <function>ncurses_wborder</function> for borders around subwindows!
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   Every parameter expects 0 to draw a line or 1 to skip it.
-   <variablelist>
-    <varlistentry>
-     <term><parameter>left</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>right</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>top</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tl_corner</parameter></term>
-     <listitem>
-      <para>
-       Top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tr_corner</parameter></term>
-     <listitem>
-      <para>
-       Top right corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bl_corner</parameter></term>
-     <listitem>
-      <para>
-       Bottom left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>br_corner</parameter></term>
-     <listitem>
-      <para>
-       Bottom right corner
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_wborder</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-bottom-panel.xml b/reference/ncurses/functions/ncurses-bottom-panel.xml
deleted file mode 100644
index 4200357c2c..0000000000
--- a/reference/ncurses/functions/ncurses-bottom-panel.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-bottom-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_bottom_panel</refname>
-  <refpurpose>Moves a visible panel to the bottom of the stack</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_bottom_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-can-change-color.xml b/reference/ncurses/functions/ncurses-can-change-color.xml
deleted file mode 100644
index a045fbef97..0000000000
--- a/reference/ncurses/functions/ncurses-can-change-color.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-can-change-color" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_can_change_color</refname>
-  <refpurpose>Checks if terminal color definitions can be changed</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_can_change_color</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Checks whether the terminal has color capabilities and whether the
-   programmer can change color definitions using
-   <function>ncurses_init_color</function>. ncurses must be initialized
-   using <function>ncurses_init</function> before calling this function.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return &true; if the programmer can change color definitions,
-   &false; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_has_colors</function></member>
-    <member><function>ncurses_init_color</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-cbreak.xml b/reference/ncurses/functions/ncurses-cbreak.xml
deleted file mode 100644
index 1d95762230..0000000000
--- a/reference/ncurses/functions/ncurses-cbreak.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-cbreak" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_cbreak</refname>
-  <refpurpose>Switch off input buffering</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_cbreak</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Disables line buffering and character processing (interrupt and flow
-   control characters are unaffected), making characters typed by the user
-   immediately available to the program.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; or <constant>NCURSES_ERR</constant> if any error occurred.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_nocbreak</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-clear.xml b/reference/ncurses/functions/ncurses-clear.xml
deleted file mode 100644
index 6fdcc0395c..0000000000
--- a/reference/ncurses/functions/ncurses-clear.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-clear" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_clear</refname>
-  <refpurpose>Clear screen </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_clear</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Clears the screen completely without setting blanks.
-  </para>
-  <para>
-   Note: <function>ncurses_clear</function> clears the screen without
-   setting blanks, which have the current background rendition. To
-   clear screen with blanks, use <function>ncurses_erase</function>.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_erase</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-clrtobot.xml b/reference/ncurses/functions/ncurses-clrtobot.xml
deleted file mode 100644
index f8cae81a35..0000000000
--- a/reference/ncurses/functions/ncurses-clrtobot.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-clrtobot" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_clrtobot</refname>
-  <refpurpose>Clear screen from current position to bottom </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_clrtobot</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Erases all lines from cursor to end of screen and creates blanks. Blanks
-   created by <function>ncurses_clrtobot</function> have the current 
-   background rendition.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_clear</function></member>
-    <member><function>ncurses_clrtoeol</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-clrtoeol.xml b/reference/ncurses/functions/ncurses-clrtoeol.xml
deleted file mode 100644
index 4c39b7afd0..0000000000
--- a/reference/ncurses/functions/ncurses-clrtoeol.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-clrtoeol" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_clrtoeol</refname>
-  <refpurpose>Clear screen from current position to end of line </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_clrtoeol</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Erases the current line from cursor position to the end. Blanks created by
-   <function>ncurses_clrtoeol</function> have the current background
-   rendition.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_clear</function></member>
-    <member><function>ncurses_clrtobot</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-color-content.xml b/reference/ncurses/functions/ncurses-color-content.xml
deleted file mode 100644
index 0aed29928e..0000000000
--- a/reference/ncurses/functions/ncurses-color-content.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-color-content" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_color_content</refname>
-  <refpurpose>Retrieves RGB components of a color</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_color_content</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">r</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">g</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves the red, green, and blue components for the given color definition.
-   Terminal color capabilities must be initialized with
-   <function>ncurses_start_color</function> prior to calling this function.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The number of the color to retrieve information for. May be one of the
-       pre-defined color constants.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>r</parameter></term>
-     <listitem>
-      <para>
-       A reference to which to return the red component of the color. The value
-       returned to the reference will be between 0 and 1000.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>g</parameter></term>
-     <listitem>
-      <para>
-       A reference to which to return the green component of the color. The value
-       returned to the reference will be between 0 and 1000.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       A reference to which to return the blue component of the color. The value
-       returned to the reference will be between 0 and 1000.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <literal>-1</literal> if the function was successful, and
-   <literal>0</literal> if ncurses or terminal color capabilities have not been
-   initialized.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_init_color</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-color-set.xml b/reference/ncurses/functions/ncurses-color-set.xml
deleted file mode 100644
index f5a0236697..0000000000
--- a/reference/ncurses/functions/ncurses-color-set.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-color-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_color_set</refname>
-  <refpurpose>Set active foreground and background colors</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_color_set</methodname>
-   <methodparam><type>int</type><parameter>pair</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the active foreground and background colors. Any characters written
-   after this function is invoked will have these colors. This function requires
-   terminal colors to be supported and initialized using
-   <function>ncurses_start_color</function> beforehand.
-  </para>
-  <para>
-   ncurses uses color pairs to specify both foreground and background colors.
-   Use <function>ncurses_init_pair</function> to define a color pair.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pair</parameter></term>
-     <listitem>
-      <para>
-       The color pair from which to get the foreground and background colors
-       to set as the active colors.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <literal>-1</literal> on success, and <literal>0</literal> on failure.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Writing a string with a specified color to the screen</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-ncurses_init();
-
-// If the terminal supports colors, initialize and set active color
-if (ncurses_has_colors()) {
-    ncurses_start_color();
-    ncurses_init_pair(1, NCURSES_COLOR_YELLOW, NCURSES_COLOR_BLUE);
-    ncurses_color_set(1);
-}
-
-// Write a string at specified location
-ncurses_mvaddstr(10, 10, "Hello world! Yellow on blue text!");
-
-// Flush output to screen
-ncurses_refresh();
-
-ncurses_end();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_init_pair</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-curs-set.xml b/reference/ncurses/functions/ncurses-curs-set.xml
deleted file mode 100644
index ff4fd5b141..0000000000
--- a/reference/ncurses/functions/ncurses-curs-set.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-curs-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_curs_set</refname>
-  <refpurpose>Set cursor state </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_curs_set</methodname>
-   <methodparam><type>int</type><parameter>visibility</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>visibility</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-def-prog-mode.xml b/reference/ncurses/functions/ncurses-def-prog-mode.xml
deleted file mode 100644
index 8115b0b54f..0000000000
--- a/reference/ncurses/functions/ncurses-def-prog-mode.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-def-prog-mode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_def_prog_mode</refname>
-  <refpurpose>Saves terminals (program) mode</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_def_prog_mode</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Saves the current terminal modes for program (in curses) for use by
-   <function>ncurses_reset_prog_mode</function>. 
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, otherwise &true;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_reset_prog_mode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-def-shell-mode.xml b/reference/ncurses/functions/ncurses-def-shell-mode.xml
deleted file mode 100644
index 95efffdfd5..0000000000
--- a/reference/ncurses/functions/ncurses-def-shell-mode.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-def-shell-mode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_def_shell_mode</refname>
-  <refpurpose>Saves terminals (shell) mode</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_def_shell_mode</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Saves the current terminal modes for shell (not in curses) for use by
-   <function>ncurses_reset_shell_mode</function>. 
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, &true; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_reset_shell_mode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-define-key.xml b/reference/ncurses/functions/ncurses-define-key.xml
deleted file mode 100644
index 5d5f9205b6..0000000000
--- a/reference/ncurses/functions/ncurses-define-key.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-define-key" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_define_key</refname>
-  <refpurpose>Define a keycode </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_define_key</methodname>
-   <methodparam><type>string</type><parameter>definition</parameter></methodparam>
-   <methodparam><type>int</type><parameter>keycode</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>definition</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>keycode</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-del-panel.xml b/reference/ncurses/functions/ncurses-del-panel.xml
deleted file mode 100644
index 9e18d8241f..0000000000
--- a/reference/ncurses/functions/ncurses-del-panel.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-del-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_del_panel</refname>
-  <refpurpose>Remove panel from the stack and delete it (but not the associated window)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_del_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-delay-output.xml b/reference/ncurses/functions/ncurses-delay-output.xml
deleted file mode 100644
index f766c86ff9..0000000000
--- a/reference/ncurses/functions/ncurses-delay-output.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-delay-output" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_delay_output</refname>
-  <refpurpose>Delay output on terminal using padding characters </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_delay_output</methodname>
-   <methodparam><type>int</type><parameter>milliseconds</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>milliseconds</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-delch.xml b/reference/ncurses/functions/ncurses-delch.xml
deleted file mode 100644
index 06fc775900..0000000000
--- a/reference/ncurses/functions/ncurses-delch.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-delch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_delch</refname>
-  <refpurpose>Delete character at current position, move rest of line left </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_delch</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Deletes the character under the cursor. All characters to the right of the
-   cursor on the same line are moved to the left one position and the last 
-   character on the line is filled with a blank. The cursor position does not
-   change. 
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, &true; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_deleteln</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-deleteln.xml b/reference/ncurses/functions/ncurses-deleteln.xml
deleted file mode 100644
index 7fbd7e2a31..0000000000
--- a/reference/ncurses/functions/ncurses-deleteln.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-deleteln" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_deleteln</refname>
-  <refpurpose>Delete line at current position, move rest of screen up </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_deleteln</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Deletes the current line under cursor position. All lines below the current
-   line are moved up one line. The bottom line of window is cleared. Cursor
-   position does not change.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, otherwise &true;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_delch</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-delwin.xml b/reference/ncurses/functions/ncurses-delwin.xml
deleted file mode 100644
index 20e94e970c..0000000000
--- a/reference/ncurses/functions/ncurses-delwin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-delwin" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_delwin</refname>
-  <refpurpose>Delete a ncurses window </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_delwin</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-doupdate.xml b/reference/ncurses/functions/ncurses-doupdate.xml
deleted file mode 100644
index fbff094821..0000000000
--- a/reference/ncurses/functions/ncurses-doupdate.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-doupdate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_doupdate</refname>
-  <refpurpose>Write all prepared refreshes to terminal </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_doupdate</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Compares the virtual screen to the physical screen and updates the
-   physical screen. This way is more effective than using multiple refresh
-   calls.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-echo.xml b/reference/ncurses/functions/ncurses-echo.xml
deleted file mode 100644
index 1cf6c93f6f..0000000000
--- a/reference/ncurses/functions/ncurses-echo.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-echo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_echo</refname>
-  <refpurpose>Activate keyboard input echo </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_echo</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Enables echo mode. All characters typed by user are echoed by
-   <function>ncurses_getch</function>.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, &true; if any error occurred.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_noecho</function> to disable echo mode</member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-echochar.xml b/reference/ncurses/functions/ncurses-echochar.xml
deleted file mode 100644
index e167fd4bbf..0000000000
--- a/reference/ncurses/functions/ncurses-echochar.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-echochar" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_echochar</refname>
-  <refpurpose>Single character output including refresh </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_echochar</methodname>
-   <methodparam><type>int</type><parameter>character</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>character</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-end.xml b/reference/ncurses/functions/ncurses-end.xml
deleted file mode 100644
index 60f9a284a7..0000000000
--- a/reference/ncurses/functions/ncurses-end.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-end" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_end</refname>
-  <refpurpose>Stop using ncurses, clean up the screen </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_end</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-erase.xml b/reference/ncurses/functions/ncurses-erase.xml
deleted file mode 100644
index 94659cee93..0000000000
--- a/reference/ncurses/functions/ncurses-erase.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-erase" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_erase</refname>
-  <refpurpose>Erase terminal screen </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_erase</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Fills the terminal screen with blanks.
-  </para>
-  <para>
-   Created blanks have the current background rendition, set by
-   <function>ncurses_bkgd</function>.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_bkgd</function></member>
-    <member><function>ncurses_clear</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-<sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-erasechar.xml b/reference/ncurses/functions/ncurses-erasechar.xml
deleted file mode 100644
index a7824bd528..0000000000
--- a/reference/ncurses/functions/ncurses-erasechar.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-erasechar" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_erasechar</refname>
-  <refpurpose>Returns current erase character </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ncurses_erasechar</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Returns the current erase character.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current erase char, as a string.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_killchar</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-filter.xml b/reference/ncurses/functions/ncurses-filter.xml
deleted file mode 100644
index 46183c2058..0000000000
--- a/reference/ncurses/functions/ncurses-filter.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-filter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_filter</refname>
-  <refpurpose>Set LINES for iniscr() and newterm() to 1</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_filter</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-flash.xml b/reference/ncurses/functions/ncurses-flash.xml
deleted file mode 100644
index 06942e295e..0000000000
--- a/reference/ncurses/functions/ncurses-flash.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-flash" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_flash</refname>
-  <refpurpose>Flash terminal screen (visual bell) </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_flash</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Flashes the screen, and if its not possible, sends an audible alert
-   (bell).
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, otherwise &true;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_beep</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-flushinp.xml b/reference/ncurses/functions/ncurses-flushinp.xml
deleted file mode 100644
index 2c76760d8d..0000000000
--- a/reference/ncurses/functions/ncurses-flushinp.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-flushinp" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_flushinp</refname>
-  <refpurpose>Flush keyboard input buffer </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_flushinp</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Throws away any typeahead that has been typed and has not yet been read by
-   your program.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, otherwise &true;.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-getch.xml b/reference/ncurses/functions/ncurses-getch.xml
deleted file mode 100644
index eee832e11b..0000000000
--- a/reference/ncurses/functions/ncurses-getch.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-getch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_getch</refname>
-  <refpurpose>Read a character from keyboard </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_getch</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-getmaxyx.xml b/reference/ncurses/functions/ncurses-getmaxyx.xml
deleted file mode 100644
index e6dcda6499..0000000000
--- a/reference/ncurses/functions/ncurses-getmaxyx.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-getmaxyx" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_getmaxyx</refname>
-  <refpurpose>Returns the size of a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_getmaxyx</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Gets the horizontal and vertical size of the given 
-   <parameter>window</parameter> into the given variables.
-  </para>
-  <para>
-   Variables must be passed as reference, so they are updated when the user
-   changes the terminal size.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-       The measured window
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       This will be set to the window height
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       This will be set to the window width
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-getmouse.xml b/reference/ncurses/functions/ncurses-getmouse.xml
deleted file mode 100644
index 28f16ad973..0000000000
--- a/reference/ncurses/functions/ncurses-getmouse.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-getmouse" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_getmouse</refname>
-  <refpurpose>Reads mouse event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_getmouse</methodname>
-   <methodparam><type>array</type><parameter role="reference">mevent</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   <function>ncurses_getmouse</function> reads mouse event out of
-   queue. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mevent</parameter></term>
-     <listitem>
-      <para>
-       Event options will be delivered in this parameter which has to be an
-       array, passed by reference (see example below).
-      </para>
-      <para>
-       On success an associative array with following keys will be delivered:
-       <itemizedlist>
-        <listitem>
-         <para>
-          "id" : Id to distinguish multiple devices
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          "x" : screen relative x-position in character cells
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          "y" : screen relative y-position in character cells
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          "z" : currently not supported
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          "mmask" : Mouse action
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; if a mouse event is actually visible in the given window,
-   otherwise returns &true;.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>ncurses_getmouse</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-switch (ncurses_getch()){
-  case NCURSES_KEY_MOUSE:
-    if (!ncurses_getmouse($mevent)){
-      if ($mevent["mmask"] & NCURSES_MOUSE_BUTTON1_PRESSED){
-        $mouse_x = $mevent["x"]; // Save mouse position
-        $mouse_y = $mevent["y"];
-      }
-    }
-  break;
-
-  default:
-    /* .... */
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_ungetmouse</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-getyx.xml b/reference/ncurses/functions/ncurses-getyx.xml
deleted file mode 100644
index 25e53b90fd..0000000000
--- a/reference/ncurses/functions/ncurses-getyx.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.ncurses-getyx" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_getyx</refname>
-  <refpurpose>Returns the current cursor position for a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_getyx</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-halfdelay.xml b/reference/ncurses/functions/ncurses-halfdelay.xml
deleted file mode 100644
index 691d37cc69..0000000000
--- a/reference/ncurses/functions/ncurses-halfdelay.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-halfdelay" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_halfdelay</refname>
-  <refpurpose>Put terminal into halfdelay mode </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_halfdelay</methodname>
-   <methodparam><type>int</type><parameter>tenth</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>tenth</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-has-colors.xml b/reference/ncurses/functions/ncurses-has-colors.xml
deleted file mode 100644
index fd943ad519..0000000000
--- a/reference/ncurses/functions/ncurses-has-colors.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-has-colors" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_has_colors</refname>
-  <refpurpose>Checks if terminal has color capabilities</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_has_colors</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Checks whether the terminal has color capabilities. This function can be
-   used to write terminal-independent programs. ncurses must be initialized
-   using <function>ncurses_init</function> before calling this function.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return &true; if the terminal has color capabilities, &false; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Writing a string with a specified color to the screen</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-ncurses_init();
-
-// If the terminal supports colors, initialize and set active color
-if (ncurses_has_colors()) {
-    ncurses_start_color();
-    ncurses_init_pair(1, NCURSES_COLOR_YELLOW, NCURSES_COLOR_BLUE);
-    ncurses_color_set(1);
-}
-
-// Write a string at specified location
-ncurses_mvaddstr(10, 10, "Hello world! Yellow on blue text!");
-
-// Flush output to screen
-ncurses_refresh();
-
-ncurses_end();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_can_change_color</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-has-ic.xml b/reference/ncurses/functions/ncurses-has-ic.xml
deleted file mode 100644
index 07127bf575..0000000000
--- a/reference/ncurses/functions/ncurses-has-ic.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-has-ic" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_has_ic</refname>
-  <refpurpose>Check for insert- and delete-capabilities </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_has_ic</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Checks whether the terminal has insert and delete capabilities.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the terminal has insert/delete-capabilities, &false;
-   otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_has_il</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-has-il.xml b/reference/ncurses/functions/ncurses-has-il.xml
deleted file mode 100644
index f45b8f9eaf..0000000000
--- a/reference/ncurses/functions/ncurses-has-il.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-has-il" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_has_il</refname>
-  <refpurpose>Check for line insert- and delete-capabilities </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_has_il</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Checks whether the terminal has insert- and delete-line-capabilities.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the terminal has insert/delete-line capabilities,
-   &false; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_has_ic</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-has-key.xml b/reference/ncurses/functions/ncurses-has-key.xml
deleted file mode 100644
index 6af52875cb..0000000000
--- a/reference/ncurses/functions/ncurses-has-key.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-has-key" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_has_key</refname>
-  <refpurpose>Check for presence of a function key on terminal keyboard </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_has_key</methodname>
-   <methodparam><type>int</type><parameter>keycode</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keycode</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-hide-panel.xml b/reference/ncurses/functions/ncurses-hide-panel.xml
deleted file mode 100644
index 07f178750e..0000000000
--- a/reference/ncurses/functions/ncurses-hide-panel.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.ncurses-hide-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_hide_panel</refname>
-  <refpurpose>Remove panel from the stack, making it invisible</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_hide_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-hline.xml b/reference/ncurses/functions/ncurses-hline.xml
deleted file mode 100644
index f823e26316..0000000000
--- a/reference/ncurses/functions/ncurses-hline.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-hline" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_hline</refname>
-  <refpurpose>Draw a horizontal line at current position using an attributed character and max. n characters long </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_hline</methodname>
-   <methodparam><type>int</type><parameter>charattr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>charattr</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-inch.xml b/reference/ncurses/functions/ncurses-inch.xml
deleted file mode 100644
index 0298867839..0000000000
--- a/reference/ncurses/functions/ncurses-inch.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-inch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_inch</refname>
-  <refpurpose>Get character and attribute at current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ncurses_inch</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Returns the character from the current position.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the character, as a string.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-init-color.xml b/reference/ncurses/functions/ncurses-init-color.xml
deleted file mode 100644
index 38de94ee53..0000000000
--- a/reference/ncurses/functions/ncurses-init-color.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-init-color" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_init_color</refname>
-  <refpurpose>Define a terminal color</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_init_color</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam><type>int</type><parameter>r</parameter></methodparam>
-   <methodparam><type>int</type><parameter>g</parameter></methodparam>
-   <methodparam><type>int</type><parameter>b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Defines or redefines the given color. When this function is called, all
-   occurrences of the given color on the screen, if any, immediately change
-   to the new definition.
-  </para>
-  <para>
-   Color capabilities must be supported by the terminal and initialized using
-   <function>ncurses_start_color</function> prior to calling this function.
-   In addition, the terminal must have color changing capabilities; use
-   <function>ncurses_can_change_color</function> to check for this.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The identification number of the color to redefine. It may be one of
-       the default color constants.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>r</parameter></term>
-     <listitem>
-      <para>
-       A color value, between 0 and 1000, for the red component.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>g</parameter></term>
-     <listitem>
-      <para>
-       A color value, between 0 and 1000, for the green component.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       A color value, between 0 and 1000, for the blue component.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <literal>-1</literal> if the function was successful,
-   and <literal>0</literal> if ncurses or terminal
-   color capabilities have not been initialized or the terminal does not
-   have color changing capabilities.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_color_content</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-init-pair.xml b/reference/ncurses/functions/ncurses-init-pair.xml
deleted file mode 100644
index f683ef218d..0000000000
--- a/reference/ncurses/functions/ncurses-init-pair.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-init-pair" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_init_pair</refname>
-  <refpurpose>Define a color pair</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_init_pair</methodname>
-   <methodparam><type>int</type><parameter>pair</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fg</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bg</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Defines or redefines the given color pair to have the given foreground
-   and background colors. If the color pair was previously initialized,
-   the screen is refreshed and all occurrences of it are changed to reflect
-   the new definition.
-  </para>
-  <para>
-   Color capabilities must be initialized using
-   <function>ncurses_start_color</function> before calling this function.
-   The first color pair (color pair <literal>0</literal>) is assumed to
-   be white on black by default, but can be changed using
-   <function>ncurses_assume_default_colors</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pair</parameter></term>
-     <listitem>
-      <para>
-          The number of the color pair to define.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fg</parameter></term>
-     <listitem>
-      <para>
-       The foreground color for the color pair. May be one of the
-       <link linkend="ncurses.colorconsts">pre-defined colors</link>
-       or one defined by <function>ncurses_init_color</function> if
-       the terminal has color changing capabilities.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bg</parameter></term>
-     <listitem>
-      <para>
-       The background color for the color pair. May be one of the
-       <link linkend="ncurses.colorconsts">pre-defined colors</link>
-       or one defined by <function>ncurses_init_color</function> if
-       the terminal has color changing capabilities.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <literal>-1</literal> if the function was successful, and
-   <literal>0</literal> if ncurses or color support were not initialized.
-  </para>
- </refsect1>
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   Note that color changing capabilities are not required for
-   defining color pairs of pre-existing colors, but only for changing
-   definitions (red, green, and blue components)
-   of colors themselves per <function>ncurses_init_color</function>.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Writing a string with a specified color to the screen</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-ncurses_init();
-
-// If the terminal supports colors, initialize and set active color
-if (ncurses_has_colors()) {
-    ncurses_start_color();
-    ncurses_init_pair(1, NCURSES_COLOR_YELLOW, NCURSES_COLOR_BLUE);
-    ncurses_color_set(1);
-}
-
-// Write a string at specified location
-ncurses_mvaddstr(10, 10, "Hello world! Yellow on blue text!");
-
-// Flush output to screen
-ncurses_refresh();
-
-ncurses_end();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_pair_content</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-init.xml b/reference/ncurses/functions/ncurses-init.xml
deleted file mode 100644
index 503960328d..0000000000
--- a/reference/ncurses/functions/ncurses-init.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-init" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_init</refname>
-  <refpurpose>Initialize ncurses</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_init</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Initializes the ncurses interface. This function must be used before
-   any other ncurses function call.
-  </para>
-  <para>
-   Note that <function>ncurses_end</function> must be called before
-   exiting from the program, or the terminal will not
-   be restored to its proper non-visual mode.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_end</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-insch.xml b/reference/ncurses/functions/ncurses-insch.xml
deleted file mode 100644
index f679aa2896..0000000000
--- a/reference/ncurses/functions/ncurses-insch.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-insch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_insch</refname>
-  <refpurpose>Insert character moving rest of line including character at current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_insch</methodname>
-   <methodparam><type>int</type><parameter>character</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>character</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-insdelln.xml b/reference/ncurses/functions/ncurses-insdelln.xml
deleted file mode 100644
index 48ffb0d875..0000000000
--- a/reference/ncurses/functions/ncurses-insdelln.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-insdelln" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_insdelln</refname>
-  <refpurpose>Insert lines before current line scrolling down (negative numbers delete and scroll up) </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_insdelln</methodname>
-   <methodparam><type>int</type><parameter>count</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>count</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-insertln.xml b/reference/ncurses/functions/ncurses-insertln.xml
deleted file mode 100644
index 302333c239..0000000000
--- a/reference/ncurses/functions/ncurses-insertln.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-insertln" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_insertln</refname>
-  <refpurpose>Insert a line, move rest of screen down </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_insertln</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Inserts a new line above the current line. The bottom line will be lost.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-insstr.xml b/reference/ncurses/functions/ncurses-insstr.xml
deleted file mode 100644
index 3af464c6ee..0000000000
--- a/reference/ncurses/functions/ncurses-insstr.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-insstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_insstr</refname>
-  <refpurpose>Insert string at current position, moving rest of line right </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_insstr</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-instr.xml b/reference/ncurses/functions/ncurses-instr.xml
deleted file mode 100644
index 96797e165d..0000000000
--- a/reference/ncurses/functions/ncurses-instr.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-instr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_instr</refname>
-  <refpurpose>Reads string from terminal screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_instr</methodname>
-   <methodparam><type>string</type><parameter role="reference">buffer</parameter></methodparam>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Reads a string from the terminal screen and returns the number of
-   characters read from the current character position until end of line.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>buffer</parameter></term>
-     <listitem>
-      <para>
-       The characters. Attributes will be stripped.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of characters.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-isendwin.xml b/reference/ncurses/functions/ncurses-isendwin.xml
deleted file mode 100644
index f95b0f4a0d..0000000000
--- a/reference/ncurses/functions/ncurses-isendwin.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-isendwin" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_isendwin</refname>
-  <refpurpose>Ncurses is in endwin mode, normal screen output may be performed</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_isendwin</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Checks if ncurses is in endwin mode.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true;, if <function>ncurses_end</function> has been called
-   without any subsequent calls to <function>ncurses_wrefresh</function>,
-   &false; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_end</function></member>
-    <member><function>ncurses_wrefresh</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-keyok.xml b/reference/ncurses/functions/ncurses-keyok.xml
deleted file mode 100644
index 50513f4179..0000000000
--- a/reference/ncurses/functions/ncurses-keyok.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-keyok" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_keyok</refname>
-  <refpurpose>Enable or disable a keycode </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_keyok</methodname>
-   <methodparam><type>int</type><parameter>keycode</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keycode</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>enable</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-keypad.xml b/reference/ncurses/functions/ncurses-keypad.xml
deleted file mode 100644
index 5d47e6a46a..0000000000
--- a/reference/ncurses/functions/ncurses-keypad.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-keypad" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_keypad</refname>
-  <refpurpose>Turns keypad on or off</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_keypad</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>bf</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bf</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-killchar.xml b/reference/ncurses/functions/ncurses-killchar.xml
deleted file mode 100644
index 64ddbd28a9..0000000000
--- a/reference/ncurses/functions/ncurses-killchar.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-killchar" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_killchar</refname>
-  <refpurpose>Returns current line kill character </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ncurses_killchar</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Returns the current line kill character.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the kill character, as a string.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_erasechar</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-longname.xml b/reference/ncurses/functions/ncurses-longname.xml
deleted file mode 100644
index a7b245abf0..0000000000
--- a/reference/ncurses/functions/ncurses-longname.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-longname" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_longname</refname>
-  <refpurpose>Returns terminals description</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ncurses_longname</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Returns a verbose description of the terminal. 
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the description, as a string truncated to 128 characters.
-   On errors, returns &null;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_termname</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-meta.xml b/reference/ncurses/functions/ncurses-meta.xml
deleted file mode 100644
index d375ef172f..0000000000
--- a/reference/ncurses/functions/ncurses-meta.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-meta" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_meta</refname>
-  <refpurpose>Enables/Disable 8-bit meta key information</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_meta</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>8bit</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>8bit</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mouse-trafo.xml b/reference/ncurses/functions/ncurses-mouse-trafo.xml
deleted file mode 100644
index ffcfdcf2ce..0000000000
--- a/reference/ncurses/functions/ncurses-mouse-trafo.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mouse-trafo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mouse_trafo</refname>
-  <refpurpose>Transforms coordinates</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_mouse_trafo</methodname>
-   <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>toscreen</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>toscreen</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mouseinterval.xml b/reference/ncurses/functions/ncurses-mouseinterval.xml
deleted file mode 100644
index d7172fbdc8..0000000000
--- a/reference/ncurses/functions/ncurses-mouseinterval.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mouseinterval" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mouseinterval</refname>
-  <refpurpose>Set timeout for mouse button clicks </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mouseinterval</methodname>
-   <methodparam><type>int</type><parameter>milliseconds</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>milliseconds</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mousemask.xml b/reference/ncurses/functions/ncurses-mousemask.xml
deleted file mode 100644
index d4fc704684..0000000000
--- a/reference/ncurses/functions/ncurses-mousemask.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mousemask" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mousemask</refname>
-  <refpurpose>Sets mouse options</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mousemask</methodname>
-   <methodparam><type>int</type><parameter>newmask</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">oldmask</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Sets mouse events to be reported. By default no mouse events will be
-   reported.
-  </para>
-  <para>
-   Mouse events are represented by <constant>NCURSES_KEY_MOUSE</constant> in the
-   <function>ncurses_wgetch</function> input stream. To read the event data
-   and pop the event of queue, call <function>ncurses_getmouse</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>newmask</parameter></term>
-     <listitem>
-      <para>
-       Mouse mask options can be set with the following predefined constants:
-       <itemizedlist>
-        <listitem><para>NCURSES_BUTTON1_PRESSED</para></listitem>
-        <listitem><para>NCURSES_BUTTON1_RELEASED</para></listitem>
-        <listitem><para>NCURSES_BUTTON1_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON1_DOUBLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON1_TRIPLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON2_PRESSED</para></listitem>
-        <listitem><para>NCURSES_BUTTON2_RELEASED</para></listitem>
-        <listitem><para>NCURSES_BUTTON2_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON2_DOUBLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON2_TRIPLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON3_PRESSED</para></listitem>
-        <listitem><para>NCURSES_BUTTON3_RELEASED</para></listitem>
-        <listitem><para>NCURSES_BUTTON3_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON3_DOUBLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON3_TRIPLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON4_PRESSED</para></listitem>
-        <listitem><para>NCURSES_BUTTON4_RELEASED</para></listitem>
-        <listitem><para>NCURSES_BUTTON4_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON4_DOUBLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON4_TRIPLE_CLICKED</para></listitem>
-        <listitem><para>NCURSES_BUTTON_SHIFT></para></listitem>
-        <listitem><para>NCURSES_BUTTON_CTRL</para></listitem>
-        <listitem><para>NCURSES_BUTTON_ALT</para></listitem>
-        <listitem><para>NCURSES_ALL_MOUSE_EVENTS</para></listitem>
-        <listitem><para>NCURSES_REPORT_MOUSE_POSITION</para></listitem>
-       </itemizedlist>
-      </para>
-      <para>
-       As a side effect, setting a zero mousemask in
-       <parameter>newmask</parameter> turns off the mouse
-       pointer. Setting a non zero value turns mouse pointer on.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>oldmask</parameter></term>
-     <listitem>
-      <para>
-       This will be set to the previous value of the mouse event mask.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the mask of reportable events. On complete failure, it returns
-   <literal>0</literal>.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>ncurses_mousemask</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$newmask = NCURSES_BUTTON1_CLICKED + NCURSES_BUTTON1_RELEASED;
-$mask = ncurses_mousemask($newmask, $oldmask);
-if ($mask & $newmask){
-    printf("All specified mouse options will be supported\n");
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_getch</function></member>
-    <member><function>ncurses_getmouse</function></member>
-    <member><function>ncurses_ungetmouse</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-move-panel.xml b/reference/ncurses/functions/ncurses-move-panel.xml
deleted file mode 100644
index 3d8f9515b0..0000000000
--- a/reference/ncurses/functions/ncurses-move-panel.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-move-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_move_panel</refname>
-  <refpurpose>Moves a panel so that its upper-left corner is at [startx, starty]</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_move_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>startx</parameter></methodparam>
-   <methodparam><type>int</type><parameter>starty</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>startx</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>starty</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-move.xml b/reference/ncurses/functions/ncurses-move.xml
deleted file mode 100644
index 041db7898a..0000000000
--- a/reference/ncurses/functions/ncurses-move.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-move" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_move</refname>
-  <refpurpose>Move output position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_move</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvaddch.xml b/reference/ncurses/functions/ncurses-mvaddch.xml
deleted file mode 100644
index 86bc1ec41d..0000000000
--- a/reference/ncurses/functions/ncurses-mvaddch.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvaddch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvaddch</refname>
-  <refpurpose>Move current position and add character </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvaddch</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>c</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>c</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvaddchnstr.xml b/reference/ncurses/functions/ncurses-mvaddchnstr.xml
deleted file mode 100644
index 3c39ec30b0..0000000000
--- a/reference/ncurses/functions/ncurses-mvaddchnstr.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvaddchnstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvaddchnstr</refname>
-  <refpurpose>Move position and add attributed string with specified length </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvaddchnstr</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvaddchstr.xml b/reference/ncurses/functions/ncurses-mvaddchstr.xml
deleted file mode 100644
index b8c2d2cb3e..0000000000
--- a/reference/ncurses/functions/ncurses-mvaddchstr.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvaddchstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvaddchstr</refname>
-  <refpurpose>Move position and add attributed string </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvaddchstr</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvaddnstr.xml b/reference/ncurses/functions/ncurses-mvaddnstr.xml
deleted file mode 100644
index 4039cce6c3..0000000000
--- a/reference/ncurses/functions/ncurses-mvaddnstr.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvaddnstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvaddnstr</refname>
-  <refpurpose>Move position and add string with specified length </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvaddnstr</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvaddstr.xml b/reference/ncurses/functions/ncurses-mvaddstr.xml
deleted file mode 100644
index 5a94c10e05..0000000000
--- a/reference/ncurses/functions/ncurses-mvaddstr.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvaddstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvaddstr</refname>
-  <refpurpose>Move position and add string </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvaddstr</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>s</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>s</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvcur.xml b/reference/ncurses/functions/ncurses-mvcur.xml
deleted file mode 100644
index d80ddec677..0000000000
--- a/reference/ncurses/functions/ncurses-mvcur.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvcur" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvcur</refname>
-  <refpurpose>Move cursor immediately </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvcur</methodname>
-   <methodparam><type>int</type><parameter>old_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>old_x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>new_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>new_x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>old_x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvdelch.xml b/reference/ncurses/functions/ncurses-mvdelch.xml
deleted file mode 100644
index b8330e9423..0000000000
--- a/reference/ncurses/functions/ncurses-mvdelch.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvdelch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvdelch</refname>
-  <refpurpose>Move position and delete character, shift rest of line left </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvdelch</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvgetch.xml b/reference/ncurses/functions/ncurses-mvgetch.xml
deleted file mode 100644
index 97561eba3c..0000000000
--- a/reference/ncurses/functions/ncurses-mvgetch.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvgetch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvgetch</refname>
-  <refpurpose>Move position and get character at new position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvgetch</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvhline.xml b/reference/ncurses/functions/ncurses-mvhline.xml
deleted file mode 100644
index 4c6c001d5d..0000000000
--- a/reference/ncurses/functions/ncurses-mvhline.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvhline" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvhline</refname>
-  <refpurpose>Set new position and draw a horizontal line using an attributed character and max. n characters long </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvhline</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attrchar</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attrchar</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvinch.xml b/reference/ncurses/functions/ncurses-mvinch.xml
deleted file mode 100644
index 7ba22e920b..0000000000
--- a/reference/ncurses/functions/ncurses-mvinch.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvinch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvinch</refname>
-  <refpurpose>Move position and get attributed character at new position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvinch</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvvline.xml b/reference/ncurses/functions/ncurses-mvvline.xml
deleted file mode 100644
index 761ca6a17c..0000000000
--- a/reference/ncurses/functions/ncurses-mvvline.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvvline" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvvline</refname>
-  <refpurpose>Set new position and draw a vertical line using an attributed character and max. n characters long </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvvline</methodname>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attrchar</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attrchar</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-mvwaddstr.xml b/reference/ncurses/functions/ncurses-mvwaddstr.xml
deleted file mode 100644
index 30e183939a..0000000000
--- a/reference/ncurses/functions/ncurses-mvwaddstr.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-mvwaddstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_mvwaddstr</refname>
-  <refpurpose>Add string at new position in window </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_mvwaddstr</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-napms.xml b/reference/ncurses/functions/ncurses-napms.xml
deleted file mode 100644
index 6c1e88257c..0000000000
--- a/reference/ncurses/functions/ncurses-napms.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-napms" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_napms</refname>
-  <refpurpose>Sleep</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_napms</methodname>
-   <methodparam><type>int</type><parameter>milliseconds</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>milliseconds</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-new-panel.xml b/reference/ncurses/functions/ncurses-new-panel.xml
deleted file mode 100644
index 53098fec83..0000000000
--- a/reference/ncurses/functions/ncurses-new-panel.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-new-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_new_panel</refname>
-  <refpurpose>Create a new panel and associate it with window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ncurses_new_panel</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-newpad.xml b/reference/ncurses/functions/ncurses-newpad.xml
deleted file mode 100644
index 9791fb4ea3..0000000000
--- a/reference/ncurses/functions/ncurses-newpad.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-newpad" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_newpad</refname>
-  <refpurpose>Creates a new pad (window)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ncurses_newpad</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cols</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cols</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-newwin.xml b/reference/ncurses/functions/ncurses-newwin.xml
deleted file mode 100644
index 9b440c5cba..0000000000
--- a/reference/ncurses/functions/ncurses-newwin.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-newwin" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_newwin</refname>
-  <refpurpose>Create a new window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ncurses_newwin</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cols</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Creates a new window to draw elements in. 
-  </para>
-  <para>
-   When creating additional windows, remember to use 
-   <function>ncurses_getmaxyx</function> to check for available space, as
-   terminal size is individual and may vary.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       Number of rows
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cols</parameter></term>
-     <listitem>
-      <para>
-       Number of columns
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the origin
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the origin
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a resource ID for the new window.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-nl.xml b/reference/ncurses/functions/ncurses-nl.xml
deleted file mode 100644
index 3291b9f59b..0000000000
--- a/reference/ncurses/functions/ncurses-nl.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-nl" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_nl</refname>
-  <refpurpose>Translate newline and carriage return / line feed </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_nl</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-nocbreak.xml b/reference/ncurses/functions/ncurses-nocbreak.xml
deleted file mode 100644
index d0d5a15318..0000000000
--- a/reference/ncurses/functions/ncurses-nocbreak.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-nocbreak" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_nocbreak</refname>
-  <refpurpose>Switch terminal to cooked mode </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_nocbreak</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Returns terminal to normal (cooked) mode. Initially the terminal may or
-   may not be in cbreak mode as the mode is inherited. Therefore a program
-   should call <function>ncurses_cbreak</function> and
-   <function>ncurses_nocbreak</function> explicitly.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if any error occurred, otherwise &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_cbreak</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-noecho.xml b/reference/ncurses/functions/ncurses-noecho.xml
deleted file mode 100644
index 6c34a74a08..0000000000
--- a/reference/ncurses/functions/ncurses-noecho.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-noecho" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_noecho</refname>
-  <refpurpose>Switch off keyboard input echo </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_noecho</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Prevents echoing of user typed characters.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if any error occurred, &false; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_echo</function></member>
-    <member><function>ncurses_getch</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-nonl.xml b/reference/ncurses/functions/ncurses-nonl.xml
deleted file mode 100644
index 8b0a14072b..0000000000
--- a/reference/ncurses/functions/ncurses-nonl.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-nonl" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_nonl</refname>
-  <refpurpose>Do not translate newline and carriage return / line feed </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_nonl</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-noqiflush.xml b/reference/ncurses/functions/ncurses-noqiflush.xml
deleted file mode 100644
index 14a7fd0d32..0000000000
--- a/reference/ncurses/functions/ncurses-noqiflush.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-noqiflush" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_noqiflush</refname>
-  <refpurpose>Do not flush on signal characters</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_noqiflush</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-noraw.xml b/reference/ncurses/functions/ncurses-noraw.xml
deleted file mode 100644
index d11bd40385..0000000000
--- a/reference/ncurses/functions/ncurses-noraw.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-noraw" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_noraw</refname>
-  <refpurpose>Switch terminal out of raw mode </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_noraw</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Switches the terminal out of raw mode. Raw mode is similar to cbreak mode,
-   in that characters typed are immediately passed through to the user
-   program. The difference is that in raw mode, the interrupt, quit,
-   suspend and flow control characters are all passed through uninterpreted,
-   instead of generating a signal.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if any error occurred, otherwise &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_raw</function></member>
-    <member><function>ncurses_cbreak</function></member>
-    <member><function>ncurses_nocbreak</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-pair-content.xml b/reference/ncurses/functions/ncurses-pair-content.xml
deleted file mode 100644
index f7c0bcb402..0000000000
--- a/reference/ncurses/functions/ncurses-pair-content.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-pair-content" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_pair_content</refname>
-  <refpurpose>Retrieves foreground and background colors of a color pair</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_pair_content</methodname>
-   <methodparam><type>int</type><parameter>pair</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">f</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves the foreground and background colors that constitute the given
-   color pair. Terminal color capabilities must be initialized with
-   <function>ncurses_start_color</function> prior to calling this function.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pair</parameter></term>
-     <listitem>
-      <para>
-       The number of the color pair to retrieve information for.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>f</parameter></term>
-     <listitem>
-      <para>
-       A reference to which to return the foreground color of the color
-       pair. The information returned will be a color number referring to
-       one of the
-       <link linkend="ncurses.colorconsts">pre-defined colors</link> or a
-       color defined previously by
-       <function>ncurses_init_color</function> if the terminal supports
-       color changing.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       A reference to which to return the background color of the color
-       pair. The information returned will be a color number referring to
-       one of the
-       <link linkend="ncurses.colorconsts">pre-defined colors</link> or a
-       color defined previously by
-       <function>ncurses_init_color</function> if the terminal supports
-       color changing.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <literal>-1</literal> if the function was successful, and
-   <literal>0</literal> if ncurses or terminal color capabilities have
-   not been initialized.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_init_pair</function></member>
-    <member><function>ncurses_start_color</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-panel-above.xml b/reference/ncurses/functions/ncurses-panel-above.xml
deleted file mode 100644
index 0a2f889a59..0000000000
--- a/reference/ncurses/functions/ncurses-panel-above.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-panel-above" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_panel_above</refname>
-  <refpurpose>Returns the panel above panel</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ncurses_panel_above</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If panel is null, returns the bottom panel in the stack.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-panel-below.xml b/reference/ncurses/functions/ncurses-panel-below.xml
deleted file mode 100644
index 9f12eab9fa..0000000000
--- a/reference/ncurses/functions/ncurses-panel-below.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-panel-below" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_panel_below</refname>
-  <refpurpose>Returns the panel below panel</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ncurses_panel_below</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   If panel is null, returns the top panel in the stack.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-panel-window.xml b/reference/ncurses/functions/ncurses-panel-window.xml
deleted file mode 100644
index c62bfd0b49..0000000000
--- a/reference/ncurses/functions/ncurses-panel-window.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-panel-window" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_panel_window</refname>
-  <refpurpose>Returns the window associated with panel</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ncurses_panel_window</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-pnoutrefresh.xml b/reference/ncurses/functions/ncurses-pnoutrefresh.xml
deleted file mode 100644
index 95ea4aa6f9..0000000000
--- a/reference/ncurses/functions/ncurses-pnoutrefresh.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-pnoutrefresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_pnoutrefresh</refname>
-  <refpurpose>Copies a region from a pad into the virtual screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_pnoutrefresh</methodname>
-   <methodparam><type>resource</type><parameter>pad</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pminrow</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pmincol</parameter></methodparam>
-   <methodparam><type>int</type><parameter>sminrow</parameter></methodparam>
-   <methodparam><type>int</type><parameter>smincol</parameter></methodparam>
-   <methodparam><type>int</type><parameter>smaxrow</parameter></methodparam>
-   <methodparam><type>int</type><parameter>smaxcol</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pad</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pminrow</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pmincol</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sminrow</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smincol</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smaxrow</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smaxcol</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-prefresh.xml b/reference/ncurses/functions/ncurses-prefresh.xml
deleted file mode 100644
index 4ff749c8f0..0000000000
--- a/reference/ncurses/functions/ncurses-prefresh.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-prefresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_prefresh</refname>
-  <refpurpose>Copies a region from a pad into the virtual screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_prefresh</methodname>
-   <methodparam><type>resource</type><parameter>pad</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pminrow</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pmincol</parameter></methodparam>
-   <methodparam><type>int</type><parameter>sminrow</parameter></methodparam>
-   <methodparam><type>int</type><parameter>smincol</parameter></methodparam>
-   <methodparam><type>int</type><parameter>smaxrow</parameter></methodparam>
-   <methodparam><type>int</type><parameter>smaxcol</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pad</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pminrow</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pmincol</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sminrow</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smincol</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smaxrow</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smaxcol</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-putp.xml b/reference/ncurses/functions/ncurses-putp.xml
deleted file mode 100644
index aacfeac12a..0000000000
--- a/reference/ncurses/functions/ncurses-putp.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-putp" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_putp</refname>
-  <refpurpose>Apply padding information to the string and output it</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_putp</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-qiflush.xml b/reference/ncurses/functions/ncurses-qiflush.xml
deleted file mode 100644
index a4edc63358..0000000000
--- a/reference/ncurses/functions/ncurses-qiflush.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-qiflush" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_qiflush</refname>
-  <refpurpose>Flush on signal characters </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_qiflush</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-raw.xml b/reference/ncurses/functions/ncurses-raw.xml
deleted file mode 100644
index c0ce156551..0000000000
--- a/reference/ncurses/functions/ncurses-raw.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-raw" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_raw</refname>
-  <refpurpose>Switch terminal into raw mode </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_raw</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Places the terminal in raw mode. Raw mode is similar to cbreak mode, in
-   that characters typed are immediately passed through to the user program.
-   The difference is that in raw mode, the interrupt, quit, suspend
-   and flow control characters are all passed through uninterpreted, instead
-   of generating a signal.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if any error occurred, otherwise &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_noraw</function></member>
-    <member><function>ncurses_cbreak</function></member>
-    <member><function>ncurses_nocbreak</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-refresh.xml b/reference/ncurses/functions/ncurses-refresh.xml
deleted file mode 100644
index 5124769c67..0000000000
--- a/reference/ncurses/functions/ncurses-refresh.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-refresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_refresh</refname>
-  <refpurpose>Refresh screen </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_refresh</methodname>
-   <methodparam><type>int</type><parameter>ch</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ch</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-replace-panel.xml b/reference/ncurses/functions/ncurses-replace-panel.xml
deleted file mode 100644
index 908e0292a3..0000000000
--- a/reference/ncurses/functions/ncurses-replace-panel.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-replace-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_replace_panel</refname>
-  <refpurpose>Replaces the window associated with panel</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_replace_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-reset-prog-mode.xml b/reference/ncurses/functions/ncurses-reset-prog-mode.xml
deleted file mode 100644
index 3469a6ffde..0000000000
--- a/reference/ncurses/functions/ncurses-reset-prog-mode.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-reset-prog-mode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_reset_prog_mode</refname>
-  <refpurpose>Resets the prog mode saved by def_prog_mode</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_reset_prog_mode</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-reset-shell-mode.xml b/reference/ncurses/functions/ncurses-reset-shell-mode.xml
deleted file mode 100644
index 212cb1eb77..0000000000
--- a/reference/ncurses/functions/ncurses-reset-shell-mode.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-reset-shell-mode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_reset_shell_mode</refname>
-  <refpurpose>Resets the shell mode saved by def_shell_mode</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_reset_shell_mode</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-resetty.xml b/reference/ncurses/functions/ncurses-resetty.xml
deleted file mode 100644
index fd0b0108a3..0000000000
--- a/reference/ncurses/functions/ncurses-resetty.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-resetty" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_resetty</refname>
-  <refpurpose>Restores saved terminal state </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_resetty</methodname>
-   <void/>
-  </methodsynopsis>
-   &warn.experimental.func;
-  <para>
-   Restores the terminal state, which was previously saved by calling
-   <function>ncurses_savetty</function>.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Always returns &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_savetty</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-savetty.xml b/reference/ncurses/functions/ncurses-savetty.xml
deleted file mode 100644
index 89313aa7a0..0000000000
--- a/reference/ncurses/functions/ncurses-savetty.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-savetty" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_savetty</refname>
-  <refpurpose>Saves terminal state </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_savetty</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Saves the current terminal state. The saved terminal state can be restored
-   with <function>ncurses_resetty</function>.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Always returns &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_resetty</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-scr-dump.xml b/reference/ncurses/functions/ncurses-scr-dump.xml
deleted file mode 100644
index f30ea818b1..0000000000
--- a/reference/ncurses/functions/ncurses-scr-dump.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-scr-dump" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_scr_dump</refname>
-  <refpurpose>Dump screen content to file </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_scr_dump</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-scr-init.xml b/reference/ncurses/functions/ncurses-scr-init.xml
deleted file mode 100644
index 660f251bc0..0000000000
--- a/reference/ncurses/functions/ncurses-scr-init.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-scr-init" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_scr_init</refname>
-  <refpurpose>Initialize screen from file dump </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_scr_init</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-scr-restore.xml b/reference/ncurses/functions/ncurses-scr-restore.xml
deleted file mode 100644
index e51f7d7772..0000000000
--- a/reference/ncurses/functions/ncurses-scr-restore.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-scr-restore" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_scr_restore</refname>
-  <refpurpose>Restore screen from file dump </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_scr_restore</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-scr-set.xml b/reference/ncurses/functions/ncurses-scr-set.xml
deleted file mode 100644
index 41d34b4a94..0000000000
--- a/reference/ncurses/functions/ncurses-scr-set.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-scr-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_scr_set</refname>
-  <refpurpose>Inherit screen from file dump </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_scr_set</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-scrl.xml b/reference/ncurses/functions/ncurses-scrl.xml
deleted file mode 100644
index 72003907b6..0000000000
--- a/reference/ncurses/functions/ncurses-scrl.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-scrl" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_scrl</refname>
-  <refpurpose>Scroll window content up or down without changing current position </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_scrl</methodname>
-   <methodparam><type>int</type><parameter>count</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>count</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-show-panel.xml b/reference/ncurses/functions/ncurses-show-panel.xml
deleted file mode 100644
index c31ce17dfd..0000000000
--- a/reference/ncurses/functions/ncurses-show-panel.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-show-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_show_panel</refname>
-  <refpurpose>Places an invisible panel on top of the stack, making it visible</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_show_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-attr.xml b/reference/ncurses/functions/ncurses-slk-attr.xml
deleted file mode 100644
index ff3d455cc1..0000000000
--- a/reference/ncurses/functions/ncurses-slk-attr.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-attr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_attr</refname>
-  <refpurpose>Returns current soft label key attribute</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_attr</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Returns the current soft label key attribute.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The attribute, as an integer.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-attroff.xml b/reference/ncurses/functions/ncurses-slk-attroff.xml
deleted file mode 100644
index fd336db36a..0000000000
--- a/reference/ncurses/functions/ncurses-slk-attroff.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-attroff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_attroff</refname>
-  <refpurpose>Turn off the given attributes for soft function-key labels</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_attroff</methodname>
-   <methodparam><type>int</type><parameter>intarg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>intarg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-attron.xml b/reference/ncurses/functions/ncurses-slk-attron.xml
deleted file mode 100644
index 3e14c5863a..0000000000
--- a/reference/ncurses/functions/ncurses-slk-attron.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-attron" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_attron</refname>
-  <refpurpose>Turn on the given attributes for soft function-key labels</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_attron</methodname>
-   <methodparam><type>int</type><parameter>intarg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>intarg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-attrset.xml b/reference/ncurses/functions/ncurses-slk-attrset.xml
deleted file mode 100644
index 92772bb8e3..0000000000
--- a/reference/ncurses/functions/ncurses-slk-attrset.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-attrset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_attrset</refname>
-  <refpurpose>Set given attributes for soft function-key labels</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_attrset</methodname>
-   <methodparam><type>int</type><parameter>intarg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>intarg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-clear.xml b/reference/ncurses/functions/ncurses-slk-clear.xml
deleted file mode 100644
index c807f250a6..0000000000
--- a/reference/ncurses/functions/ncurses-slk-clear.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-clear" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_clear</refname>
-  <refpurpose>Clears soft labels from screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_slk_clear</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   The function <function>ncurses_slk_clear</function> clears soft
-   label keys from screen. 
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on errors, &false; otherwise.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-color.xml b/reference/ncurses/functions/ncurses-slk-color.xml
deleted file mode 100644
index 8942ec6538..0000000000
--- a/reference/ncurses/functions/ncurses-slk-color.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-color" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_color</refname>
-  <refpurpose>Sets color for soft label keys</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_color</methodname>
-   <methodparam><type>int</type><parameter>intarg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>intarg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-init.xml b/reference/ncurses/functions/ncurses-slk-init.xml
deleted file mode 100644
index 563f256f25..0000000000
--- a/reference/ncurses/functions/ncurses-slk-init.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-init" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_init</refname>
-  <refpurpose>Initializes soft label key functions</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_slk_init</methodname>
-   <methodparam><type>int</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Initializes soft label key functions
-  </para>
-  <para>
-   This function must be called before <function>ncurses_init</function>
-   or <function>ncurses_newwin</function> is called. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-       If <function>ncurses_init</function> eventually uses a line from
-       stdscr to emulate the soft labels, then this parameter determines how
-       the labels are arranged of the screen.
-      </para>
-      <para>
-       0 indicates a 3-2-3 arrangement of the labels, 1 indicates a 4-4
-       arrangement and 2 indicates the PC like 4-4-4 mode, but in addition an
-       index line will be created.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-noutrefresh.xml b/reference/ncurses/functions/ncurses-slk-noutrefresh.xml
deleted file mode 100644
index 4fd4a10fbe..0000000000
--- a/reference/ncurses/functions/ncurses-slk-noutrefresh.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-noutrefresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_noutrefresh</refname>
-  <refpurpose>Copies soft label keys to virtual screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_slk_noutrefresh</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-refresh.xml b/reference/ncurses/functions/ncurses-slk-refresh.xml
deleted file mode 100644
index 5d262268fc..0000000000
--- a/reference/ncurses/functions/ncurses-slk-refresh.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-refresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_refresh</refname>
-  <refpurpose>Copies soft label keys to screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_refresh</methodname>
-   <void/>
-  </methodsynopsis>
- &warn.experimental.func;
-  <para>
-   Copies soft label keys from virtual screen to physical screen. 
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-restore.xml b/reference/ncurses/functions/ncurses-slk-restore.xml
deleted file mode 100644
index 276f419784..0000000000
--- a/reference/ncurses/functions/ncurses-slk-restore.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-restore" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_restore</refname>
-  <refpurpose>Restores soft label keys</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_restore</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Restores the soft label keys after <function>ncurses_slk_clear</function>
-   has been performed.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-set.xml b/reference/ncurses/functions/ncurses-slk-set.xml
deleted file mode 100644
index e890fbecb1..0000000000
--- a/reference/ncurses/functions/ncurses-slk-set.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_set</refname>
-  <refpurpose>Sets function key labels</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_slk_set</methodname>
-   <methodparam><type>int</type><parameter>labelnr</parameter></methodparam>
-   <methodparam><type>string</type><parameter>label</parameter></methodparam>
-   <methodparam><type>int</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>labelnr</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>label</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-slk-touch.xml b/reference/ncurses/functions/ncurses-slk-touch.xml
deleted file mode 100644
index 5463bd7a0a..0000000000
--- a/reference/ncurses/functions/ncurses-slk-touch.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-slk-touch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_slk_touch</refname>
-  <refpurpose>Forces output when ncurses_slk_noutrefresh is performed</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_slk_touch</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Forces all the soft labels to be output the next time a
-   <function>ncurses_slk_noutrefresh</function> is performed.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-standend.xml b/reference/ncurses/functions/ncurses-standend.xml
deleted file mode 100644
index 555c267fa8..0000000000
--- a/reference/ncurses/functions/ncurses-standend.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-standend" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_standend</refname>
-  <refpurpose>Stop using 'standout' attribute </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_standend</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-standout.xml b/reference/ncurses/functions/ncurses-standout.xml
deleted file mode 100644
index a4d3105fcf..0000000000
--- a/reference/ncurses/functions/ncurses-standout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-standout" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_standout</refname>
-  <refpurpose>Start using 'standout' attribute </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_standout</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-start-color.xml b/reference/ncurses/functions/ncurses-start-color.xml
deleted file mode 100644
index 348c92de6b..0000000000
--- a/reference/ncurses/functions/ncurses-start-color.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-start-color" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_start_color</refname>
-  <refpurpose>Initializes color functionality</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_start_color</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Initializes color functionality in ncurses. This function must be called
-   before any color manipulation functions are called and after
-   <function>ncurses_init</function> is called. It is good practice to call
-   this function right after <function>ncurses_init</function>.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns <literal>0</literal> on success, or <literal>-1</literal> if the
-   color table could not be allocated or ncurses was not initialized.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Writing a string with a specified color to the screen</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-ncurses_init();
-
-// If the terminal supports colors, initialize and set active color
-if (ncurses_has_colors()) {
-    ncurses_start_color();
-    ncurses_init_pair(1, NCURSES_COLOR_YELLOW, NCURSES_COLOR_BLUE);
-    ncurses_color_set(1);
-}
-
-// Write a string at specified location
-ncurses_mvaddstr(10, 10, "Hello world! Yellow on blue text!");
-
-// Flush output to screen
-ncurses_refresh();
-
-ncurses_end();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_can_change_color</function></member>
-    <member><function>ncurses_has_colors</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-termattrs.xml b/reference/ncurses/functions/ncurses-termattrs.xml
deleted file mode 100644
index 1f36dd36ad..0000000000
--- a/reference/ncurses/functions/ncurses-termattrs.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-termattrs" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_termattrs</refname>
-  <refpurpose>Returns a logical OR of all attribute flags supported by terminal </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_termattrs</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-termname.xml b/reference/ncurses/functions/ncurses-termname.xml
deleted file mode 100644
index 2408dede4d..0000000000
--- a/reference/ncurses/functions/ncurses-termname.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-termname" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_termname</refname>
-  <refpurpose>Returns terminals (short)-name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ncurses_termname</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Returns terminals shortname.
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the shortname of the terminal, truncated to 14 characters.
-   On errors, returns &null;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_longname</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-timeout.xml b/reference/ncurses/functions/ncurses-timeout.xml
deleted file mode 100644
index 3426329449..0000000000
--- a/reference/ncurses/functions/ncurses-timeout.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-timeout" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_timeout</refname>
-  <refpurpose>Set timeout for special key sequences </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_timeout</methodname>
-   <methodparam><type>int</type><parameter>millisec</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>millisec</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-top-panel.xml b/reference/ncurses/functions/ncurses-top-panel.xml
deleted file mode 100644
index 2c51200854..0000000000
--- a/reference/ncurses/functions/ncurses-top-panel.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-top-panel" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_top_panel</refname>
-  <refpurpose>Moves a visible panel to the top of the stack</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_top_panel</methodname>
-   <methodparam><type>resource</type><parameter>panel</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>panel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-typeahead.xml b/reference/ncurses/functions/ncurses-typeahead.xml
deleted file mode 100644
index 70266f4e7e..0000000000
--- a/reference/ncurses/functions/ncurses-typeahead.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-typeahead" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_typeahead</refname>
-  <refpurpose>Specify different filedescriptor for typeahead checking </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_typeahead</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-ungetch.xml b/reference/ncurses/functions/ncurses-ungetch.xml
deleted file mode 100644
index f2caa6c672..0000000000
--- a/reference/ncurses/functions/ncurses-ungetch.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-ungetch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_ungetch</refname>
-  <refpurpose>Put a character back into the input stream </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_ungetch</methodname>
-   <methodparam><type>int</type><parameter>keycode</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keycode</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-ungetmouse.xml b/reference/ncurses/functions/ncurses-ungetmouse.xml
deleted file mode 100644
index 2f0dc4eeec..0000000000
--- a/reference/ncurses/functions/ncurses-ungetmouse.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-ungetmouse" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_ungetmouse</refname>
-  <refpurpose>Pushes mouse event to queue</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_ungetmouse</methodname>
-   <methodparam><type>array</type><parameter>mevent</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Pushes a KEY_MOUSE event onto the input queue and associates with this
-   event the given state data and screen-relative character cell coordinates,
-   specified in <parameter>mevent</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mevent</parameter></term>
-     <listitem>
-      <para>
-       An associative array specifying the event options:
-       <itemizedlist>
-        <listitem>
-         <para>"id" : Id to distinguish multiple devices</para>
-        </listitem>
-        <listitem>
-         <para>"x" : screen relative x-position in character cells</para>
-        </listitem>
-        <listitem>
-         <para>"y" : screen relative y-position in character cells</para>
-        </listitem>
-        <listitem>
-         <para>"z" : currently not supported</para>
-        </listitem>
-        <listitem>
-         <para>"mmask" : Mouse action</para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on success, &true; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_getmouse</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-update-panels.xml b/reference/ncurses/functions/ncurses-update-panels.xml
deleted file mode 100644
index 7b2da70fe3..0000000000
--- a/reference/ncurses/functions/ncurses-update-panels.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-update-panels" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_update_panels</refname>
-  <refpurpose>Refreshes the virtual screen to reflect the relations between panels in the stack</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_update_panels</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-use-default-colors.xml b/reference/ncurses/functions/ncurses-use-default-colors.xml
deleted file mode 100644
index dd6748c967..0000000000
--- a/reference/ncurses/functions/ncurses-use-default-colors.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-use-default-colors" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_use_default_colors</refname>
-  <refpurpose>Assign terminal default colors to color id -1 </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_use_default_colors</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-use-env.xml b/reference/ncurses/functions/ncurses-use-env.xml
deleted file mode 100644
index d1f9ca9d65..0000000000
--- a/reference/ncurses/functions/ncurses-use-env.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-use-env" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_use_env</refname>
-  <refpurpose>Control use of environment information about terminal size </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ncurses_use_env</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-use-extended-names.xml b/reference/ncurses/functions/ncurses-use-extended-names.xml
deleted file mode 100644
index 4602ed7d58..0000000000
--- a/reference/ncurses/functions/ncurses-use-extended-names.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-use-extended-names" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_use_extended_names</refname>
-  <refpurpose>Control use of extended names in terminfo descriptions </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_use_extended_names</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-vidattr.xml b/reference/ncurses/functions/ncurses-vidattr.xml
deleted file mode 100644
index fe1f727fdc..0000000000
--- a/reference/ncurses/functions/ncurses-vidattr.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-vidattr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_vidattr</refname>
-  <refpurpose>Display the string on the terminal in the video attribute mode</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_vidattr</methodname>
-   <methodparam><type>int</type><parameter>intarg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>intarg</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-vline.xml b/reference/ncurses/functions/ncurses-vline.xml
deleted file mode 100644
index 1856e3b94b..0000000000
--- a/reference/ncurses/functions/ncurses-vline.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-vline" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_vline</refname>
-  <refpurpose>Draw a vertical line at current position using an attributed character and max. n characters long </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_vline</methodname>
-   <methodparam><type>int</type><parameter>charattr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>charattr</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-waddch.xml b/reference/ncurses/functions/ncurses-waddch.xml
deleted file mode 100644
index 50de623365..0000000000
--- a/reference/ncurses/functions/ncurses-waddch.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-waddch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_waddch</refname>
-  <refpurpose>Adds character at current position in a window and advance cursor</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_waddch</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ch</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ch</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-waddstr.xml b/reference/ncurses/functions/ncurses-waddstr.xml
deleted file mode 100644
index 82cdb71ede..0000000000
--- a/reference/ncurses/functions/ncurses-waddstr.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-waddstr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_waddstr</refname>
-  <refpurpose>Outputs text at current postion in window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_waddstr</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wattroff.xml b/reference/ncurses/functions/ncurses-wattroff.xml
deleted file mode 100644
index 6b9391a962..0000000000
--- a/reference/ncurses/functions/ncurses-wattroff.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wattroff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wattroff</refname>
-  <refpurpose>Turns off attributes for a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wattroff</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attrs</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attrs</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wattron.xml b/reference/ncurses/functions/ncurses-wattron.xml
deleted file mode 100644
index ea41dfa250..0000000000
--- a/reference/ncurses/functions/ncurses-wattron.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wattron" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wattron</refname>
-  <refpurpose>Turns on attributes for a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wattron</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attrs</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attrs</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wattrset.xml b/reference/ncurses/functions/ncurses-wattrset.xml
deleted file mode 100644
index 44ee7c08b2..0000000000
--- a/reference/ncurses/functions/ncurses-wattrset.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wattrset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wattrset</refname>
-  <refpurpose>Set the attributes for a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wattrset</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attrs</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attrs</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wborder.xml b/reference/ncurses/functions/ncurses-wborder.xml
deleted file mode 100644
index e95588a0fb..0000000000
--- a/reference/ncurses/functions/ncurses-wborder.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wborder" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wborder</refname>
-  <refpurpose>Draws a border around the window using attributed characters</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wborder</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>left</parameter></methodparam>
-   <methodparam><type>int</type><parameter>right</parameter></methodparam>
-   <methodparam><type>int</type><parameter>top</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bottom</parameter></methodparam>
-   <methodparam><type>int</type><parameter>tl_corner</parameter></methodparam>
-   <methodparam><type>int</type><parameter>tr_corner</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bl_corner</parameter></methodparam>
-   <methodparam><type>int</type><parameter>br_corner</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   Draws the specified lines and corners around the passed 
-   <parameter>window</parameter>. 
-  </para>
-  <para>
-   Use <function>ncurses_border</function> for borders around the main
-   window.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   Each parameter expects 0 to draw a line and 1 to skip it.
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-       The window on which we operate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>left</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>right</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>top</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tl_corner</parameter></term>
-     <listitem>
-      <para>
-       Top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tr_corner</parameter></term>
-     <listitem>
-      <para>
-       Top right corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bl_corner</parameter></term>
-     <listitem>
-      <para>
-       Bottom left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>br_corner</parameter></term>
-     <listitem>
-      <para>
-       Bottom right corner
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ncurses_border</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wclear.xml b/reference/ncurses/functions/ncurses-wclear.xml
deleted file mode 100644
index 3da9ffb812..0000000000
--- a/reference/ncurses/functions/ncurses-wclear.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wclear" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wclear</refname>
-  <refpurpose>Clears window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wclear</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wcolor-set.xml b/reference/ncurses/functions/ncurses-wcolor-set.xml
deleted file mode 100644
index 8878a5450c..0000000000
--- a/reference/ncurses/functions/ncurses-wcolor-set.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wcolor-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wcolor_set</refname>
-  <refpurpose>Sets windows color pairings</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wcolor_set</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>color_pair</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>color_pair</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-werase.xml b/reference/ncurses/functions/ncurses-werase.xml
deleted file mode 100644
index 128ee9c3b0..0000000000
--- a/reference/ncurses/functions/ncurses-werase.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-werase" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_werase</refname>
-  <refpurpose>Erase window contents</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_werase</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wgetch.xml b/reference/ncurses/functions/ncurses-wgetch.xml
deleted file mode 100644
index 644871cd51..0000000000
--- a/reference/ncurses/functions/ncurses-wgetch.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wgetch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wgetch</refname>
-  <refpurpose>Reads a character from keyboard (window)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wgetch</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-whline.xml b/reference/ncurses/functions/ncurses-whline.xml
deleted file mode 100644
index da5ce691ac..0000000000
--- a/reference/ncurses/functions/ncurses-whline.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-whline" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_whline</refname>
-  <refpurpose>Draws a horizontal line in a window at current position using an attributed character and max. n characters long</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_whline</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>charattr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>charattr</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wmouse-trafo.xml b/reference/ncurses/functions/ncurses-wmouse-trafo.xml
deleted file mode 100644
index 9e140230ce..0000000000
--- a/reference/ncurses/functions/ncurses-wmouse-trafo.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wmouse-trafo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wmouse_trafo</refname>
-  <refpurpose>Transforms window/stdscr coordinates</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ncurses_wmouse_trafo</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>toscreen</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>toscreen</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wmove.xml b/reference/ncurses/functions/ncurses-wmove.xml
deleted file mode 100644
index d5e26b41f5..0000000000
--- a/reference/ncurses/functions/ncurses-wmove.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wmove" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wmove</refname>
-  <refpurpose>Moves windows output position</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wmove</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wnoutrefresh.xml b/reference/ncurses/functions/ncurses-wnoutrefresh.xml
deleted file mode 100644
index f6b190c003..0000000000
--- a/reference/ncurses/functions/ncurses-wnoutrefresh.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wnoutrefresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wnoutrefresh</refname>
-  <refpurpose>Copies window to virtual screen</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wnoutrefresh</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wrefresh.xml b/reference/ncurses/functions/ncurses-wrefresh.xml
deleted file mode 100644
index fb6bc51e95..0000000000
--- a/reference/ncurses/functions/ncurses-wrefresh.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wrefresh" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wrefresh</refname>
-  <refpurpose>Refresh window on terminal screen </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wrefresh</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wstandend.xml b/reference/ncurses/functions/ncurses-wstandend.xml
deleted file mode 100644
index 642edb9df7..0000000000
--- a/reference/ncurses/functions/ncurses-wstandend.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wstandend" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wstandend</refname>
-  <refpurpose>End standout mode for a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wstandend</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wstandout.xml b/reference/ncurses/functions/ncurses-wstandout.xml
deleted file mode 100644
index c52de377af..0000000000
--- a/reference/ncurses/functions/ncurses-wstandout.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wstandout" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wstandout</refname>
-  <refpurpose>Enter standout mode for a window</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wstandout</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/functions/ncurses-wvline.xml b/reference/ncurses/functions/ncurses-wvline.xml
deleted file mode 100644
index 052766bf74..0000000000
--- a/reference/ncurses/functions/ncurses-wvline.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ncurses-wvline" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ncurses_wvline</refname>
-  <refpurpose>Draws a vertical line in a window at current position using an attributed character and max. n characters long</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ncurses_wvline</methodname>
-   <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-   <methodparam><type>int</type><parameter>charattr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>window</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>charattr</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ncurses/reference.xml b/reference/ncurses/reference.xml
deleted file mode 100644
index 70026b6bbf..0000000000
--- a/reference/ncurses/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ncurses" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Ncurses &Functions;</title>
-  
- &reference.ncurses.entities.functions;
-
-</reference>
-
- <!-- Keep this comment at the end of the file
- Local variables:
- mode: sgml
- sgml-omittag:t
- sgml-shorttag:t
- sgml-minimize-attributes:nil
- sgml-always-quote-attributes:t
- sgml-indent-step:1
- sgml-indent-data:t
- indent-tabs-mode:nil
- sgml-parent-document:nil
- sgml-default-dtd-file:"~/.phpdoc/manual.ced"
- sgml-exposed-tags:nil
- sgml-local-catalogs:nil
- sgml-local-ecat-files:nil
- End:
- vim600: syn=xml fen fdm=syntax fdl=2 si
- vim: et tw=78 syn=sgml
- vi: ts=1 sw=1
- -->
-
diff --git a/reference/ncurses/setup.xml b/reference/ncurses/setup.xml
deleted file mode 100644
index e738e8a5f7..0000000000
--- a/reference/ncurses/setup.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ncurses.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="ncurses.requirements">
-  &reftitle.required;
-  <para>
-   You need the ncurses libraries and headerfiles. Download the
-   latest version from the <link xlink:href="&url.ncurses;">&url.ncurses;</link>
-   or from an other GNU-Mirror.
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.ncurses.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="ncurses.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="ncurses.resources">
-  &reftitle.resources;
-  <para>
-   This extension defines window, panel and pad resources.
-  </para>
- </section>
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/ncurses/versions.xml b/reference/ncurses/versions.xml
deleted file mode 100644
index e68becd6ae..0000000000
--- a/reference/ncurses/versions.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions>
- <function name='ncurses_addch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_addchnstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_addchstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_addnstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_addstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_assume_default_colors' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_attroff' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_attron' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_attrset' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_baudrate' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_beep' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_bkgd' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_bkgdset' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_border' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_bottom_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_can_change_color' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_cbreak' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_clear' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_clrtobot' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_clrtoeol' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_color_content' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_color_set' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_curs_set' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_def_prog_mode' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_def_shell_mode' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_define_key' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_del_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_delay_output' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_delch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_deleteln' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_delwin' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_doupdate' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_echo' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_echochar' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_end' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_erase' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_erasechar' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_filter' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_flash' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_flushinp' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_getch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_getmaxyx' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_getmouse' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_getyx' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_halfdelay' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_has_colors' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_has_ic' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_has_il' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_has_key' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_hide_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_hline' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_inch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_init' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_init_color' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_init_pair' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_insch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_insdelln' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_insertln' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_insstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_instr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_isendwin' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_keyok' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_keypad' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_killchar' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_longname' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_meta' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mouse_trafo' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mouseinterval' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mousemask' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_move' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_move_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvaddch' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvaddchnstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvaddchstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvaddnstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvaddstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvcur' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvdelch' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvgetch' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvhline' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvinch' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvvline' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_mvwaddstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_napms' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_new_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_newpad' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_newwin' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_nl' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_nocbreak' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_noecho' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_nonl' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_noqiflush' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_noraw' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_pair_content' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_panel_above' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_panel_below' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_panel_window' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_pnoutrefresh' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_prefresh' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_putp' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_qiflush' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_raw' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_refresh' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_replace_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_reset_prog_mode' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_reset_shell_mode' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_resetty' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_savetty' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_scr_dump' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_scr_init' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_scr_restore' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_scr_set' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_scrl' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_show_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_attr' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_attroff' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_attron' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_attrset' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_clear' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_color' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_init' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_noutrefresh' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_refresh' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_restore' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_set' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_slk_touch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_standend' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_standout' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_start_color' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_termattrs' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_termname' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_timeout' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_top_panel' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_typeahead' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_ungetch' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_ungetmouse' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_update_panels' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_use_default_colors' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_use_env' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_use_extended_names' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_vidattr' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_vline' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_waddch' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_waddstr' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wattroff' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wattron' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wattrset' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wborder' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wclear' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wcolor_set' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_werase' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wgetch' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_whline' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wmouse_trafo' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wmove' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wnoutrefresh' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wrefresh' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wstandend' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wstandout' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
- <function name='ncurses_wvline' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL ncurses &gt;= 1.0.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/network/functions/closelog.xml b/reference/network/functions/closelog.xml
index 479fb95e80..1ebb0d977e 100644
--- a/reference/network/functions/closelog.xml
+++ b/reference/network/functions/closelog.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/network/functions/dns-get-record.xml b/reference/network/functions/dns-get-record.xml
index ad9f1d079c..c2419682e5 100644
--- a/reference/network/functions/dns-get-record.xml
+++ b/reference/network/functions/dns-get-record.xml
@@ -262,7 +262,7 @@
        </entry>
       </row>
       <row>
-       <entry><literal>A6</literal>(PHP &gt;= 5.1.0)</entry>
+       <entry><literal>A6</literal></entry>
        <entry>
         <literal>masklen</literal>: Length (in bits) to inherit from the target
         specified by <parameter>chain</parameter>.
@@ -510,17 +510,6 @@ Additional = Array
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    For compatibility with versions before PHP 5.3.0 on some operating systems,
-    try the <link xlink:href="&url.php.pear;">PEAR</link> class
-    <link xlink:href="&url.pear.package;Net_DNS">Net_DNS</link>.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/network/functions/gethostname.xml b/reference/network/functions/gethostname.xml
index f3d7e5f711..5781c461b2 100644
--- a/reference/network/functions/gethostname.xml
+++ b/reference/network/functions/gethostname.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -35,9 +40,6 @@
 <![CDATA[
 <?php
 echo gethostname(); // may output e.g,: sandie
-
-// Or, an option that also works before PHP 5.3
-echo php_uname('n'); // may output e.g,: sandie
 ?>
 ]]>
     </programlisting>
diff --git a/reference/network/functions/header.xml b/reference/network/functions/header.xml
index c25855fb73..ba12b95689 100644
--- a/reference/network/functions/header.xml
+++ b/reference/network/functions/header.xml
@@ -67,7 +67,12 @@ exit;
         <programlisting role="php">
 <![CDATA[
 <?php
-header("HTTP/1.0 404 Not Found");
+// This example illustrates the "HTTP/" special case
+// Better alternatives in typical use cases include:
+// 1. header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
+//    (to override http status messages for clients that are still using HTTP/1.0)
+// 2. http_response_code(404); (to use the default message)
+header("HTTP/1.1 404 Not Found");
 ?>
 ]]>
         </programlisting>
@@ -141,6 +146,14 @@ header('WWW-Authenticate: NTLM', false);
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   On failure to schedule the header to be sent, <function>header</function>
+   issues an <constant>E_WARNING</constant> level error.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -231,14 +244,6 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
     at any time unless the HTTP headers have already been sent.
    </para>
   </note>
-  <note>
-   <para>
-    There is a bug in Microsoft Internet Explorer 4.01 that prevents
-    this from working. There is no workaround. There is also a bug
-    in Microsoft Internet Explorer 5.5 that interferes with this,
-    which can be resolved by upgrading to Service Pack 2 or later.
-   </para>
-  </note>
   <note>
    <para>
     Most contemporary clients accept relative <acronym>URI</acronym>s as argument to
@@ -283,6 +288,7 @@ exit;
     <member><function>setcookie</function></member>
     <member><function>http_response_code</function></member>
     <member><function>header_remove</function></member>
+    <member><function>header_list</function></member>
     <member>
      The section on <link linkend="features.http-auth">HTTP
      authentication</link>
diff --git a/reference/network/functions/headers-list.xml b/reference/network/functions/headers-list.xml
index 0b784b07d1..cc3114a462 100644
--- a/reference/network/functions/headers-list.xml
+++ b/reference/network/functions/headers-list.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/network/functions/ip2long.xml b/reference/network/functions/ip2long.xml
index 34f9f6ca67..d7f4c93e77 100644
--- a/reference/network/functions/ip2long.xml
+++ b/reference/network/functions/ip2long.xml
@@ -105,11 +105,8 @@ if ($long == -1 || $long === FALSE) {
   </note>
   <note>
    <para>
-    <function>ip2long</function> will return &false; for the IP
-    <literal>255.255.255.255</literal> in PHP 5 &lt;= 5.0.2, and <literal>-1</literal>
-    on 64-bits systems in PHP 5 &lt;=5.2.4. It was fixed in
-    PHP 5.2.5 where it returns <literal>4294967295</literal>. 32-bit systems
-    will return <literal>-1</literal> due to the integer value overflowing.    
+    <function>ip2long</function> will return <literal>-1</literal> for the IP
+    <literal>255.255.255.255</literal> on 32-bit systems due to the integer value overflowing.
    </para>
   </note>
  </refsect1>
diff --git a/reference/network/functions/pfsockopen.xml b/reference/network/functions/pfsockopen.xml
index e9c71084c9..0f177d0140 100644
--- a/reference/network/functions/pfsockopen.xml
+++ b/reference/network/functions/pfsockopen.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>pfsockopen</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>pfsockopen</methodname>
    <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter role="reference">errno</parameter></methodparam>
@@ -31,6 +31,17 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   <function>pfsockopen</function> returns a file pointer which may be used
+   together with the other file functions (such as
+   <function>fgets</function>, <function>fgetss</function>,
+   <function>fwrite</function>, <function>fclose</function>, and
+   <function>feof</function>),&return.falseforfailure;.
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/network/functions/setcookie.xml b/reference/network/functions/setcookie.xml
index 00c8aa51b0..9bde83f38a 100644
--- a/reference/network/functions/setcookie.xml
+++ b/reference/network/functions/setcookie.xml
@@ -185,116 +185,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   Some examples follow how to send cookies:
-   <example>
-    <title><function>setcookie</function> send example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$value = 'something from somewhere';
-
-setcookie("TestCookie", $value);
-setcookie("TestCookie", $value, time()+3600);  /* expire in 1 hour */
-setcookie("TestCookie", $value, time()+3600, "/~rasmus/", "example.com", 1);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Note that the value portion of the cookie will automatically be
-   urlencoded when you send the cookie, and when it is received, it
-   is automatically decoded and assigned to a variable by the same
-   name as the cookie name. If you don't want this, you can use
-   <function>setrawcookie</function> instead. To see
-   the contents of our test cookie in a script, simply use one of the
-   following examples:
-  </para>
-  <para>
-   <informalexample>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Print an individual cookie
-echo $_COOKIE["TestCookie"];
-
-// Another way to debug/test is to view all cookies
-print_r($_COOKIE);
-?>
-]]>
-    </programlisting>
-   </informalexample>
-  </para>
-  <para>
-   <example>
-    <title><function>setcookie</function> delete example</title>
-    <para>
-     When deleting a cookie you should assure that the expiration date
-     is in the past, to trigger the removal mechanism in your browser.
-     Examples follow how to delete cookies sent in previous example:
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// set the expiration date to one hour ago
-setcookie("TestCookie", "", time() - 3600);
-setcookie("TestCookie", "", time() - 3600, "/~rasmus/", "example.com", 1);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title><function>setcookie</function> and arrays</title>
-    <para>
-     You may also set array cookies by using array notation in the
-     cookie name. This has the effect of setting as many cookies as
-     you have array elements, but when the cookie is received by your
-     script, the values are all placed in an array with the cookie's
-     name:
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// set the cookies
-setcookie("cookie[three]", "cookiethree");
-setcookie("cookie[two]", "cookietwo");
-setcookie("cookie[one]", "cookieone");
-
-// after the page reloads, print them out
-if (isset($_COOKIE['cookie'])) {
-    foreach ($_COOKIE['cookie'] as $name => $value) {
-        $name = htmlspecialchars($name);
-        $value = htmlspecialchars($value);
-        echo "$name : $value <br />\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-three : cookiethree
-two : cookietwo
-one : cookieone
-]]>
-    </screen>
-   </example>
-   <note>
-    <simpara>
-     Using separator characters such as <literal>[</literal> and <literal>]</literal>
-     as part of the cookie name is not compliant to RFC 6265, section 4, but supposed
-     to be supported by user agents according to RFC 6265, section 5.
-    </simpara>
-   </note>
-  </para>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -321,6 +211,116 @@ one : cookieone
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   Some examples follow how to send cookies:
+   <example>
+    <title><function>setcookie</function> send example</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+$value = 'something from somewhere';
+
+setcookie("TestCookie", $value);
+setcookie("TestCookie", $value, time()+3600);  /* expire in 1 hour */
+setcookie("TestCookie", $value, time()+3600, "/~rasmus/", "example.com", 1);
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+  <para>
+   Note that the value portion of the cookie will automatically be
+   urlencoded when you send the cookie, and when it is received, it
+   is automatically decoded and assigned to a variable by the same
+   name as the cookie name. If you don't want this, you can use
+   <function>setrawcookie</function> instead. To see
+   the contents of our test cookie in a script, simply use one of the
+   following examples:
+  </para>
+  <para>
+   <informalexample>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+// Print an individual cookie
+echo $_COOKIE["TestCookie"];
+
+// Another way to debug/test is to view all cookies
+print_r($_COOKIE);
+?>
+]]>
+    </programlisting>
+   </informalexample>
+  </para>
+  <para>
+   <example>
+    <title><function>setcookie</function> delete example</title>
+    <para>
+     When deleting a cookie you should assure that the expiration date
+     is in the past, to trigger the removal mechanism in your browser.
+     Examples follow how to delete cookies sent in previous example:
+    </para>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+// set the expiration date to one hour ago
+setcookie("TestCookie", "", time() - 3600);
+setcookie("TestCookie", "", time() - 3600, "/~rasmus/", "example.com", 1);
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+  <para>
+   <example>
+    <title><function>setcookie</function> and arrays</title>
+    <para>
+     You may also set array cookies by using array notation in the
+     cookie name. This has the effect of setting as many cookies as
+     you have array elements, but when the cookie is received by your
+     script, the values are all placed in an array with the cookie's
+     name:
+    </para>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+// set the cookies
+setcookie("cookie[three]", "cookiethree");
+setcookie("cookie[two]", "cookietwo");
+setcookie("cookie[one]", "cookieone");
+
+// after the page reloads, print them out
+if (isset($_COOKIE['cookie'])) {
+    foreach ($_COOKIE['cookie'] as $name => $value) {
+        $name = htmlspecialchars($name);
+        $value = htmlspecialchars($value);
+        echo "$name : $value <br />\n";
+    }
+}
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+     <![CDATA[
+three : cookiethree
+two : cookietwo
+one : cookieone
+]]>
+    </screen>
+   </example>
+   <note>
+    <simpara>
+     Using separator characters such as <literal>[</literal> and <literal>]</literal>
+     as part of the cookie name is not compliant to RFC 6265, section 4, but supposed
+     to be supported by user agents according to RFC 6265, section 5.
+    </simpara>
+   </note>
+  </para>
+ </refsect1>
+ 
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/network/functions/syslog.xml b/reference/network/functions/syslog.xml
index 6220ead04b..df992cc680 100644
--- a/reference/network/functions/syslog.xml
+++ b/reference/network/functions/syslog.xml
@@ -89,10 +89,7 @@
      <term><parameter>message</parameter></term>
      <listitem>
       <para>
-       The message to send, except that the two characters
-       <literal>%m</literal> will be replaced by the error message string
-       (strerror) corresponding to the present value of
-       <errortype>errno</errortype>.
+       The message to send.
       </para>
      </listitem>
     </varlistentry>
@@ -142,7 +139,7 @@ closelog();
  <refsect1 role="notes">
   &reftitle.notes;
   <para>
-   On Windows NT, the syslog service is emulated using the Event
+   On Windows, the syslog service is emulated using the Event
    Log.
   </para>
   <note>
@@ -161,6 +158,7 @@ closelog();
    <simplelist>
     <member><function>openlog</function></member>
     <member><function>closelog</function></member>
+    <member><link linkend="ini.syslog.filter">syslog.filter</link> INI setting (starting with PHP 7.3)</member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oauth/book.xml b/reference/oauth/book.xml
index df98aabf62..057bae2fcb 100644
--- a/reference/oauth/book.xml
+++ b/reference/oauth/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.oauth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>OAuth</title>
 
  <preface xml:id="intro.oauth">
diff --git a/reference/oci8/OCI-Collection/free.xml b/reference/oci8/OCI-Collection/free.xml
index ecd94e146b..00aa46bea9 100644
--- a/reference/oci8/OCI-Collection/free.xml
+++ b/reference/oci8/OCI-Collection/free.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Collection/max.xml b/reference/oci8/OCI-Collection/max.xml
index e7498b7de1..72b42560bd 100644
--- a/reference/oci8/OCI-Collection/max.xml
+++ b/reference/oci8/OCI-Collection/max.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Collection/size.xml b/reference/oci8/OCI-Collection/size.xml
index 571a89fe99..3ec5918889 100644
--- a/reference/oci8/OCI-Collection/size.xml
+++ b/reference/oci8/OCI-Collection/size.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/close.xml b/reference/oci8/OCI-Lob/close.xml
index 5b9124da64..ed2d4a195b 100644
--- a/reference/oci8/OCI-Lob/close.xml
+++ b/reference/oci8/OCI-Lob/close.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/eof.xml b/reference/oci8/OCI-Lob/eof.xml
index 51756db669..e76ea4848b 100644
--- a/reference/oci8/OCI-Lob/eof.xml
+++ b/reference/oci8/OCI-Lob/eof.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -25,15 +30,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function will return an Oracle error if <xref linkend="oci-lob.setbuffering"/> is enabled on the LOB.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -57,6 +53,15 @@
   </informaltable>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function will return an Oracle error if <xref linkend="oci-lob.setbuffering"/> is enabled on the LOB.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/oci8/OCI-Lob/free.xml b/reference/oci8/OCI-Lob/free.xml
index d88e56ff58..e5edaf99d1 100644
--- a/reference/oci8/OCI-Lob/free.xml
+++ b/reference/oci8/OCI-Lob/free.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/getBuffering.xml b/reference/oci8/OCI-Lob/getBuffering.xml
index 9e2ea74cf4..d94f99e229 100644
--- a/reference/oci8/OCI-Lob/getBuffering.xml
+++ b/reference/oci8/OCI-Lob/getBuffering.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/load.xml b/reference/oci8/OCI-Lob/load.xml
index a291d2d5ad..59e0961ab4 100644
--- a/reference/oci8/OCI-Lob/load.xml
+++ b/reference/oci8/OCI-Lob/load.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/rewind.xml b/reference/oci8/OCI-Lob/rewind.xml
index ce39113c62..6b3da45589 100644
--- a/reference/oci8/OCI-Lob/rewind.xml
+++ b/reference/oci8/OCI-Lob/rewind.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/size.xml b/reference/oci8/OCI-Lob/size.xml
index ed2378f28c..91b4e4f2a4 100644
--- a/reference/oci8/OCI-Lob/size.xml
+++ b/reference/oci8/OCI-Lob/size.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/OCI-Lob/tell.xml b/reference/oci8/OCI-Lob/tell.xml
index c18bf73e08..1e24f69416 100644
--- a/reference/oci8/OCI-Lob/tell.xml
+++ b/reference/oci8/OCI-Lob/tell.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/functions/oci-bind-by-name.xml b/reference/oci8/functions/oci-bind-by-name.xml
index 3a8cf584f5..01ff3da919 100644
--- a/reference/oci8/functions/oci-bind-by-name.xml
+++ b/reference/oci8/functions/oci-bind-by-name.xml
@@ -97,7 +97,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       A valid OCI8 statement identifer.
+       A valid OCI8 statement identifier.
       </para>
      </listitem>
     </varlistentry>
@@ -798,20 +798,11 @@ var_dump($output2);  // false
 
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
  <refsect1 role="notes">
   &reftitle.notes;
   <warning>
    <para>
-    Do not use <link
-     linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link> or
-    <function>addslashes</function>
+    Do not use <function>addslashes</function>
     and <function>oci_bind_by_name</function> simultaneously as no
     quoting is needed. Any magically applied quotes will be written
     into your database because <function>oci_bind_by_name</function>
diff --git a/reference/oci8/functions/oci-free-descriptor.xml b/reference/oci8/functions/oci-free-descriptor.xml
index 1e792e5fc9..18c6fefef3 100644
--- a/reference/oci8/functions/oci-free-descriptor.xml
+++ b/reference/oci8/functions/oci-free-descriptor.xml
@@ -17,6 +17,22 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>descriptor</parameter></term>
+     <listitem>
+      <para>
+       Descriptor allocated by <function>oci_new_descriptor</function>.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/oci8/functions/oci-set-edition.xml b/reference/oci8/functions/oci-set-edition.xml
index 768a7cb5d9..e6be7cac95 100644
--- a/reference/oci8/functions/oci-set-edition.xml
+++ b/reference/oci8/functions/oci-set-edition.xml
@@ -54,35 +54,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <title>Oracle version requirement</title>
-   <para>
-    This function is available from Oracle 11<emphasis>g</emphasis>R2 onwards.
-   </para>
-  </note>
-  <caution>
-   <title>Persistent connections</title>
-   <para>
-    To avoid inconsistencies and unexpected errors, do not use ALTER
-    SESSION SET EDITION to change the edition on persistent connections.
-   </para>
-  </caution>
-  <caution>
-   <title>DRCP Connection Pooling</title>
-   <para>
-    To avoid inconsistencies and unexpected errors when using editions
-    and <link linkend="oci8.connection">DRCP</link> with Oracle
-    11.2.0.1, keep a one-to-one correspondence between
-    the <link linkend="ini.oci8.connection-class">oci8.connection_class</link>
-    and the edition name used by applications.  Each pooled server of
-    a given connection class should only be used with one edition.
-    This restriction has been removed with Oracle 11.2.0.2.
-   </para>
-  </caution>
- </refsect1>
-
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -138,6 +109,35 @@ echo "The result is $r\n";
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <title>Oracle version requirement</title>
+   <para>
+    This function is available from Oracle 11<emphasis>g</emphasis>R2 onwards.
+   </para>
+  </note>
+  <caution>
+   <title>Persistent connections</title>
+   <para>
+    To avoid inconsistencies and unexpected errors, do not use ALTER
+    SESSION SET EDITION to change the edition on persistent connections.
+   </para>
+  </caution>
+  <caution>
+   <title>DRCP Connection Pooling</title>
+   <para>
+    To avoid inconsistencies and unexpected errors when using editions
+    and <link linkend="oci8.connection">DRCP</link> with Oracle
+    11.2.0.1, keep a one-to-one correspondence between
+    the <link linkend="ini.oci8.connection-class">oci8.connection_class</link>
+    and the edition name used by applications.  Each pooled server of
+    a given connection class should only be used with one edition.
+    This restriction has been removed with Oracle 11.2.0.2.
+   </para>
+  </caution>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/oci8/functions/oci-set-module-name.xml b/reference/oci8/functions/oci-set-module-name.xml
index fd3cdc7b83..eebc552471 100644
--- a/reference/oci8/functions/oci-set-module-name.xml
+++ b/reference/oci8/functions/oci-set-module-name.xml
@@ -61,13 +61,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &oci.availability.note.10g;
-  &oci.clientinfo.tip;
-  &oci.roundtrip.caution;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -104,6 +97,13 @@ SQL> select module from v$session;
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &oci.availability.note.10g;
+  &oci.clientinfo.tip;
+  &oci.roundtrip.caution;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/oci8/ini.xml b/reference/oci8/ini.xml
index ceb330133e..ed39fc34a8 100644
--- a/reference/oci8/ini.xml
+++ b/reference/oci8/ini.xml
@@ -20,55 +20,55 @@
          <entry><link linkend="ini.oci8.connection-class">oci8.connection_class</link></entry>
          <entry>""</entry>
          <entry>PHP_INI_ALL</entry>
-         <entry>Available since PHP 5.3 (PECL OCI8 1.3).</entry>
+         <entry>Available since PECL OCI8 1.3.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.default-prefetch">oci8.default_prefetch</link></entry>
          <entry>"100"</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.events">oci8.events</link></entry>
          <entry>Off</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.3 (PECL OCI8 1.3).</entry>
+         <entry>Available since PECL OCI8 1.3.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.max-persistent">oci8.max_persistent</link></entry>
          <entry>"-1"</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.old-oci-close-semantics">oci8.old_oci_close_semantics</link></entry>
          <entry>Off</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.persistent-timeout">oci8.persistent_timeout</link></entry>
          <entry>"-1"</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.ping-interval">oci8.ping_interval</link></entry>
          <entry>"60"</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.privileged-connect">oci8.privileged_connect</link></entry>
          <entry>Off</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
         <row>
          <entry><link linkend="ini.oci8.statement-cache-size">oci8.statement_cache_size</link></entry>
          <entry>"20"</entry>
          <entry>PHP_INI_SYSTEM</entry>
-         <entry>Available since PHP 5.1.2 (PECL OCI8 1.1).</entry>
+         <entry>Available since PECL OCI8 1.1.</entry>
         </row>
        </tbody>
       </tgroup>
diff --git a/reference/opcache/functions/opcache-get-configuration.xml b/reference/opcache/functions/opcache-get-configuration.xml
index 6556dc9c56..85313313f6 100644
--- a/reference/opcache/functions/opcache-get-configuration.xml
+++ b/reference/opcache/functions/opcache-get-configuration.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/openal/book.xml b/reference/openal/book.xml
index 16ccf70acb..b5bb23d9ba 100644
--- a/reference/openal/book.xml
+++ b/reference/openal/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.openal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>OpenAL Audio Bindings</title>
  <titleabbrev>OpenAL</titleabbrev>
  
diff --git a/reference/openal/functions/openal-buffer-create.xml b/reference/openal/functions/openal-buffer-create.xml
index a8ef97a9f7..f786e1ce7c 100644
--- a/reference/openal/functions/openal-buffer-create.xml
+++ b/reference/openal/functions/openal-buffer-create.xml
@@ -14,6 +14,12 @@
    <void/>
   </methodsynopsis>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/openal/functions/openal-source-create.xml b/reference/openal/functions/openal-source-create.xml
index 67b65b451f..7e23564126 100644
--- a/reference/openal/functions/openal-source-create.xml
+++ b/reference/openal/functions/openal-source-create.xml
@@ -14,6 +14,12 @@
    <void/>
   </methodsynopsis>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/openssl/configure.xml b/reference/openssl/configure.xml
index e8574f355b..0ee27694f7 100644
--- a/reference/openssl/configure.xml
+++ b/reference/openssl/configure.xml
@@ -14,7 +14,7 @@
   <literal>/dev/random</literal> device.
  </para>
  <para>
-  As of PHP 5.6.3, the configure option <option role="configure">--with-system-ciphers</option>
+  The configure option <option role="configure">--with-system-ciphers</option>
   is available which causes PHP to use the system cipher list instead of a hard-coded default.
  </para>
  <note>
diff --git a/reference/openssl/constants.xml b/reference/openssl/constants.xml
index 598e8fe290..a2958e265a 100644
--- a/reference/openssl/constants.xml
+++ b/reference/openssl/constants.xml
@@ -180,7 +180,6 @@
    <listitem>
     <simpara>
      This constant is only available when PHP is compiled with OpenSSL 0.9.8+.
-     Added in PHP 5.2.0.
     </simpara>
    </listitem>
   </varlistentry>  
@@ -403,7 +402,7 @@
      </term>
      <listitem>
       <simpara>
-       Added in PHP 5.4.8.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -414,7 +413,7 @@
      </term>
      <listitem>
       <simpara>
-       Added in PHP 5.4.8.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -425,7 +424,7 @@
      </term>
      <listitem>
       <simpara>
-       Added in PHP 5.4.8.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -436,7 +435,7 @@
      </term>
      <listitem>
       <simpara>
-       Added in PHP 5.4.8.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -447,7 +446,7 @@
      </term>
      <listitem>
       <simpara>
-       Added in PHP 5.4.8.
+
       </simpara>
      </listitem>
     </varlistentry>
@@ -480,7 +479,7 @@
      </term>
      <listitem>
       <simpara>
-       As of PHP 5.2.13 and PHP 5.3.2, this constant is only available 
+       This constant is only available 
        if PHP is compiled with MD2 support. This requires passing in the 
        -DHAVE_OPENSSL_MD2_H CFLAG when compiling PHP, and enable-md2 when 
        compiling OpenSSL 1.0.0+.
@@ -558,7 +557,7 @@
    </term>
    <listitem>
     <simpara>
-     Added in PHP 5.4.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -569,7 +568,7 @@
    </term>
    <listitem>
     <simpara>
-     Added in PHP 5.4.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -580,7 +579,7 @@
    </term>
    <listitem>
     <simpara>
-     Added in PHP 5.4.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -597,7 +596,7 @@
       </term>
       <listitem>
         <simpara>
-         Added in PHP 5.2.0.
+
         </simpara>
       </listitem>
     </varlistentry>
@@ -608,7 +607,7 @@
       </term>
       <listitem>
         <simpara>
-         Added in PHP 5.2.0.
+
         </simpara>
       </listitem>
     </varlistentry>
@@ -632,7 +631,7 @@
   </variablelist>
   <note>
    <para>
-    This constant was added in 5.3.2 and requires PHP to be 
+    This constant requires PHP to be 
     built with OpenSSL 0.9.8j or greater.
    </para>
   </note>
diff --git a/reference/openssl/functions/openssl-encrypt.xml b/reference/openssl/functions/openssl-encrypt.xml
index 9332d7f419..ded01552c5 100644
--- a/reference/openssl/functions/openssl-encrypt.xml
+++ b/reference/openssl/functions/openssl-encrypt.xml
@@ -167,7 +167,7 @@ if (in_array($cipher, openssl_get_cipher_methods()))
    </example>
 
    <example>
-    <title>AES Authenticated Encryption example for PHP 5.6+</title>
+    <title>AES Authenticated Encryption example prior to PHP 7.1</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -187,7 +187,7 @@ $hmac = substr($c, $ivlen, $sha2len=32);
 $ciphertext_raw = substr($c, $ivlen+$sha2len);
 $original_plaintext = openssl_decrypt($ciphertext_raw, $cipher, $key, $options=OPENSSL_RAW_DATA, $iv);
 $calcmac = hash_hmac('sha256', $ciphertext_raw, $key, $as_binary=true);
-if (hash_equals($hmac, $calcmac))//PHP 5.6+ timing attack safe comparison
+if (hash_equals($hmac, $calcmac))// timing attack safe comparison
 {
     echo $original_plaintext."\n";
 }
diff --git a/reference/openssl/functions/openssl-error-string.xml b/reference/openssl/functions/openssl-error-string.xml
index 9a1b2386ad..b64b3de146 100644
--- a/reference/openssl/functions/openssl-error-string.xml
+++ b/reference/openssl/functions/openssl-error-string.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/openssl/functions/openssl-pkcs7-read.xml b/reference/openssl/functions/openssl-pkcs7-read.xml
index b7af9f747f..7df1c3241b 100644
--- a/reference/openssl/functions/openssl-pkcs7-read.xml
+++ b/reference/openssl/functions/openssl-pkcs7-read.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>openssl_pkcs7_read</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam><type>array</type><parameter role="reference">certificates</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -25,10 +25,10 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>input_filename</parameter></term>
+    <term><parameter>data</parameter></term>
     <listitem>
      <para>
-      
+      The string of data you wish to parse (p7b format).
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
     <term><parameter>certificates</parameter></term>
     <listitem>
      <para>
-      
+      The array of PEM certificates from the p7b input data.
      </para>
     </listitem>
    </varlistentry>
@@ -50,6 +50,46 @@
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>Get a PEM array from a P7B file</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+$file = 'certs.p7b';
+
+$f = file_get_contents($file);
+$p7 = array();
+$r = openssl_pkcs7_read($f, $p7);
+
+if ($r === false) {
+    printf("ERROR: %s is not a proper p7b file".PHP_EOL, $file);
+        for($e = openssl_error_string(), $i = 0; $e; $e = openssl_error_string(), $i++)
+            printf("SSL l%d: %s".PHP_EOL, $i, $e);
+    exit(1);
+}
+
+print_r($p7);
+?>
+]]>
+    </programlisting>
+   </example>
+
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>openssl_csr_sign</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 
 </refentry>
 <!-- Keep this comment at the end of the file
diff --git a/reference/openssl/ini.xml b/reference/openssl/ini.xml
index 803562ac5e..fa26d7effa 100644
--- a/reference/openssl/ini.xml
+++ b/reference/openssl/ini.xml
@@ -20,13 +20,13 @@
       <entry>openssl.cafile</entry>
       <entry>""</entry>
       <entry>PHP_INI_PERDIR</entry>
-      <entry>Available as of PHP 5.6.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry>openssl.capath</entry>
       <entry>""</entry>
       <entry>PHP_INI_PERDIR</entry>
-      <entry>Available as of PHP 5.6.0.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/openssl/setup.xml b/reference/openssl/setup.xml
index f6e059d264..71a8d62487 100644
--- a/reference/openssl/setup.xml
+++ b/reference/openssl/setup.xml
@@ -10,9 +10,7 @@
   <para>
    In order to use the OpenSSL functions you need to install the <link
    xlink:href="&url.openssl;">OpenSSL</link> library.
-   PHP 5 requires at least OpenSSL &gt;= 0.9.6. However later PHP 5 versions
-   have some compilation issues and should be used at least with OpenSSL &gt;=
-   0.9.8 which is also a minimal version for PHP 7.0. Other versions
+   PHP 7 requires at least OpenSSL &gt;= 0.9.8. Other versions
    (PHP &gt;= 7.1.0) require OpenSSL &gt;= 1.0.1.
   </para>
   <warning>
diff --git a/reference/outcontrol/constants.xml b/reference/outcontrol/constants.xml
index b640934405..adc91ae52a 100644
--- a/reference/outcontrol/constants.xml
+++ b/reference/outcontrol/constants.xml
@@ -24,9 +24,6 @@
     <para>
      Indicates that the output buffer is being flushed, and had data to output.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-flush">
@@ -38,9 +35,6 @@
     <para>
      Indicates that the buffer has been flushed.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-clean">
@@ -52,9 +46,6 @@
     <para>
      Indicates that the output buffer has been cleaned.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-final">
@@ -66,9 +57,6 @@
     <para>
      Indicates that this is the final output buffering operation.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-cont">
@@ -82,7 +70,7 @@
      continue.
     </para>
     <para>
-     As of PHP 5.4, this is an alias for
+     This is an alias for
      <constant>PHP_OUTPUT_HANDLER_WRITE</constant>.
     </para>
    </listitem>
@@ -97,7 +85,7 @@
      Indicates that output buffering has ended.
     </para>
     <para>
-     As of PHP 5.4, this is an alias for
+     This is an alias for
      <constant>PHP_OUTPUT_HANDLER_FINAL</constant>.
     </para>
    </listitem>
@@ -112,9 +100,6 @@
      Controls whether an output buffer created by
      <function>ob_start</function> can be cleaned.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-flushable">
@@ -127,9 +112,6 @@
      Controls whether an output buffer created by
      <function>ob_start</function> can be flushed.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-removable">
@@ -142,9 +124,6 @@
      Controls whether an output buffer created by
      <function>ob_start</function> can be removed before the end of the script.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.php-output-handler-stdflags">
@@ -159,9 +138,6 @@
      <constant>PHP_OUTPUT_HANDLER_FLUSHABLE</constant> |
      <constant>PHP_OUTPUT_HANDLER_REMOVABLE</constant>.
     </para>
-    <para>
-     Available since PHP 5.4.
-    </para>
    </listitem>
   </varlistentry>
  </variablelist>
diff --git a/reference/outcontrol/functions/flush.xml b/reference/outcontrol/functions/flush.xml
index 7e17f942b5..0b26572a93 100644
--- a/reference/outcontrol/functions/flush.xml
+++ b/reference/outcontrol/functions/flush.xml
@@ -48,6 +48,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-clean.xml b/reference/outcontrol/functions/ob-clean.xml
index 6e4aa5486a..f176760f9a 100644
--- a/reference/outcontrol/functions/ob-clean.xml
+++ b/reference/outcontrol/functions/ob-clean.xml
@@ -27,6 +27,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-end-clean.xml b/reference/outcontrol/functions/ob-end-clean.xml
index 961555d591..cdc16684c3 100644
--- a/reference/outcontrol/functions/ob-end-clean.xml
+++ b/reference/outcontrol/functions/ob-end-clean.xml
@@ -29,6 +29,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-end-flush.xml b/reference/outcontrol/functions/ob-end-flush.xml
index 59185c81ea..2a0eb63747 100644
--- a/reference/outcontrol/functions/ob-end-flush.xml
+++ b/reference/outcontrol/functions/ob-end-flush.xml
@@ -36,6 +36,11 @@
   </note>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-flush.xml b/reference/outcontrol/functions/ob-flush.xml
index 588f2d29e4..5975ef2e6c 100644
--- a/reference/outcontrol/functions/ob-flush.xml
+++ b/reference/outcontrol/functions/ob-flush.xml
@@ -25,6 +25,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-get-clean.xml b/reference/outcontrol/functions/ob-get-clean.xml
index 8eeaca5dac..d056a1542e 100644
--- a/reference/outcontrol/functions/ob-get-clean.xml
+++ b/reference/outcontrol/functions/ob-get-clean.xml
@@ -30,6 +30,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-get-contents.xml b/reference/outcontrol/functions/ob-get-contents.xml
index bb0eb40049..1f18c31557 100644
--- a/reference/outcontrol/functions/ob-get-contents.xml
+++ b/reference/outcontrol/functions/ob-get-contents.xml
@@ -15,7 +15,12 @@
   <para>
    Gets the contents of the output buffer without clearing it.
   </para>
- </refsect1> 
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/outcontrol/functions/ob-get-flush.xml b/reference/outcontrol/functions/ob-get-flush.xml
index 5e8b0f3963..80c33da88b 100644
--- a/reference/outcontrol/functions/ob-get-flush.xml
+++ b/reference/outcontrol/functions/ob-get-flush.xml
@@ -30,6 +30,11 @@
   </note>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-get-length.xml b/reference/outcontrol/functions/ob-get-length.xml
index ee725f0e48..b0c16c342c 100644
--- a/reference/outcontrol/functions/ob-get-length.xml
+++ b/reference/outcontrol/functions/ob-get-length.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-get-level.xml b/reference/outcontrol/functions/ob-get-level.xml
index a12c09437b..7a850ff78d 100644
--- a/reference/outcontrol/functions/ob-get-level.xml
+++ b/reference/outcontrol/functions/ob-get-level.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-list-handlers.xml b/reference/outcontrol/functions/ob-list-handlers.xml
index fd8bded77a..ed70218b60 100644
--- a/reference/outcontrol/functions/ob-list-handlers.xml
+++ b/reference/outcontrol/functions/ob-list-handlers.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/outcontrol/functions/ob-start.xml b/reference/outcontrol/functions/ob-start.xml
index 211f4e5bd4..af542032b3 100644
--- a/reference/outcontrol/functions/ob-start.xml
+++ b/reference/outcontrol/functions/ob-start.xml
@@ -43,6 +43,10 @@
    functions are active, output is being filtered sequentially
    through each of them in nesting order.
   </para>
+  <para>
+   If outbut buffering is still active when the script ends, PHP outputs the
+   contents automatically.
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -133,10 +137,6 @@
        value <literal>0</literal> means that the output function will only be
        called when the output buffer is closed.
       </para>
-      <para>
-       Prior to PHP 5.4.0, the value <literal>1</literal> was a special case
-       value that set the chunk size to 4096 bytes.
-      </para>
      </listitem>
     </varlistentry>
     <varlistentry>
@@ -249,17 +249,12 @@ ob_end_flush();
 
   <para>
    <example xml:id="function.ob-start.flags-bc">
-    <title>Creating an uneraseable output buffer in a way compatible with both PHP 5.3 and 5.4</title>
+    <title>Creating an unerasable output buffer</title>
     <programlisting role="php">
 <![CDATA[
 <?php
 
-if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-  ob_start(null, 0, PHP_OUTPUT_HANDLER_STDFLAGS ^
-    PHP_OUTPUT_HANDLER_REMOVABLE);
-} else {
-  ob_start(null, 0, false);
-}
+ob_start(null, 0, PHP_OUTPUT_HANDLER_STDFLAGS ^ PHP_OUTPUT_HANDLER_REMOVABLE);
 
 ?>
 ]]>
diff --git a/reference/outcontrol/functions/output-reset-rewrite-vars.xml b/reference/outcontrol/functions/output-reset-rewrite-vars.xml
index 7051feec1c..82d7ff2c62 100644
--- a/reference/outcontrol/functions/output-reset-rewrite-vars.xml
+++ b/reference/outcontrol/functions/output-reset-rewrite-vars.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/paradox/book.xml b/reference/paradox/book.xml
deleted file mode 100644
index 11a5874302..0000000000
--- a/reference/paradox/book.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
- 
-<book xml:id="book.paradox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Paradox File Access</title>
- <titleabbrev>Paradox</titleabbrev>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.paradox">
-  &reftitle.intro;
-  <para>
-   This module allows to read and write Paradox databases, primary index
-   files and blob files. Write support has been proven to be quite reliable,
-   though due to lack of documentation the produced files may not in
-   any case be readable by other applications. Encrypted databases can
-   be read without specifying a password if pxlib &gt;= 0.5.0 is used.
-  </para>
-  <note>
-   <para>
-    This module is also in development and may change, though major changes to
-    the API are not expected.
-   </para>
-  </note>
-  &warn.experimental;
- </preface>
- <!-- }}} -->
- 
- &reference.paradox.setup;
- &reference.paradox.constants;
- &reference.paradox.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/configure.xml b/reference/paradox/configure.xml
deleted file mode 100644
index e10dd65dc5..0000000000
--- a/reference/paradox/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="paradox.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;  
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;paradox">&url.pecl.package;paradox</link>
- </para>
- <para>
-  Make sure you have pxlib installed before. If you install
-  pxlib from an rpm or debian package, do not forget to install the development
-  package as well.
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/paradox/constants.xml b/reference/paradox/constants.xml
deleted file mode 100644
index 613d096ab8..0000000000
--- a/reference/paradox/constants.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="paradox.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <para>
-  The following two tables lists all constants defined by the paradox
-  extension.
-  <table xml:id="paradox.table-fieldtypes">
-   <title>Contants for field types</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Meaning</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PX_FIELD_ALPHA</entry>
-      <entry>Character data with fixed length</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_DATE</entry>
-      <entry>Date, number of days since 1.1.0000</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_SHORT</entry>
-      <entry>Short integer (2 Bytes)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_LONG</entry>
-      <entry>Long integer (4 Bytes)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_CURRENCY</entry>
-      <entry>same as PX_FIELD_NUMBER</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_NUMBER</entry>
-      <entry>Double</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_LOGICAL</entry>
-      <entry>Boolean</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_MEMOBLOB</entry>
-      <entry>Binary large object</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_BLOB</entry>
-      <entry>Binary large object (not supported)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_FMTMEMOBLOB</entry>
-      <entry>Binary large object</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_OLE</entry>
-      <entry>OLE object (basically a blob, not supported)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_GRAPHIC</entry>
-      <entry>Graphic (basically a blob, not supported)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_TIME</entry>
-      <entry>time, number of milli seconds since midnight</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_TIMESTAMP</entry>
-      <entry>timestamp, number of milli seconds since 1.1.0000 </entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_AUTOINC</entry>
-      <entry>Auto incrementing interger (like PX_FIELD_LONG)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_BCD</entry>
-      <entry>Decimal number stored in bcd format (not supported)</entry>
-     </row>
-     <row>
-      <entry>PX_FIELD_BYTES</entry>
-      <entry>Array of Bytes with not more than 255 bytes (not supported)</entry>
-     </row>
-     <row>
-      <entry>PX_KEYTOLOWER</entry>
-      <entry>Turn all field names into lower case</entry>
-     </row>
-     <row>
-      <entry>PX_KEYTOUPPER</entry>
-      <entry>Turn all field names into upper case</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  <table xml:id="paradox.table-filetypes">
-   <title>Contants for file types</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Meaning</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PX_FILE_INDEX_DB</entry>
-      <entry>Indexed database</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_PRIM_INDEX</entry>
-      <entry>Primary index</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_NON_INDEX_DB</entry>
-      <entry>None indexed database</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_NON_INC_SEC_INDEX</entry>
-      <entry>None incremental secondary index</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_SEC_INDEX</entry>
-      <entry>Secondary index</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_INC_SEC_INDEX</entry>
-      <entry>Incremental secondary index</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_NON_INC_SEC_INDEX_G</entry>
-      <entry>Non incremental secondary index</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_SEC_INDEX_G</entry>
-      <entry>Secondary index</entry>
-     </row>
-     <row>
-      <entry>PX_FILE_INC_SEC_INDEX_G</entry>
-      <entry>Non incremental secondary index</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/paradox/functions/px-close.xml b/reference/paradox/functions/px-close.xml
deleted file mode 100644
index ca110a9f59..0000000000
--- a/reference/paradox/functions/px-close.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_close</refname>
-  <refpurpose>Closes a paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_close</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes the paradox database. This function will not close the file. You will
-   have to call <function>fclose</function> afterwards.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_open_fp</function></member>
-    <member>The example at <function>px_new</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-create-fp.xml b/reference/paradox/functions/px-create-fp.xml
deleted file mode 100644
index 3e6f1b5607..0000000000
--- a/reference/paradox/functions/px-create-fp.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-create-fp" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_create_fp</refname>
-  <refpurpose>Create a new paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_create_fp</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>file</parameter></methodparam>
-   <methodparam><type>array</type><parameter>fielddesc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create a new paradox database file. The actual file has to be opened before
-   with <function>fopen</function>. Make sure the file is writable.
-  </para>
-  <note>
-   <para>Calling this functions issues a warning about an empty tablename which
-    can be safely ignored. Just set the tablename afterwards with
-    <function>px_set_parameter</function>.</para>
-  </note>
-  <note>
-   <para>This function is highly experimental, due to insufficient
-    documentation of the paradox file format. Database files created with this
-    function can be opened by <function>px_open_fp</function> and has been
-    successfully opened by the Paradox software, but your milage may vary.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>File handle as returned by <function>fopen</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fielddesc</parameter></term>
-     <listitem>
-      <para>
-       <option>fielddesc</option> is an array containing one element for each
-       field specification. A field specification is an array itself with
-       either two or three elements.The first element is always a string value
-       used as the name of the field. It may not be larger than ten
-       characters. The second element contains the field type which is one of
-       the constants listed in the table <link
-       linkend="paradox.table-fieldtypes">Constants for field types</link>.
-       In the case of a character field or bcd field, you will have to provide
-       a third element specifying the length respectively the precesion of the
-       field. If your field specification contains blob fields, you will have
-       to make sure to either make the field large enough for all field values
-       to fit or specify a blob file with
-       <function>px_set_blob_file</function> for storing the blobs. If this is
-       not done the field data is truncated.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating a Paradox database with two fields</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if(!$pxdoc = px_new()) {
-  /* Error handling */
-}
-$fp = fopen("test.db", "w+");
-$fields = array(array("col1", "S"), array("col2", "I"));
-if(!px_create_fp($pxdoc, $fp, $fields)) {
-  /* Error handling */
-}
-px_set_parameter($pxdoc, "tablename", "testtable");
-for($i=-50; $i<50; $i++) {
-  $rec = array($i, -$i);
-  px_put_record($pxdoc, $rec);
-}   
-px_close($pxdoc);
-px_delete($pxdoc);
-fclose($fp);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_new</function></member>
-    <member><function>px_put_record</function></member>
-    <member><function>fopen</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-date2string.xml b/reference/paradox/functions/px-date2string.xml
deleted file mode 100644
index 9ccc3bebbc..0000000000
--- a/reference/paradox/functions/px-date2string.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.px-date2string" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_date2string</refname>
-  <refpurpose>
-   Converts a date into a string
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>px_date2string</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Turns a date as it stored in the paradox file into human readable
-   format. Paradox dates are the number of days since 1.1.0000.
-   This function is just for convenience. It can be easily replaced by some
-   math and the calendar functions as demonstrated in the example below.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Value as stored in paradox database field of type
-       PX_FIELD_DATE.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-        String format similar to the format used by <function>date</function>.
-        The placeholders support by this function is a subset of those
-        supported by <function>date</function> (Y, y, m, n, d, j, L).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here
-       <entry>Description of change
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Turn a paradox date into a human readable form</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$px = px_new();
-
-/* make up a date as it could be stored in */
-/* a date field of a paradox db. */
-/* 700000 days since 1.1.0000. */
-$days = 700000;
-
-/* Use the calendar functions to print a */
-/* human readable format of the date */
-echo jdtogregorian($days+1721425)."\n";
-/* px_date2string() outputs the same */
-echo px_date2string($px, $days, "n/d/Y")."\n";
-
-px_delete($px);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-7/15/1917
-7/15/1917
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_timestamp2string</function></member>
-    <member><function>jdtogregorian</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/paradox/functions/px-delete-record.xml b/reference/paradox/functions/px-delete-record.xml
deleted file mode 100644
index 1cb510e37f..0000000000
--- a/reference/paradox/functions/px-delete-record.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-delete-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_delete_record</refname>
-  <refpurpose>Deletes record from paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_delete_record</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This function deletes a record from the database. It does not free
-   the space in the database file but just marks it as deleted. Inserting
-   a new record afterwards will reuse the space.
-  </para>
-  <note>
-   <para>
-    This function is only available if pxlib &gt;= 0.6.0 is used.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>num</parameter></term>
-     <listitem>
-      <para>
-       The record number is an artificial number counting records in the order
-       as they are stored in the database. The first record has number 0.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-delete.xml b/reference/paradox/functions/px-delete.xml
deleted file mode 100644
index c4d92f65cf..0000000000
--- a/reference/paradox/functions/px-delete.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-delete" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_delete</refname>
-  <refpurpose>Deletes resource of paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_delete</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes the resource of the paradox file and frees all memory.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-get-field.xml b/reference/paradox/functions/px-get-field.xml
deleted file mode 100644
index cba9f39d67..0000000000
--- a/reference/paradox/functions/px-get-field.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-get-field" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_get_field</refname>
-  <refpurpose>Returns the specification of a single field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>px_get_field</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fieldno</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldno</parameter></term>
-     <listitem>
-      <para>
-       Number of the field. The first field has number 0. Specifying a field
-       number less than 0 and greater or equal the number of fields will
-       trigger an error.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the specification of the <option>fieldno</option>&apos;th database
-   field as an associated array. The array contains three fields named
-   <literal>name</literal>, <literal>type</literal>, and
-   <literal>size</literal>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-get-info.xml b/reference/paradox/functions/px-get-info.xml
deleted file mode 100644
index 8dbf2ab84e..0000000000
--- a/reference/paradox/functions/px-get-info.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-get-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_get_info</refname>
-  <refpurpose>Return lots of information about a paradox file</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>px_get_info</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-  
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associated array with lots of information about a paradox
-   file. This array is likely to be extended in the future.
-  </para>
-  <variablelist>
-   <varlistentry>
-    <term>fileversion</term>
-    <listitem>
-     <para>Version of file multiplied by 10, e.g. 70.</para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>tablename</term>
-    <listitem>
-     <para>Name of table as stored in the file. If the database was created
-       by pxlib, then this will be the name of the file without the
-       extension.</para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>numrecords</term>
-    <listitem>
-     <para>Number of records in this table.</para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>numfields</term>
-    <listitem>
-     <para>Number of fields in this table.</para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>headersize</term>
-    <listitem>
-     <para>Number of bytes used for the header. This is usually 0x800.</para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>recordsize</term>
-    <listitem>
-     <para>Number of bytes used for each record. This is the sum of all
-       field sizes (available since version 1.4.2).</para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>maxtablesize</term>
-    <listitem>
-     <para>
-      This value multiplied by 0x400 is the size of a data block in bytes.
-      The maximum number of records in a datablock is the integer part of
-      (maxtablesize * 0x400 - 8) / recordsize.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>numdatablocks</term>
-    <listitem>
-     <para>
-      The number of data blocks in the file. Each data block contains a
-      certain number of records which depends on the record size and the data
-      block size (maxtablesize). Data blocks may not necessarily be
-      completely filled.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>numindexfields</term>
-    <listitem>
-     <para>
-      Number of fields used for the primary index. The fields do always start
-      with field number 1.
-    </para>
-   </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>codepage</term>
-    <listitem>
-     <para>
-      The DOS codepage which was used for encoding fields with character data.
-      If the target encoding is not set with
-      <function>px_set_targetencoding</function> this will be the encoding for
-      character fields when records are being accessed with
-      <function>px_get_record</function> or
-      <function>px_retrieve_record</function>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_numfields</function></member>
-    <member><function>px_numrecords</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-get-parameter.xml b/reference/paradox/functions/px-get-parameter.xml
deleted file mode 100644
index b92774f83b..0000000000
--- a/reference/paradox/functions/px-get-parameter.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-get-parameter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_get_parameter</refname>
-  <refpurpose>Gets a parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>px_get_parameter</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets various parameters. 
-  </para>
- </refsect1>
-  
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>name</parameter> can be one of the following:
-      </para>
-      <variablelist>
-       <varlistentry>
-        <term>tablename</term>
-        <listitem>
-         <para>
-          The name of the table as it will be stored in the database header.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>targetencoding</term>
-        <listitem>
-         <para>
-          The encoding for the output. Data which is being read from character
-          fields with <function>px_get_record</function> or
-          <function>px_retrieve_record</function> is recoded into the
-          targetencoding. If it is not set, then the data
-          will be delivered as stored in the database file.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>inputencoding</term>
-        <listitem>
-         <para>
-          The encoding of the input data which is to be stored into the database.
-          When storing data of character fields in the database, the data is
-          expected to be delivered in this encoding.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the parameter&return.falseforfailure;.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/paradox/functions/px-get-record.xml b/reference/paradox/functions/px-get-record.xml
deleted file mode 100644
index c0e77fa030..0000000000
--- a/reference/paradox/functions/px-get-record.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-get-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_get_record</refname>
-  <refpurpose>Returns record of paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>px_get_record</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>num</parameter></term>
-     <listitem>
-      <para>
-       The record number is an artificial number counting records in the order
-       as they are stored in the database. The first record has number 0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       The optional <parameter>mode</parameter> can be
-       <constant>PX_KEYTOLOWER</constant> or <constant>PX_KEYTOUPPER</constant>
-       in order to convert the keys of the returned array into lower or
-       upper case. If
-       <parameter>mode</parameter> is not passed or is 0, then the key will be
-       exactly like the field name. The element values will contain the field
-       values. NULL values will be retained and are different from 0.0, 0 or
-       the empty string. Fields of type <constant>PX_FIELD_TIME</constant>
-       will be returned as an integer counting the number of milliseconds
-       starting at midnight. A timestamp
-       (<constant>PX_FIELD_TIMESTAMP</constant>) and date
-       (<constant>PX_FIELD_DATE</constant>) are floating point respectively
-       int values counting milliseconds respectively days starting
-       at the beginning of julian calendar.
-       Use the functions <function>px-timestamp2string</function> and
-       <function>px-date2string</function> to convert them into a character
-       representation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the <parameter>num</parameter>&apos;th record from the paradox
-   database. The record is returned as an associated array with its keys
-   being the field names.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_retrieve_record</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-get-schema.xml b/reference/paradox/functions/px-get-schema.xml
deleted file mode 100644
index c6c51a6907..0000000000
--- a/reference/paradox/functions/px-get-schema.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-get-schema" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_get_schema</refname>
-  <refpurpose>Returns the database schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>px_get_schema</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>px_get_schema</function> returns the database schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       If the optional <parameter>mode</parameter> is
-       <constant>PX_KEYTOLOWER</constant> or
-       <constant>PX_KEYTOUPPER</constant> the keys of the returned array
-       will be converted to lower
-       or upper case. If <parameter>mode</parameter> is 0 or not passed at all,
-       then the key name will be identical to the field name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the schema of a database file as an associated array. The key name
-   is equal to the field name. Each array element is itself an associated
-   array containing the two fields <literal>type</literal> and
-   <literal>size</literal>. <literal>type</literal> is one of the constants in
-   table <link linkend="paradox.table-fieldtypes">Constants for field
-   types</link>. <literal>size</literal> is the number of bytes this field
-   consumes in the record. The total of all field sizes is equal to the
-   record size as it can be retrieved with <function>px-get-info</function>.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-get-value.xml b/reference/paradox/functions/px-get-value.xml
deleted file mode 100644
index 5b3403a0a5..0000000000
--- a/reference/paradox/functions/px-get-value.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-get-value" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_get_value</refname>
-  <refpurpose>Gets a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>float</type><type>false</type></type><methodname>px_get_value</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets various values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       <parameter>name</parameter> can be one of the following.
-        <variablelist>
-         <varlistentry>
-          <term>numprimkeys</term>
-           <listitem>
-            <para>
-             The number of primary keys. Paradox databases always use the
-             first <literal>numprimkeys</literal> fields for the primary
-             index.
-            </para>
-          </listitem>
-         </varlistentry>
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the parameter&return.falseforfailure;.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-insert-record.xml b/reference/paradox/functions/px-insert-record.xml
deleted file mode 100644
index 09fce75dcd..0000000000
--- a/reference/paradox/functions/px-insert-record.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-insert-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_insert_record</refname>
-  <refpurpose>Inserts record into paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>px_insert_record</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Inserts a new record into the database. The record is not necessarily
-   inserted at the end of the database, but may be inserted at any
-   position depending on where the first free slot is found.
-  </para>
-  <para>
-   The record data is passed as an array of field values. The elements in
-   the array must correspond to the fields in the database. If the array
-   has less elements than fields in the database, the remaining fields
-   will be set to null.
-  </para>
-  <para>
-   Most field values can be passed as its equivalent php type e.g. a long
-   value is used for fields of type PX_FIELD_LONG, PX_FIELD_SHORT and
-   PX_FIELD_AUTOINC, a double values is used for fields of type
-   PX_FIELD_CURRENCY and PX_FIELD_NUMBER.
-   Field values for blob and alpha fields are passed as strings.
-  </para>
-  <para>
-   Fields of type PX_FIELD_TIME and PX_FIELD_DATE both require a long
-   value. In the first case this is the number of milliseconds since
-   midnight. In the second case this is the number of days since 1.1.0000.
-   Below there are two examples to convert the current date or timestamp
-   into a value suitable for one of paradox's date/time fields.
-  </para>
-  <note>
-   <para>
-    This function is only available if pxlib &gt;= 0.6.0 is used.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       Associated or indexed array containing the field values as e.g.
-       returned by <function>px_retrieve_record</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on failure or the record number in case of success.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Set the date/time fields in a paradox database to the current
-    date/time</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$px = px_new();
-$fp = fopen("test.db", "w+");
-px_create_fp($px, $fp, array(array("timestamp", "@"), array("time", "T"), array("date", "D")));
-
-$curdate = getdate();
-$jd = gregoriantojd($curdate["mon"], $curdate["mday"], $curdate["year"]);
-$days = $jd - 1721425; /* Number of days between 1.1.4714 b.c. and 1.1.0000 */
-$secs = $curdate["hours"]*3600 + $curdate["minutes"]*60 + $curdate["seconds"];
-px_insert_record($px, array($days*86400000.0 + $secs*1000.0, $secs*1000.0, $days));
-
-$curtimestamp = microtime(true);
-$days = (int) ($curtimestamp/86400);
-$secs = $curtimestamp - ($days * 86400.0);
-$days += 2440588; /* Number of days between 1.1.4714 b.c. and 1.1.1970 */
-$days -= 1721425; /* Number of days between 1.1.4714 b.c. and 1.1.0000 */
-px_insert_record($px, array($days*86400000.0 + $secs*1000.0, $secs*1000.0, $days));
-for($i=0; $i<2; $i++) {
-    $rec = px_retrieve_record($px, $i);
-    echo px_timestamp2string($px, $rec["timestamp"], "n/d/Y H:i:s")."\n";
-    echo px_date2string($px, $rec["date"], "n/d/Y")."\n";
-}
-px_close($px);
-px_delete($px);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-2/21/2006 21:42:30
-2/21/2006
-2/21/2006 20:42:30
-2/21/2006
-]]>
-    </screen>
-   </example>
-  </para>
-
-  <para>
-    The Julian day count as passed to <function>jdtogregorian</function>
-    has a different base of 1.1.4714 b.c. and must therefore be calculated
-    by adding 1721425 to the day count used in the paradox file. Turning the
-    day count into a timestamp is easily done by multiplying with 86400000.0
-    to obtain milli seconds.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-    <function>px_update_record</function>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-new.xml b/reference/paradox/functions/px-new.xml
deleted file mode 100644
index 46d6acc8b7..0000000000
--- a/reference/paradox/functions/px-new.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-new" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_new</refname>
-  <refpurpose>Create a new paradox object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>px_new</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Create a new paradox object. You will have to call this function before any
-   further functions. <function>px_new</function> does not create any file on
-   the disk, it just creates an instance of a paradox object. This function
-   must not be called if the object oriented interface is used. Use <literal>new
-   paradox_db()</literal> instead.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on failure.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Opening a Paradox database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if(!$pxdoc = px_new()) {
-  /* Error handling */
-}
-$fp = fopen("test.db", "r");
-if(!px_open_fp($pxdoc, $fp)) {
-  /* Error handling */
-}
-// ...
-px_close($pxdoc);
-px_delete($pxdoc);
-fclose($fp);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   If you prefer the object oriented API, then the above example will look
-   like the following.
-   <example>
-    <title>Opening a Paradox database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$fp = fopen("test.db", "r");
-$pxdoc = new paradox_db();
-if(!$pxdoc->open_fp($fp)) {
-  /* Error handling */
-}
-// ...
-$pxdoc->close();
-fclose($fp);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_delete</function></member>
-    <member><function>px_open_fp</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-numfields.xml b/reference/paradox/functions/px-numfields.xml
deleted file mode 100644
index b4353e6a85..0000000000
--- a/reference/paradox/functions/px-numfields.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-numfields" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_numfields</refname>
-  <refpurpose>Returns number of fields in a database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>px_numfields</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of fields in a database file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of fields in a database file. The return value of this
-   function is identical to the element <literal>numfields</literal> in the
-   array returned by <function>px_get_info</function>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-numrecords.xml b/reference/paradox/functions/px-numrecords.xml
deleted file mode 100644
index d5abf06c1b..0000000000
--- a/reference/paradox/functions/px-numrecords.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-numrecords" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_numrecords</refname>
-  <refpurpose>Returns number of records in a database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>px_numrecords</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of records in a database file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of records in a database file. The return value of this
-   function is identical to the element <literal>numrecords</literal> in the
-   array returned by <function>px_get_info</function>.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-open-fp.xml b/reference/paradox/functions/px-open-fp.xml
deleted file mode 100644
index 58c45288af..0000000000
--- a/reference/paradox/functions/px-open-fp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-open-fp" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_open_fp</refname>
-  <refpurpose>Open paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_open_fp</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Open an existing paradox database file. The actual file has to be opened
-   before with <function>fopen</function>. This function can also be used to
-   open primary index files and tread them like a paradox database. This is
-   supported for those who would like to investigate a primary index. It
-   cannot be used to accelerate access to a database file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>
-       <parameter>file</parameter> is the return value from
-       <function>fopen</function> with the actual database file as parameter.
-       Make sure the database is writable if you plan to update or insert
-       records.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fopen</function></member>
-    <member>The example at <function>px_new</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-put-record.xml b/reference/paradox/functions/px-put-record.xml
deleted file mode 100644
index d276e93f8b..0000000000
--- a/reference/paradox/functions/px-put-record.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-put-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_put_record</refname>
-  <refpurpose>Stores record into paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_put_record</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>array</type><parameter>record</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>recpos</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Stores a record into a paradox database. The record is always added at
-   the end of the database, regardless of any free slots. Use
-   <function>px_insert_record</function> to add a new record into the first
-   free slot found in the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>record</parameter></term>
-     <listitem>
-      <para>
-       Associated or indexed array containing the field values as e.g.
-       returned by <function>px_retrieve_record</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>recpos</parameter></term>
-     <listitem>
-      <para>
-       This optional parameter may be used to specify a record number
-       greater than the current number of records in the database. The
-       function will add as many empty records as needed. There is hardly
-       any need for this parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-retrieve-record.xml b/reference/paradox/functions/px-retrieve-record.xml
deleted file mode 100644
index 43e11100b5..0000000000
--- a/reference/paradox/functions/px-retrieve-record.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-retrieve-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_retrieve_record</refname>
-  <refpurpose>Returns record of paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>px_retrieve_record</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is very similar to <function>px_get_record</function>
-   but uses internally a different approach to retrieve the data. It
-   relies on pxlib for reading each single field value, which usually
-   results in support for more field types.
-  </para>
-  <note>
-   <para>
-    This function is only available if pxlib &gt;= 0.6.0 is used.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>num</parameter></term>
-     <listitem>
-      <para>
-       The record number is an artificial number counting records in the order
-       as they are stored in the database. The first record has number 0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       The optional <parameter>mode</parameter> can be
-       <constant>PX_KEYTOLOWER</constant> or <constant>PX_KEYTOUPPER</constant>
-       in order to convert the keys into lower or upper case. If
-       <parameter>mode</parameter> is not passed or is 0, then the key will be
-       exactly like the field name. The element values will contain the field
-       values. NULL values will be retained and are different from 0.0, 0 or
-       the empty string. Fields of type <constant>PX_FIELD_TIME</constant>
-       will be returned as an integer counting the number of milliseconds
-       starting at midnight. A timestamp is a floating point value also
-       counting milliseconds starting at the beginning of julian calendar.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the <parameter>num</parameter>&apos;th record from the paradox
-   database. The record is returned as an associated array with its keys
-   being the field names.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_get_record</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-set-blob-file.xml b/reference/paradox/functions/px-set-blob-file.xml
deleted file mode 100644
index 0dd350d85f..0000000000
--- a/reference/paradox/functions/px-set-blob-file.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-set-blob-file" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_set_blob_file</refname>
-  <refpurpose>Sets the file where blobs are read from</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_set_blob_file</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the name of the file where blobs are going to be read from or written
-   into. Without
-   calling this function, <function>px_get_record</function> or
-   <function>px_retrieve_record</function>  will only return
-   data in blob fields if the data is part of the record and not stored in the
-   blob file. Blob data is stored in the record if it is small enough to fit
-   in the size of the blob field.</para>
-  <para>
-   Calling <function>px_put_record</function>,
-   <function>px_insert_record</function>, or
-   <function>px_update_record</function> without calling
-   <function>px_set_blob_file</function> will result in truncated blob fields
-   unless the data fits into the database file.
-  </para>
-  <para>
-   Calling this function twice will close the first blob file and open the new
-   one.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The name of the file. Its extension should be <literal>.MB</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-set-parameter.xml b/reference/paradox/functions/px-set-parameter.xml
deleted file mode 100644
index 487bc181fe..0000000000
--- a/reference/paradox/functions/px-set-parameter.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-set-parameter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_set_parameter</refname>
-  <refpurpose>Sets a parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_set_parameter</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets various parameters.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Depending on the parameter you want to set, <parameter>name</parameter>
-       can be one of the following.
-      </para>
-       <variablelist>
-        <varlistentry>
-         <term>tablename</term>
-         <listitem>
-          <para>
-          The name of the table as it will be stored in the database header.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>targetencoding</term>
-         <listitem>
-          <para>
-           The encoding for the output. Data which is being read from
-           character fields is recoded into the targetencoding.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>inputencoding</term>
-         <listitem>
-          <para>
-           The encoding of the input data which is to be stored into the
-           database.
-          </para>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of parameter to set. For inputencoding and targetencoding
-       this must be the name of the encoding as understood by iconv or
-       recode, e.g. iso-8859-1, utf-8, cp850.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>&return.success;</para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_get_info</function> to determine the DOS code page.</member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-set-tablename.xml b/reference/paradox/functions/px-set-tablename.xml
deleted file mode 100644
index 24d5502eff..0000000000
--- a/reference/paradox/functions/px-set-tablename.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-set-tablename" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_set_tablename</refname>
-  <refpurpose>Sets the name of a table (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>void</type><type>false</type></type><methodname>px_set_tablename</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the table name of a paradox database, which was created with
-   <function>px_create_fp</function>. This function is deprecated use
-   <function>px_set_parameter</function> instead.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tablename</parameter></term>
-     <listitem>
-      <para>
-       The name of the table. If it is not set explicitly it will be set
-       to the name of the database file.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &null; on success&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-    <function>px_set_parameter</function>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-set-targetencoding.xml b/reference/paradox/functions/px-set-targetencoding.xml
deleted file mode 100644
index 351544943c..0000000000
--- a/reference/paradox/functions/px-set-targetencoding.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-set-targetencoding" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_set_targetencoding</refname>
-  <refpurpose>Sets the encoding for character fields (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_set_targetencoding</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the encoding for data retrieved from a character field. All character
-   fields will be recoded to the encoding set by this function. If the
-   encoding is not set, the character data will be returned in the DOS code
-   page encoding as specified in the database file. The
-   <parameter>encoding</parameter> can be any string identifier known to
-   iconv or recode. On Unix systems run <literal>iconv -l</literal> for
-   a list of available encodings.
-  </para>
-  <para>This function is deprecated and should be replaced by calling
-   <function>px_set_parameter</function>.
-  </para>
-  <para>
-   See also <function>px_get_info</function> to determine the DOS code page
-   as stored in the database file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>encoding</parameter></term>
-     <listitem>
-      <para>
-       The encoding for the output. Data which is being read from
-       character fields is recoded into the targetencoding.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; if the encoding could not be set, e.g. the encoding is
-   unknown, or pxlib does not support recoding at all. In the second case a
-   warning will be issued.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-    <function>px_set_parameter</function>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-set-value.xml b/reference/paradox/functions/px-set-value.xml
deleted file mode 100644
index a47a5a104f..0000000000
--- a/reference/paradox/functions/px-set-value.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-set-value" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_set_value</refname>
-  <refpurpose>Sets a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_set_value</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets various values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       <parameter>name</parameter> can be one of the following.</para>
-       <variablelist>
-        <varlistentry>
-         <term>numprimkeys</term>
-         <listitem>
-          <para>
-           The number of primary keys. Paradox databases always use the first
-           <option>numprimkeys</option> fields for the primary index.
-          </para>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>&return.success;</para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-    <function>px_set_parameter</function>
-  </para>
- </refsect1>
-</refentry>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/functions/px-timestamp2string.xml b/reference/paradox/functions/px-timestamp2string.xml
deleted file mode 100644
index e427bcf2e9..0000000000
--- a/reference/paradox/functions/px-timestamp2string.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.px-timestamp2string" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_timestamp2string</refname>
-  <refpurpose>
-   Converts the timestamp into a string
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>px_timestamp2string</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Turns a timestamp as it stored in the paradox file into human readable
-   format. Paradox timestamps are the number of miliseconds since 0001-01-02.
-   This function is just for convenience. It can be easily replaced by some
-   math and the calendar functions as demonstrated in the following example.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Value as stored in paradox database field of type
-       PX_FIELD_TIME, or PX_FIELD_TIMESTAMP.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-        String format similar to the format used by <function>date</function>.
-        The placeholders support by this function is a subset of those
-        supported by <function>date</function> (Y, y, m, n, d, j, H, h, G, g,
-        i, s, A, a, L).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here
-       <entry>Description of change
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Turn a paradox timestamp into a human readable form</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$px = px_new();
-
-/* make up a date as it could be stored in */
-/* a date field of a paradox db. */
-/* 700000 days since 1.1.0000. */
-$days = 700000;
-
-/* Use the calendar functions to print a */
-/* human readable format of the date */
-echo jdtogregorian($days+1721425)."\n";
-
-/* Turn it into a timestamp as it stored in a paradox database */
-/* Timestamps are stored in miliseconds since 0001-01-02 */
-$stamp = $days * 86400.0 * 1000.0;
-/* Add one hour */
-$stamp += 3600000.0;
-/* The following will output '7/15/1917 01:00:00'. */
-echo px_timestamp2string($px, $stamp, "n/d/Y H:i:s")."\n";
-
-px_delete($px);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-7/15/1917
-7/15/1917 01:00:00
-]]>
-    </screen>
-   </example>
-  </para>
-
-  <para>
-    The Julian day count as passed to <function>jdtogregorian</function>
-    has a different base of 1.1.4714 b.c. and must therefore be calculated
-    by adding 1721425 to the day count used in the paradox file. Turning the
-    day count into a timestamp is easily done by multiplying with 86400000.0
-    to obtain miliseconds.
-  </para>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>px_date2string</function></member>
-    <member><function>jdtogregorian</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/paradox/functions/px-update-record.xml b/reference/paradox/functions/px-update-record.xml
deleted file mode 100644
index 538efa2118..0000000000
--- a/reference/paradox/functions/px-update-record.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
-<refentry xml:id="function.px-update-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>px_update_record</refname>
-  <refpurpose>Updates record in paradox database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>px_update_record</methodname>
-   <methodparam><type>resource</type><parameter>pxdoc</parameter></methodparam>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Updates an exiting record in the database. The record starts at 0.
-  </para>
-  <para>
-   The record data is passed as an array of field values. The elements in
-   the array must correspond to the fields in the database. If the array
-   has less elements than fields in the database, the remaining fields
-   will be set to null.
-  </para>
-  <note>
-   <para>
-    This function is only available if pxlib &gt;= 0.6.0 is used.
-   </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pxdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the paradox database
-       as returned by <function>px_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       Associated array containing the field values as returned by
-       <function>px_retrieve_record</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>num</parameter></term>
-     <listitem>
-      <para>
-       The record number is an artificial number counting records in the order
-       as they are stored in the database. The first record has number 0.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-    <function>px_insert_record</function>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/reference.xml b/reference/paradox/reference.xml
deleted file mode 100644
index 25376c6026..0000000000
--- a/reference/paradox/reference.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.paradox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Paradox &Functions;</title>
-
- <partintro>
-
-  <!-- FIXME: Apparently there is a class here.. -->
-  <section xml:id="paradox.oo-api">
-   <title>Object oriented API</title>
-   <para>
-    The paradox extension provides also an object oriented API. It consists of
-    only one class called paradox_db. Its methods only differ from the
-    functions in its name and of course the missing first parameter. The
-    following table will list all methods and its equivalent functions.
-
-    <table xml:id="paradox.table-class-methods">
-     <title>Methods of class paradox_db</title>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>Name of method</entry>
-        <entry>Equivalent function</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>Constructor</entry>
-        <entry><function>px_new</function></entry>
-       </row>
-       <row>
-        <entry>Destructor</entry>
-        <entry><function>px_delete</function></entry>
-       </row>
-       <row>
-        <entry><function>open_fp</function></entry>
-        <entry><function>px_open_fp</function></entry>
-       </row>
-       <row>
-        <entry><function>create_fp</function></entry>
-        <entry><function>px_create_fp</function></entry>
-       </row>
-       <row>
-        <entry><function>close</function></entry>
-        <entry><function>px_close</function></entry>
-       </row>
-       <row>
-        <entry><function>numrecords</function></entry>
-        <entry><function>px_numrecords</function></entry>
-       </row>
-       <row>
-        <entry><function>numfields</function></entry>
-        <entry><function>px_numfields</function></entry>
-       </row>
-       <row>
-        <entry><function>get_record</function></entry>
-        <entry><function>px_get_record</function></entry>
-       </row>
-       <row>
-        <entry><function>put_record</function></entry>
-        <entry><function>px_put_record</function></entry>
-       </row>
-       <row>
-        <entry><function>retrieve_record</function></entry>
-        <entry><function>px_retrieve_record</function></entry>
-       </row>
-       <row>
-        <entry><function>delete_record</function></entry>
-        <entry><function>px_delete_record</function></entry>
-       </row>
-       <row>
-        <entry><function>insert_record</function></entry>
-        <entry><function>px_insert_record</function></entry>
-       </row>
-       <row>
-        <entry><function>update_record</function></entry>
-        <entry><function>px_update_record</function></entry>
-       </row>
-       <row>
-        <entry><function>get_field</function></entry>
-        <entry><function>px_get_field</function></entry>
-       </row>
-       <row>
-        <entry><function>get_schema</function></entry>
-        <entry><function>px_get_schema</function></entry>
-       </row>
-       <row>
-        <entry><function>get_info</function></entry>
-        <entry><function>px_get_info</function></entry>
-       </row>
-       <row>
-        <entry><function>set_parameter</function></entry>
-        <entry><function>px_set_parameter</function></entry>
-       </row>
-       <row>
-        <entry><function>get_parameter</function></entry>
-        <entry><function>px_get_parameter</function></entry>
-       </row>
-       <row>
-        <entry><function>set_value</function></entry>
-        <entry><function>px_set_value</function></entry>
-       </row>
-       <row>
-        <entry><function>get_value</function></entry>
-        <entry><function>px_get_value</function></entry>
-       </row>
-       <row>
-        <entry><function>get_info</function></entry>
-        <entry><function>px_get_info</function></entry>
-       </row>
-       <row>
-        <entry><function>set_targetencoding</function></entry>
-        <entry><function>px_set_targetencoding</function></entry>
-       </row>
-       <row>
-        <entry><function>set_tablename</function></entry>
-        <entry><function>px_set_tablename</function></entry>
-       </row>
-       <row>
-        <entry><function>set_blob_file</function></entry>
-        <entry><function>px_set_blob_file</function></entry>
-       </row>
-       <row>
-        <entry><function>date2string</function></entry>
-        <entry><function>px_date2string</function></entry>
-       </row>
-       <row>
-        <entry><function>timestamp2string</function></entry>
-        <entry><function>px_timestamp2string</function></entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </table>
-   </para>
-  </section>
- </partintro>
-
- &reference.paradox.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/paradox/setup.xml b/reference/paradox/setup.xml
deleted file mode 100644
index c161ebbbde..0000000000
--- a/reference/paradox/setup.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="paradox.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="paradox.requirements">
-  &reftitle.required;
-  <para>
-   You need at least PHP 5.0.0 and pxlib &gt;= 0.4.4 for the basic set
-   of functions. Some newer functions are only available with pxlib &gt;=
-   0.6.0. Reading and writing of encrypted databases requires at least
-   pxlib &gt;= 0.5.0. The paradox library (pxlib) is available at
-   <link xlink:href="&url.paradox.pxlib;">&url.paradox.pxlib;</link>.    
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.paradox.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="paradox.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="paradox.resources">
-  &reftitle.resources;
-  <para>
-   <function>px_new</function> creates a new Paradox object required by all
-   Paradox functions.
-  </para>
- </section>
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/paradox/versions.xml b/reference/paradox/versions.xml
deleted file mode 100644
index ce82352bfc..0000000000
--- a/reference/paradox/versions.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions>
- <function name='px_close' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_create_fp' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_date2string' from='PECL paradox &gt;= 1.4.0'/>
- <function name='px_delete' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_delete_record' from='PECL paradox &gt;= 1.4.0'/>
- <function name='px_get_field' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_get_info' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_get_parameter' from='PECL paradox &gt;= 1.1.0'/>
- <function name='px_get_record' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_get_schema' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_get_value' from='PECL paradox &gt;= 1.1.0'/>
- <function name='px_insert_record' from='PECL paradox &gt;= 1.4.0'/>
- <function name='px_new' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_numfields' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_numrecords' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_open_fp' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_put_record' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_retrieve_record' from='PECL paradox &gt;= 1.4.0'/>
- <function name='px_set_blob_file' from='PECL paradox &gt;= 1.3.0'/>
- <function name='px_set_parameter' from='PECL paradox &gt;= 1.1.0'/>
- <function name='px_set_tablename' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_set_targetencoding' from='PECL paradox &gt;= 1.0.0'/>
- <function name='px_set_value' from='PECL paradox &gt;= 1.1.0'/>
- <function name='px_timestamp2string' from='PECL paradox &gt;= 1.4.0'/>
- <function name='px_update_record' from='PECL paradox &gt;= 1.4.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/parallel/book.xml b/reference/parallel/book.xml
index 4231eeea5e..7fddce853a 100644
--- a/reference/parallel/book.xml
+++ b/reference/parallel/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.parallel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <?phpdoc extension-membership="pecl" ?>
  <title>parallel</title>
  <titleabbrev>parallel</titleabbrev>
 
diff --git a/reference/parallel/functions/parallel.bootstrap.xml b/reference/parallel/functions/parallel.bootstrap.xml
index a4cf75ff81..8542f99eb8 100644
--- a/reference/parallel/functions/parallel.bootstrap.xml
+++ b/reference/parallel/functions/parallel.bootstrap.xml
@@ -18,8 +18,31 @@
   </para>
  </refsect1>
 
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>file</parameter></term>
+     <listitem>
+      <para>
+       Path to the file to bootstrap all runtimes.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
   <warning>
    <para>
     Shall throw <type>parallel\Runtime\Error\Bootstrap</type> if previously called for this process.
diff --git a/reference/parallel/parallel/events/poll.xml b/reference/parallel/parallel/events/poll.xml
index a74b171421..601ce5eb5a 100644
--- a/reference/parallel/parallel/events/poll.xml
+++ b/reference/parallel/parallel/events/poll.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description" audience="polling">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Event</type><type>null</type></type><methodname>parallel\Events::poll</methodname>
+   <modifier>public</modifier> <type class="union"><type>parallel\Events\Event</type><type>null</type></type><methodname>parallel\Events::poll</methodname>
    <void />
   </methodsynopsis>
   <para>
@@ -21,10 +21,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
    <para>
-    Should there be no targets remaining, null shall be returned
+    Should there be no targets remaining, &null; shall be returned
    </para>
    <para>
-    Should this be a non-blocking loop, and blocking would occur, null shall be returned
+    Should this be a non-blocking loop, and blocking would occur, &null; shall be returned
    </para>
    <para>
     Otherwise, the <classname>parallel\Events\Event</classname> returned describes the event.
diff --git a/reference/parallel/parallel/events/setblocking.xml b/reference/parallel/parallel/events/setblocking.xml
index fa601193b0..1eb3889c7f 100644
--- a/reference/parallel/parallel/events/setblocking.xml
+++ b/reference/parallel/parallel/events/setblocking.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description" audience="behaviour">
   &reftitle.description;
   <para>
-   By default when events are polled for, blocking will occur (at the PHP level) until the first event can be returned: Setting blocking mode to false will cause
+   By default when events are polled for, blocking will occur (at the PHP level) until the first event can be returned: Setting blocking mode to &false; will cause
    poll to return control if the first target polled is not ready.
   </para>
   <para>
@@ -18,7 +18,7 @@
    to be raised, which may be extremely slow or wasteful if what is really desired is non-blocking behaviour.
   </para>
   <para>
-   A non-blocking loop effects the return value of <methodname>parallel\Events::poll</methodname>, such that it may be null before all events have been processed.
+   A non-blocking loop effects the return value of <methodname>parallel\Events::poll</methodname>, such that it may be &null; before all events have been processed.
   </para>
   <methodsynopsis>
    <modifier>public</modifier> <type>void</type><methodname>parallel\Events::setBlocking</methodname>
diff --git a/reference/parallel/parallel/events/settimeout.xml b/reference/parallel/parallel/events/settimeout.xml
index 7f3f19b76d..64518bcdc7 100644
--- a/reference/parallel/parallel/events/settimeout.xml
+++ b/reference/parallel/parallel/events/settimeout.xml
@@ -14,7 +14,7 @@
    thrown when the timeout is reached.
   </para>
   <para>
-   This differs from setting blocking mode to false with <methodname>parallel\Events::setBlocking</methodname>, which will not cause an exception to be thrown.
+   This differs from setting blocking mode to &false; with <methodname>parallel\Events::setBlocking</methodname>, which will not cause an exception to be thrown.
   </para>
   <methodsynopsis>
    <modifier>public</modifier> <type>void</type><methodname>parallel\Events::setTimeout</methodname>
diff --git a/reference/parallel/parallel/input/add.xml b/reference/parallel/parallel/input/add.xml
index 3f1e07b9a6..36a6638488 100644
--- a/reference/parallel/parallel/input/add.xml
+++ b/reference/parallel/parallel/input/add.xml
@@ -28,7 +28,7 @@
   </warning>
   <warning>
    <para>
-    Shall throw <type>parallel\Events\Input\Error\IllegalValue</type> if value is illegal (object, null).
+    Shall throw <type>parallel\Events\Input\Error\IllegalValue</type> if value is illegal (&object;, &null;).
    </para>
   </warning>
  </refsect1>
diff --git a/reference/parle/book.xml b/reference/parle/book.xml
index ae56798891..22253860e4 100644
--- a/reference/parle/book.xml
+++ b/reference/parle/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.parle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Parsing and lexing</title>
  <titleabbrev>Parle</titleabbrev>
 
diff --git a/reference/password/book.xml b/reference/password/book.xml
index f80a3c7687..0a9350679b 100644
--- a/reference/password/book.xml
+++ b/reference/password/book.xml
@@ -13,12 +13,6 @@
    to make it easy to create and manage passwords
    in a secure manner.
   </para>
-  <para>
-   This extension is available since PHP 5.5.0 but there is also an <link
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xlink:href="&url.password.compat;">userland implementation</link> for
-   PHP >= 5.3.7.
-  </para>
  </preface>
 
  &reference.password.setup;
diff --git a/reference/password/constants.xml b/reference/password/constants.xml
index 16d6b37158..ea6bfa04c9 100644
--- a/reference/password/constants.xml
+++ b/reference/password/constants.xml
@@ -80,6 +80,7 @@
        <para>
         <literal>threads</literal> (<type>int</type>) - Number of threads to use for computing 
         the Argon2 hash. Defaults to <constant>PASSWORD_ARGON2_DEFAULT_THREADS</constant>.
+        Only available with libargon2, not with libsodium implementation.
        </para>
       </listitem>
      </itemizedlist>
@@ -111,7 +112,7 @@
     </term>
     <listitem>
      <para>
-      Default amount of memory in bytes that Argon2lib will use while trying to 
+      Default amount of memory in bytes that will be used while trying to
       compute a hash.
      </para>
      <para>
@@ -126,7 +127,7 @@
     </term>
     <listitem>
      <para>
-      Default amount of time that Argon2lib will spend trying to compute a hash.
+      Default amount of time that will be spent trying to compute a hash.
      </para>
      <para>
       Available as of PHP 7.2.0.
@@ -141,6 +142,7 @@
     <listitem>
      <para>
       Default number of threads that Argon2lib will use.
+      Not available with libsodium implementation.
      </para>
      <para>
       Available as of PHP 7.2.0.
diff --git a/reference/password/functions/password-hash.xml b/reference/password/functions/password-hash.xml
index 60e2ce8421..fc6de5b799 100644
--- a/reference/password/functions/password-hash.xml
+++ b/reference/password/functions/password-hash.xml
@@ -10,10 +10,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>password_hash</methodname>
+   <type>string</type><methodname>password_hash</methodname>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>algo</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type><type>null</type></type><parameter>algo</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>password_hash</function> creates a new password hash using a strong one-way hashing
@@ -72,8 +72,9 @@
      </para>
      <warning>
       <para>
-       The salt option has been deprecated as of PHP 7.0.0. It is now
+       The salt option is deprecated. It is now
        preferred to simply use the salt that is generated by default.
+       As of PHP 8.0.0, an explicitly given salt is ignored.
       </para>
      </warning>
     </listitem>
@@ -112,6 +113,11 @@
       <literal>threads</literal> (<type>int</type>) - Number of threads to use for computing 
       the Argon2 hash. Defaults to <constant>PASSWORD_ARGON2_DEFAULT_THREADS</constant>.
      </para>
+     <warning>
+      <para>
+        Only available when PHP uses libargon2, not with libsodium implementation.
+      </para>
+     </warning>
     </listitem>
    </itemizedlist>
   </para>
@@ -162,7 +168,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the hashed password, &return.falseforfailure;.
+   Returns the hashed password.
   </para>
   <para>
    The used algorithm, cost and salt are returned as part of the hash. Therefore,
@@ -184,6 +190,18 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        <function>password_hash</function> no longer returns &false; on failure.
+       </entry>
+      </row>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        The <parameter>algo</parameter> parameter is nullable now.
+       </entry>
+      </row>
       <row>
        <entry>7.4.0</entry>
        <entry>
@@ -191,6 +209,12 @@
         &integer;s for backward compatibility.
        </entry>
       </row>
+      <row>
+       <entry>7.4.0</entry>
+       <entry>
+        The sodium extension provides an alternative implementation for Argon2 passwords.
+       </entry>
+      </row>
       <row>
        <entry>7.3.0</entry>
        <entry>
diff --git a/reference/pcntl/constants.xml b/reference/pcntl/constants.xml
index d6e9cfb52d..d6a514076b 100644
--- a/reference/pcntl/constants.xml
+++ b/reference/pcntl/constants.xml
@@ -455,7 +455,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -466,7 +466,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -477,7 +477,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -488,7 +488,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -499,7 +499,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -510,7 +510,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -521,7 +521,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -532,7 +532,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -543,7 +543,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -554,7 +554,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -565,7 +565,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -576,7 +576,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -587,7 +587,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -598,7 +598,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -609,7 +609,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -620,7 +620,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -631,7 +631,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -642,7 +642,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -653,7 +653,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -664,7 +664,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -675,7 +675,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -686,7 +686,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -697,7 +697,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -708,7 +708,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -719,7 +719,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -730,7 +730,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -741,7 +741,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -752,7 +752,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -763,7 +763,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -774,7 +774,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -785,7 +785,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -796,7 +796,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -807,7 +807,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -818,7 +818,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -829,7 +829,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -840,7 +840,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -851,7 +851,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -862,7 +862,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -873,7 +873,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -884,7 +884,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -895,7 +895,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -906,7 +906,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -917,7 +917,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -928,7 +928,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -939,7 +939,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -950,7 +950,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -961,7 +961,7 @@
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.3.0.
+
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/pcntl/functions/pcntl-fork.xml b/reference/pcntl/functions/pcntl-fork.xml
index 8e4baebe39..2611060ea5 100644
--- a/reference/pcntl/functions/pcntl-fork.xml
+++ b/reference/pcntl/functions/pcntl-fork.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pcntl/functions/pcntl-signal-dispatch.xml b/reference/pcntl/functions/pcntl-signal-dispatch.xml
index 6a4fadf22e..d1c296655d 100644
--- a/reference/pcntl/functions/pcntl-signal-dispatch.xml
+++ b/reference/pcntl/functions/pcntl-signal-dispatch.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pcre/book.xml b/reference/pcre/book.xml
index 9ca93e33f6..185b4622d6 100644
--- a/reference/pcre/book.xml
+++ b/reference/pcre/book.xml
@@ -2,7 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundled" ?>
+ <?phpdoc extension-membership="core" ?>
  <title>Regular Expressions (Perl-Compatible)</title>
  <titleabbrev>PCRE</titleabbrev>   
 
@@ -25,10 +25,6 @@
    See <link linkend="reference.pcre.pattern.modifiers">Pattern
     Modifiers</link>.
   </para>
-  <para>
-   PHP also supports regular expressions using a POSIX-extended syntax
-   using the <link linkend="book.regex">POSIX-extended regex functions</link>.
-  </para>
   <note>
    <para>
     This extension maintains a global per-thread cache of compiled regular
diff --git a/reference/pcre/functions/preg-last-error.xml b/reference/pcre/functions/preg-last-error.xml
index 83f0f184da..c8d9d84735 100644
--- a/reference/pcre/functions/preg-last-error.xml
+++ b/reference/pcre/functions/preg-last-error.xml
@@ -40,6 +40,11 @@ Backtrack limit was exhausted!
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
   
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
@@ -54,8 +59,8 @@ Backtrack limit was exhausted!
     <member><constant>PREG_RECURSION_LIMIT_ERROR</constant> (see also <link
     linkend="ini.pcre.recursion-limit">pcre.recursion_limit</link>)</member>
     <member><constant>PREG_BAD_UTF8_ERROR</constant></member>
-    <member><constant>PREG_BAD_UTF8_OFFSET_ERROR</constant> (since PHP 5.3.0)</member>
-    <member><constant>PREG_JIT_STACKLIMIT_ERROR</constant> (since PHP 7.0.0)</member>
+    <member><constant>PREG_BAD_UTF8_OFFSET_ERROR</constant></member>
+    <member><constant>PREG_JIT_STACKLIMIT_ERROR</constant></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pcre/functions/preg-match-all.xml b/reference/pcre/functions/preg-match-all.xml
index 43f1ec3b6d..7f20070868 100644
--- a/reference/pcre/functions/preg-match-all.xml
+++ b/reference/pcre/functions/preg-match-all.xml
@@ -382,8 +382,7 @@ FOO;
 
 preg_match_all('/(?P<name>\w+): (?P<digit>\d+)/', $str, $matches);
 
-/* This also works in PHP 5.2.2 (PCRE 7.0) and later, however 
- * the above form is recommended for backwards compatibility */
+/* Alternative */
 // preg_match_all('/(?<name>\w+): (?<digit>\d+)/', $str, $matches);
 
 print_r($matches);
diff --git a/reference/pcre/functions/preg-match.xml b/reference/pcre/functions/preg-match.xml
index be0b0b7949..3c23c032e0 100644
--- a/reference/pcre/functions/preg-match.xml
+++ b/reference/pcre/functions/preg-match.xml
@@ -358,8 +358,7 @@ $str = 'foobar: 2008';
 
 preg_match('/(?P<name>\w+): (?P<digit>\d+)/', $str, $matches);
 
-/* This also works in PHP 5.2.2 (PCRE 7.0) and later, however 
- * the above form is recommended for backwards compatibility */
+/* Alternative */
 // preg_match('/(?<name>\w+): (?<digit>\d+)/', $str, $matches);
 
 print_r($matches);
diff --git a/reference/pcre/functions/preg-replace.xml b/reference/pcre/functions/preg-replace.xml
index 9464f588e3..2e14dfb41a 100644
--- a/reference/pcre/functions/preg-replace.xml
+++ b/reference/pcre/functions/preg-replace.xml
@@ -145,8 +145,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   As of PHP 5.5.0 <constant>E_DEPRECATED</constant> level error is emitted when
-   passing in the "\e" modifier. As of PHP 7.0.0 using the "\e" modifier is an error;
+   Using the "\e" modifier is an error;
    an <constant>E_WARNING</constant> is emitted in this case.
   </para>
  </refsect1>
diff --git a/reference/pcre/ini.xml b/reference/pcre/ini.xml
index 7b2888cd3f..be3973c551 100644
--- a/reference/pcre/ini.xml
+++ b/reference/pcre/ini.xml
@@ -20,19 +20,19 @@
       <entry><link linkend="ini.pcre.backtrack-limit">pcre.backtrack_limit</link></entry>
       <entry>"1000000"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 5.2.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.pcre.recursion-limit">pcre.recursion_limit</link></entry>
       <entry>"100000"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 5.2.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.pcre.jit">pcre.jit</link></entry>
       <entry>"1"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 7.0.0.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/pcre/pattern.modifiers.xml b/reference/pcre/pattern.modifiers.xml
index 845bc6f322..4984ef5f88 100644
--- a/reference/pcre/pattern.modifiers.xml
+++ b/reference/pcre/pattern.modifiers.xml
@@ -75,74 +75,6 @@
        </simpara>
       </listitem>
      </varlistentry>
-     <varlistentry xml:id="reference.pcre.pattern.modifiers.eval">
-      <term><emphasis>e</emphasis> (<literal>PREG_REPLACE_EVAL</literal>)</term>
-      <listitem>
-       &warn.deprecated.feature-5-5-0.removed-7-0-0;
-       <simpara>
-        If this deprecated modifier is set, <function>preg_replace</function>
-        does normal substitution of backreferences in the
-        replacement string, evaluates it as PHP code, and uses the
-        result for replacing the search string.
-        Single quotes, double quotes, backslashes (<literal>\</literal>) and NULL chars will 
-        be escaped by backslashes in substituted backreferences.
-       </simpara>
-       <caution>
-        <para>
-         The <function>addslashes</function> function is run on each matched backreference before
-         the substitution takes place. As such, when the backreference
-         is used as a quoted string, escaped characters will be converted
-         to literals. However, characters which are escaped, which would
-         normally not be converted, will retain their slashes. This makes
-         use of this modifier very complicated.
-        </para>
-       </caution>
-       <caution>
-        <para>
-         Make sure that <parameter>replacement</parameter> constitutes a valid PHP code string,
-         otherwise PHP will complain about a parse error at the line containing
-         <function>preg_replace</function>.
-        </para>
-       </caution>
-       <caution>
-        <para>
-         Use of this modifier is <emphasis>discouraged</emphasis>, as it can easily introduce
-         remote code execution vulnerabilities. To prevent these, the
-         <function>preg_replace_callback</function> function should be used instead:
-        </para>
-        <informalexample>
-         <programlisting role="php">
-<![CDATA[
-<?php
-$html = $_POST['html'];
-
-// uppercase headings
-$html = preg_replace_callback(
-    '(<h([1-6])>(.*?)</h\1>)',
-    function ($m) {
-        return "<h$m[1]>" . strtoupper($m[2]) . "</h$m[1]>";
-    },
-    $html
-);
-]]>
-         </programlisting>
-        </informalexample>
-        <para>
-         If the above example was written with <function>preg_replace</function> and the <literal>e</literal>
-         modifier, the code could be easily exploited by passing in a string such as
-         <literal>&lt;h1&gt;{${eval($_GET[php_code])}}&lt;/h1&gt;</literal>. This gave
-         the attacker the ability to execute arbitrary PHP code and as such gave them
-         nearly complete access to the server.
-        </para>
-       </caution>
-       <note>
-        <para>
-         Only <function>preg_replace</function> uses this modifier;
-         it is ignored by other PCRE functions.
-        </para>
-       </note>
-      </listitem>
-     </varlistentry>
      <varlistentry>
       <term><emphasis>A</emphasis> (<literal>PCRE_ANCHORED</literal>)</term>
       <listitem>
@@ -238,9 +170,7 @@ $html = preg_replace_callback(
         treated as UTF-8. An invalid subject will cause the preg_* function to
         match nothing; an invalid pattern will trigger an error of
         level E_WARNING. Five and six octet UTF-8 sequences are
-        regarded as invalid since PHP 5.3.4 (resp. PCRE 7.3
-        2007-08-28); formerly those have been regarded as valid
-        UTF-8. 
+        regarded as invalid.
        </simpara>
       </listitem>
      </varlistentry>
diff --git a/reference/pcre/pattern.posix.xml b/reference/pcre/pattern.posix.xml
deleted file mode 100644
index a7f587d8dd..0000000000
--- a/reference/pcre/pattern.posix.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<article xml:id="reference.pcre.pattern.posix" xmlns="http://docbook.org/ns/docbook">
- <title>Differences from POSIX regex</title>
-
- <para>
-  As of PHP 5.3.0, the <link linkend="book.regex">POSIX Regex</link> extension
-  is deprecated. There are a number of differences between POSIX regex and
-  PCRE regex. This page lists the most notable ones that are necessary to
-  know when converting to PCRE.
- </para>
-
- <para>
-  <orderedlist>
-   <listitem>
-    <simpara>
-     The PCRE functions require that the pattern is enclosed by <link
-     linkend="regexp.reference.delimiters">delimiters</link>.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Unlike POSIX, the PCRE extension does not have dedicated functions for
-     case-insensitive matching. Instead, this is supported using the 
-     <emphasis>i</emphasis> (<literal>PCRE_CASELESS</literal>) <link
-     linkend="reference.pcre.pattern.modifiers">pattern modifier</link>. Other
-     pattern modifiers are also available for changing the matching strategy.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     The POSIX functions find the longest of the leftmost match, but PCRE
-     stops on the first valid match. If the string doesn't match at all it
-     makes no difference, but if it matches it may have dramatic effects on
-     both the resulting match and the matching speed.
-    </simpara>
-    <simpara>
-     To illustrate this difference, consider the following example from
-     "Mastering Regular Expressions" by Jeffrey Friedl. Using the pattern
-     <literal>one(self)?(selfsufficient)?</literal> on the string
-     <literal>oneselfsufficient</literal> with PCRE will result in matching
-     <literal>oneself</literal>, but using POSIX the result will be the full
-     string <literal>oneselfsufficient</literal>. Both (sub)strings match the
-     original string, but POSIX requires that the longest be the result.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     The POSIX definition of a "character class" differs from that of PCRE.
-     Simple bracket expressions to match a set of explicit characters are
-     supported in the form of PCRE
-     <link linkend="regexp.reference.character-classes">character classes</link>
-     but POSIX collating elements, character classes and character equivalents
-     are not supported.
-    </simpara>
-    <simpara>
-     Supplying an expression with a character class that both starts and ends
-     with <literal>:</literal>, <literal>.</literal> or <literal>=</literal>
-     characters to PCRE is interpreted as an attempt to use one of these
-     unsupported features and causes a compilation error.
-    </simpara>
-   </listitem>
-  </orderedlist>
- </para>
-
- <para>
-  <table>
-   <title>Function replacements</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>POSIX</entry>
-      <entry>PCRE</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><function>ereg_replace</function></entry>
-      <entry><function>preg_replace</function></entry>
-     </row>
-     <row>
-      <entry><function>ereg</function></entry>
-      <entry><function>preg_match</function></entry>
-     </row>
-     <row>
-      <entry><function>eregi_replace</function></entry>
-      <entry><function>preg_replace</function></entry>
-     </row>
-     <row>
-      <entry><function>eregi</function></entry>
-      <entry><function>preg_match</function></entry>
-     </row>
-     <row>
-      <entry><function>split</function></entry>
-      <entry><function>preg_split</function></entry>
-     </row>
-     <row>
-      <entry><function>spliti</function></entry>
-      <entry><function>preg_split</function></entry>
-     </row>
-     <row>
-      <entry><function>sql_regcase</function></entry>
-      <entry><emphasis>No equivalent</emphasis></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-</article>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/pcre/pattern.syntax.xml b/reference/pcre/pattern.syntax.xml
index f4c7a204d5..d3c2e1867d 100644
--- a/reference/pcre/pattern.syntax.xml
+++ b/reference/pcre/pattern.syntax.xml
@@ -461,11 +461,11 @@
     </varlistentry>
     <varlistentry>
      <term><emphasis>\h</emphasis></term>
-     <listitem><simpara>any horizontal whitespace character (since PHP 5.2.4)</simpara></listitem>
+     <listitem><simpara>any horizontal whitespace character</simpara></listitem>
     </varlistentry>
     <varlistentry>
      <term><emphasis>\H</emphasis></term>
-     <listitem><simpara>any character that is not a horizontal whitespace character (since PHP 5.2.4)</simpara></listitem>
+     <listitem><simpara>any character that is not a horizontal whitespace character</simpara></listitem>
     </varlistentry>
     <varlistentry>
      <term><emphasis>\s</emphasis></term>
@@ -477,11 +477,11 @@
     </varlistentry>
     <varlistentry>
      <term><emphasis>\v</emphasis></term>
-     <listitem><simpara>any vertical whitespace character (since PHP 5.2.4)</simpara></listitem>
+     <listitem><simpara>any vertical whitespace character</simpara></listitem>
     </varlistentry>
     <varlistentry>
      <term><emphasis>\V</emphasis></term>
-     <listitem><simpara>any character that is not a vertical whitespace character (since PHP 5.2.4)</simpara></listitem>
+     <listitem><simpara>any character that is not a vertical whitespace character</simpara></listitem>
     </varlistentry>
     <varlistentry>
      <term><emphasis>\w</emphasis></term>
@@ -600,12 +600,16 @@
    regexp metacharacters in the pattern. For example:
    <literal>\w+\Q.$.\E$</literal> will match one or more word characters,
    followed by literals <literal>.$.</literal> and anchored at the end of
-   the string.
+   the string. Note that this does not change the behavior of 
+   delimiters; for instance the pattern <literal>#\Q#\E#$</literal>
+   is not valid, because the second <literal>#</literal> marks the end
+   of the pattern, and the <literal>\E#</literal> is interpreted as invalid
+   modifiers.
   </para>
 
   <para>
-   <literal>\K</literal> can be used to reset the match start since
-   PHP 5.2.4. For example, the pattern <literal>foo\Kbar</literal> matches
+   <literal>\K</literal> can be used to reset the match start. 
+   For example, the pattern <literal>foo\Kbar</literal> matches
    "foobar", but reports that it has matched "bar". The use of
    <literal>\K</literal> does not interfere with the setting of captured
    substrings. For example, when the pattern <literal>(foo)\Kbar</literal>
@@ -1277,7 +1281,7 @@
   <para>
    In UTF-8 mode, characters with values greater than 128 do not match any
    of the POSIX character classes.
-   As of PHP 5.3.0 and libpcre 8.10 some character classes are changed to use
+   As of libpcre 8.10 some character classes are changed to use
    Unicode character properties, in which case the mentioned restriction does
    not apply. Refer to the <link xlink:href="&url.pcre.man;">PCRE(3) manual</link>
    for details.
@@ -1490,7 +1494,7 @@
    It is possible to name a subpattern using the syntax
    <literal>(?P&lt;name&gt;pattern)</literal>. This subpattern will then
    be indexed in the matches array by its normal numeric position and
-   also by name. PHP 5.2.2 introduced two alternative syntaxes
+   also by name. There are two alternative syntaxes
    <literal>(?&lt;name&gt;pattern)</literal> and <literal>(?'name'pattern)</literal>.
   </para>
 
@@ -1782,7 +1786,7 @@
    example above, or by a quantifier with a minimum of zero.
   </para>
   <para>
-   As of PHP 5.2.2, the <literal>\g</literal> escape sequence can be
+   The <literal>\g</literal> escape sequence can be
    used for absolute and relative referencing of subpatterns.
    This escape sequence must be followed by an unsigned number or a negative
    number, optionally enclosed in braces. The sequences <literal>\1</literal>,
@@ -1803,11 +1807,10 @@
   </para>
   <para>
    Back references to the named subpatterns can be achieved by
-   <literal>(?P=name)</literal> or, since PHP 5.2.2, also by
-   <literal>\k&lt;name&gt;</literal> or <literal>\k'name'</literal>.
-   Additionally PHP 5.2.4 added support for <literal>\k{name}</literal>
-   and <literal>\g{name}</literal>, and PHP 5.2.7 for
-   <literal>\g&lt;name&gt;</literal> and <literal>\g'name'</literal>.
+   <literal>(?P=name)</literal>,
+   <literal>\k&lt;name&gt;</literal>, <literal>\k'name'</literal>,
+   <literal>\k{name}</literal>, <literal>\g{name}</literal>,
+   <literal>\g&lt;name&gt;</literal> or <literal>\g'name'</literal>.
   </para>
  </section>
 
@@ -2158,6 +2161,41 @@
    introduces a comment that continues up to the next newline character
    in the pattern.
   </para>
+  <para>
+   <example>
+    <title>Usage of comments in PCRE pattern</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+$subject = 'test';
+
+/* (?# can be used to add comments without enabling PCRE_EXTENDED */
+$match = preg_match('/te(?# this is a comment)st/', $subject);
+var_dump($match);
+
+/* Whitespace and # is treated as part of the pattern unless PCRE_EXTENDED is enabled */
+$match = preg_match('/te   #~~~~
+st/', $subject);
+var_dump($match);
+
+/* When PCRE_EXTENDED is enabled, all whitespace data characters and anything
+   that follows an unescaped # on the same line is ignored */
+$match = preg_match('/te    #~~~~
+st/x', $subject);
+var_dump($match);
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+int(1)
+int(0)
+int(1)
+]]>
+    </screen>
+   </example>
+  </para>
  </section>
 
  <section xml:id="regexp.reference.recursive">
diff --git a/reference/pcre/pattern.xml b/reference/pcre/pattern.xml
index 11316faaea..12d943f95e 100644
--- a/reference/pcre/pattern.xml
+++ b/reference/pcre/pattern.xml
@@ -7,7 +7,6 @@
  &reference.pcre.pattern.syntax;
  &reference.pcre.pattern.modifiers;
  &reference.pcre.pattern.differences;
- &reference.pcre.pattern.posix;
 </part>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/pdo/book.xml b/reference/pdo/book.xml
index 55fe128049..a26c33b695 100644
--- a/reference/pdo/book.xml
+++ b/reference/pdo/book.xml
@@ -27,9 +27,7 @@
    should use a full-blown abstraction layer if you need that facility.
   </para>
   <para>
-   PDO ships with PHP 5.1, and is available as a PECL extension for PHP 5.0;
-   PDO requires the new OO features in the core of PHP 5, and so will not
-   run with earlier versions of PHP.
+   PDO ships with PHP.
   </para>
  </preface>
  <!-- }}} -->
diff --git a/reference/pdo/configure.xml b/reference/pdo/configure.xml
index f79707d1d6..ac5bfa6961 100644
--- a/reference/pdo/configure.xml
+++ b/reference/pdo/configure.xml
@@ -7,7 +7,7 @@
   <step>
    <para>
     PDO and the <link linkend="ref.pdo-sqlite">PDO_SQLITE</link> driver
-    is enabled by default as of PHP 5.1.0. You may need
+    is enabled by default. You may need
     to enable the PDO driver for your database of choice; consult the
     documentation for
     <link linkend="pdo.drivers">database-specific PDO drivers</link>
@@ -42,24 +42,7 @@ extension=pdo.so
   <title>Windows users</title>
   <step>
    <para>
-    PDO and all the major drivers ship with PHP as shared extensions, and
-    simply need to be activated by editing the &php.ini; file:
-    <screen>
-<![CDATA[
-extension=php_pdo.dll
-]]>
-    </screen>
-   </para>
-   <note>
-    <para>
-     This step is not necessary for PHP 5.3 and above, as a DLL is no longer 
-     required for PDO.
-    </para>
-   </note>
-  </step>
-  <step>
-   <para>
-    Next, choose the other database-specific DLL files and either use 
+    Choose the other database-specific DLL files and either use 
     <function>dl</function> to load them at runtime, or enable them in
     &php.ini; below <filename>php_pdo.dll</filename>. For example:
     <screen>
diff --git a/reference/pdo/constants.xml b/reference/pdo/constants.xml
index 166e5f3257..fb9475d070 100644
--- a/reference/pdo/constants.xml
+++ b/reference/pdo/constants.xml
@@ -4,12 +4,6 @@
 <appendix xml:id="pdo.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
- <warning>
-  <para>
-   PDO uses class constants since PHP 5.1. Prior releases use global constants
-   in the form <constant>PDO_PARAM_BOOL</constant>.
-  </para>
- </warning>
  <variablelist>
   <varlistentry xml:id="pdo.constants.param-bool">
    <term>
@@ -118,6 +112,17 @@
     </simpara>
    </listitem>
   </varlistentry>
+  <varlistentry xml:id="pdo.constants.fetch-default">
+   <term>
+    <constant>PDO::FETCH_DEFAULT</constant>
+     (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Specifies that the default fetch mode shall be used. Available as of PHP 8.0.7.
+    </simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry xml:id="pdo.constants.fetch-lazy">
    <term>
     <constant>PDO::FETCH_LAZY</constant>
@@ -303,7 +308,7 @@
    <listitem>
     <simpara>
       Fetch a two-column result into an array where the first column is a key and the second column
-      is the value. Available since PHP 5.2.3.
+      is the value.
     </simpara>
    </listitem>
   </varlistentry>
@@ -327,8 +332,7 @@
    <listitem>
     <simpara>
      As <constant>PDO::FETCH_INTO</constant> but object is provided as a serialized string.
-     Available since PHP 5.1.0. Since PHP 5.3.0 the class constructor is never called if this
-     flag is set.
+     The class constructor is never called if this flag is set.
     </simpara>
    </listitem>
   </varlistentry>
@@ -339,7 +343,7 @@
    </term>
    <listitem>
     <simpara>
-     Call the constructor before setting properties. Available since PHP 5.2.0.
+     Call the constructor before setting properties.
     </simpara>
    </listitem>
   </varlistentry>
@@ -595,7 +599,7 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
    </term>
    <listitem>
     <simpara> 
-     Available since PHP 5.2.0
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -606,7 +610,7 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
    </term>
    <listitem>
     <simpara>
-     Available since PHP 5.1.3.
+
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/pdo/error-handling.xml b/reference/pdo/error-handling.xml
index ca4c03c7dd..18c938d75e 100644
--- a/reference/pdo/error-handling.xml
+++ b/reference/pdo/error-handling.xml
@@ -13,7 +13,7 @@
     <constant>PDO::ERRMODE_SILENT</constant>
    </para>
    <para>
-     This is the default mode. PDO will simply set the error code for you
+     Prior to PHP 8.0.0, this was the default mode. PDO will simply set the error code for you
      to inspect using the <function>PDO::errorCode</function> and
      <function>PDO::errorInfo</function> methods on both the
      statement and database objects; if the error resulted from a call on a
@@ -41,6 +41,7 @@
      <constant>PDO::ERRMODE_EXCEPTION</constant>
     </para>
     <para>
+     As of PHP 8.0.0, this is the default mode.
      In addition to setting the error code, PDO will throw a
      <classname>PDOException</classname>
      and set its properties to reflect the error code and error
diff --git a/reference/pdo/pdo/begintransaction.xml b/reference/pdo/pdo/begintransaction.xml
index 589923f1b5..4dcb488efd 100644
--- a/reference/pdo/pdo/begintransaction.xml
+++ b/reference/pdo/pdo/begintransaction.xml
@@ -31,6 +31,11 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdo/commit.xml b/reference/pdo/pdo/commit.xml
index 9233e7dc2c..e449446381 100644
--- a/reference/pdo/pdo/commit.xml
+++ b/reference/pdo/pdo/commit.xml
@@ -21,6 +21,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdo/construct.xml b/reference/pdo/pdo/construct.xml
index 8b1dab6c57..32f2a4cd62 100644
--- a/reference/pdo/pdo/construct.xml
+++ b/reference/pdo/pdo/construct.xml
@@ -12,9 +12,9 @@
   <constructorsynopsis>
    <modifier>public</modifier> <methodname>PDO::__construct</methodname>
    <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>username</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Creates a PDO instance to represent a connection to the requested
@@ -198,7 +198,6 @@ $dbh = new PDO($dsn, $user, $password);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/errorcode.xml b/reference/pdo/pdo/errorcode.xml
index 67bb7a69a3..99081aec79 100644
--- a/reference/pdo/pdo/errorcode.xml
+++ b/reference/pdo/pdo/errorcode.xml
@@ -10,12 +10,17 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>PDO::errorCode</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>PDO::errorCode</methodname>
    <void/>
   </methodsynopsis>
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -79,7 +84,6 @@ PDO::errorCode(): 42S02
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/errorinfo.xml b/reference/pdo/pdo/errorinfo.xml
index d8dd10e374..f6e805cfe7 100644
--- a/reference/pdo/pdo/errorinfo.xml
+++ b/reference/pdo/pdo/errorinfo.xml
@@ -16,6 +16,11 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdo/exec.xml b/reference/pdo/pdo/exec.xml
index f8670aa310..d2486fec63 100644
--- a/reference/pdo/pdo/exec.xml
+++ b/reference/pdo/pdo/exec.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>PDO::exec</methodname>
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>PDO::exec</methodname>
    <methodparam><type>string</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
 
@@ -40,8 +40,7 @@
         The SQL statement to prepare and execute.
        </para>
        <para>
-        Data inside the query should be <link
-        linkend="pdo.quote">properly escaped</link>.
+        Data inside the query should be <link linkend="pdo.quote">properly escaped</link>.
        </para>
       </listitem>
      </varlistentry>
@@ -118,7 +117,6 @@ Deleted 1 rows.
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/getattribute.xml b/reference/pdo/pdo/getattribute.xml
index bb223bb346..9c6828a3a4 100644
--- a/reference/pdo/pdo/getattribute.xml
+++ b/reference/pdo/pdo/getattribute.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>PDO::getAttribute</methodname>
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>int</type><type>string</type><type>array</type><type>null</type></type><methodname>PDO::getAttribute</methodname>
    <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
   </methodsynopsis>
 
@@ -113,7 +113,6 @@ Use the PEAR Coding Standards
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/getavailabledrivers.xml b/reference/pdo/pdo/getavailabledrivers.xml
index 8c044129c2..7b0a8e20b7 100644
--- a/reference/pdo/pdo/getavailabledrivers.xml
+++ b/reference/pdo/pdo/getavailabledrivers.xml
@@ -25,6 +25,12 @@
   </para>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdo/lastinsertid.xml b/reference/pdo/pdo/lastinsertid.xml
index e4bf19ddd2..e4bf079b5b 100644
--- a/reference/pdo/pdo/lastinsertid.xml
+++ b/reference/pdo/pdo/lastinsertid.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>PDO::lastInsertId</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>PDO::lastInsertId</methodname>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
 
   <para>
@@ -67,7 +67,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/prepare.xml b/reference/pdo/pdo/prepare.xml
index 1803ffa647..82875cb89c 100644
--- a/reference/pdo/pdo/prepare.xml
+++ b/reference/pdo/pdo/prepare.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>PDOStatement</type><methodname>PDO::prepare</methodname>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter><initializer>array()</initializer></methodparam>
+   <modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::prepare</methodname>
+   <methodparam><type>string</type><parameter>query</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
 
   <para>
@@ -56,7 +56,7 @@
   </para>
   <note>
    <simpara>
-    As of PHP 5.3.0, the parser used for emulated prepared statements and for
+    The parser used for emulated prepared statements and for
     rewriting named or question mark style parameters supports the non standard
     backslash escapes for single- and double quotes. That means that terminating
     quotes immediately preceeded by a backslash are not recognized as such, which
@@ -72,7 +72,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>statement</parameter></term>
+     <term><parameter>query</parameter></term>
      <listitem>
       <para>
        This must be a valid SQL statement template for the target database server.
@@ -80,7 +80,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>driver_options</parameter></term>
+     <term><parameter>options</parameter></term>
      <listitem>
       <para>
        This array holds one or more key=&gt;value pairs to set
@@ -105,8 +105,7 @@
    <classname>PDOStatement</classname> object.
    If the database server cannot successfully prepare the statement,
    <function>PDO::prepare</function> returns &false; or emits
-   <classname>PDOException</classname> (depending on <link
-   linkend="pdo.error-handling">error handling</link>).
+   <classname>PDOException</classname> (depending on <link linkend="pdo.error-handling">error handling</link>).
   </para>
   <note>
    <para>
@@ -167,7 +166,6 @@ $yellow = $sth->fetchAll();
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/query.xml b/reference/pdo/pdo/query.xml
index 52f5ed529b..b70529742b 100644
--- a/reference/pdo/pdo/query.xml
+++ b/reference/pdo/pdo/query.xml
@@ -4,46 +4,46 @@
  <refnamediv>
   <refname>PDO::query</refname>
   <refpurpose>
-   Executes an SQL statement, returning a result set as a PDOStatement object
+   Prepares and executes an SQL statement without placeholders
   </refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>PDOStatement</type><methodname>PDO::query</methodname>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
+   <methodparam><type>string</type><parameter>query</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
 
   <methodsynopsis>
-   <modifier>public</modifier> <type>PDOStatement</type><methodname>PDO::query</methodname>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fetch_style</parameter><initializer>PDO::FETCH_COLUMN</initializer></methodparam>
+   <modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
+   <methodparam><type>string</type><parameter>query</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>PDO::FETCH_COLUMN</initializer></methodparam>
    <methodparam><type>int</type><parameter>colno</parameter></methodparam>
   </methodsynopsis>
 
   <methodsynopsis>
-   <modifier>public</modifier> <type>PDOStatement</type><methodname>PDO::query</methodname>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fetch_style</parameter><initializer>PDO::FETCH_CLASS</initializer></methodparam>
+   <modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
+   <methodparam><type>string</type><parameter>query</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>PDO::FETCH_CLASS</initializer></methodparam>
    <methodparam><type>string</type><parameter>classname</parameter></methodparam>
-   <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam>
+   <methodparam><type>array</type><parameter>constructorArgs</parameter></methodparam>
   </methodsynopsis>
 
   <methodsynopsis>
-   <modifier>public</modifier> <type>PDOStatement</type><methodname>PDO::query</methodname>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fetch_style</parameter><initializer>PDO::FETCH_INTO</initializer></methodparam>
+   <modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
+   <methodparam><type>string</type><parameter>query</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>PDO::FETCH_INTO</initializer></methodparam>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
 
   <para>
-   <function>PDO::query</function> executes an SQL statement in
-   a single function call, returning the result set (if any) returned by the
-   statement as a PDOStatement object.
+   <function>PDO::query</function> prepares and executes an SQL statement in
+   a single function call, returning the statement as a <classname>PDOStatement</classname> object.
   </para>
   <para>
    For a query that you need to issue multiple times, you will realize better
-   performance if you prepare a PDOStatement object using
+   performance if you prepare a <classname>PDOStatement</classname> object using
    <function>PDO::prepare</function> and issue the statement with multiple
    calls to <function>PDOStatement::execute</function>.
   </para>
@@ -51,16 +51,15 @@
    If you do not fetch all of the data in a result set before issuing your
    next call to <function>PDO::query</function>, your call may fail. Call
    <function>PDOStatement::closeCursor</function> to release the database
-   resources associated with the PDOStatement object before issuing your
+   resources associated with the <classname>PDOStatement</classname> object before issuing your
    next call to <function>PDO::query</function>.
   </para>
 
   <note>
    <para>
-    If more than one argument is passed to this function, the remaining arguments
-    will be treated as though you called
-    <function>PDOStatement::setFetchMode</function> on the resultant statement
-    object.
+    If the <parameter>query</parameter> contains placeholders, the statement
+    must be prepared and executed separately using <function>PDO::prepare</function> and 
+    <function>PDOStatement::execute</function> methods.
    </para>
   </note>
 
@@ -70,14 +69,32 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>statement</parameter></term>
+     <term><parameter>query</parameter></term>
       <listitem>
        <para>
         The SQL statement to prepare and execute.
        </para>
        <para>
-        Data inside the query should be <link
-        linkend="pdo.quote">properly escaped</link>.
+        If the SQL contains placeholders, <function>PDO::prepare</function> and 
+        <function>PDOStatement::execute</function> must be used instead.
+        Alternatively, the SQL can be prepared manually before calling 
+        <function>PDO::query</function>, with the data properly formatted using
+        <function>PDO::quote</function> if the driver supports it.
+       </para>
+      </listitem>
+     </varlistentry>
+    <varlistentry>
+     <term><parameter>fetchMode</parameter></term>
+      <listitem>
+       <para>
+        The default fetch mode for the returned <classname>PDOStatement</classname>.
+        It must be one of the <link linkend="pdo.constants"><literal>PDO::FETCH_*</literal></link> constants.
+       </para>
+       <para>
+        If this argument is passed to the function, the remaining arguments
+        will be treated as though <methodname>PDOStatement::setFetchMode</methodname>
+        was called on the resultant statement object.
+        The subsequent arguments vary depending on the selected fetch mode.
        </para>
       </listitem>
      </varlistentry>
@@ -87,8 +104,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    <function>PDO::query</function> returns a PDOStatement object, or &false;
-    on failure.
+    Returns a <classname>PDOStatement</classname> object&return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -96,12 +112,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>Demonstrate PDO::query</title>
-    <para>
-     A nice feature of <function>PDO::query</function> is that it
-     enables you to iterate over the rowset returned by a
-     successfully executed SELECT statement.
-    </para>
+    <title>SQL with no placeholders can be executed using <function>PDO::query</function></title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -144,7 +155,6 @@ watermelon      pink    90
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/quote.xml b/reference/pdo/pdo/quote.xml
index 27a00c75d5..fa0627d61a 100644
--- a/reference/pdo/pdo/quote.xml
+++ b/reference/pdo/pdo/quote.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>PDO::quote</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>PDO::quote</methodname>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
   </methodsynopsis>
 
   <para>
@@ -57,7 +57,7 @@
       </listitem>
      </varlistentry>
     <varlistentry>
-     <term><parameter>parameter_type</parameter></term>
+     <term><parameter>type</parameter></term>
       <listitem>
        <para>
         Provides a data type hint for drivers that have alternate quoting styles.
@@ -168,7 +168,6 @@ Quoted string: 'Co''mpl''''ex "st''"ring'
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdo/rollback.xml b/reference/pdo/pdo/rollback.xml
index 36f1da41ba..814f531c84 100644
--- a/reference/pdo/pdo/rollback.xml
+++ b/reference/pdo/pdo/rollback.xml
@@ -32,6 +32,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdo/setattribute.xml b/reference/pdo/pdo/setattribute.xml
index 8e67417c82..49aa997721 100644
--- a/reference/pdo/pdo/setattribute.xml
+++ b/reference/pdo/pdo/setattribute.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>PDO::setAttribute</methodname>
    <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>int</type></type><parameter>value</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -106,7 +106,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/bindcolumn.xml b/reference/pdo/pdostatement/bindcolumn.xml
index 64b7fc37b5..21819e391d 100644
--- a/reference/pdo/pdostatement/bindcolumn.xml
+++ b/reference/pdo/pdostatement/bindcolumn.xml
@@ -10,13 +10,13 @@
  <refsect1 role="description">
   &reftitle.description;
    <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::bindColumn</methodname>
-    <methodparam><type>mixed</type><parameter>column</parameter></methodparam>
-    <methodparam><type>mixed</type><parameter role="reference">param</parameter></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter>maxlen</parameter></methodparam>
-    <methodparam choice="opt"><type>mixed</type><parameter>driverdata</parameter></methodparam>
-   </methodsynopsis>
+   <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::bindColumn</methodname>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter role="reference">var</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>maxLength</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>driverOptions</parameter><initializer>&null;</initializer></methodparam>
+  </methodsynopsis>
 
   <para>
    <function>PDOStatement::bindColumn</function> arranges to have a
@@ -55,7 +55,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>param</parameter></term>
+     <term><parameter>var</parameter></term>
      <listitem>
       <para>
        Name of the PHP variable to which the column will be bound.
@@ -66,14 +66,13 @@
      <term><parameter>type</parameter></term>
      <listitem>
       <para>
-       Data type of the parameter, specified by the <link
-       linkend="pdo.constants"><literal>PDO::PARAM_*</literal>
+       Data type of the parameter, specified by the <link linkend="pdo.constants"><literal>PDO::PARAM_*</literal>
        constants</link>.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>maxlen</parameter></term>
+     <term><parameter>maxLength</parameter></term>
      <listitem>
       <para>
        A hint for pre-allocation.
@@ -81,7 +80,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>driverdata</parameter></term>
+     <term><parameter>driverOptions</parameter></term>
      <listitem>
       <para>
        Optional parameter(s) for the driver.
@@ -157,7 +156,6 @@ strawberry      red     25
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/bindparam.xml b/reference/pdo/pdostatement/bindparam.xml
index a9851defde..b33239694d 100644
--- a/reference/pdo/pdostatement/bindparam.xml
+++ b/reference/pdo/pdostatement/bindparam.xml
@@ -11,11 +11,11 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::bindParam</methodname>
-   <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>data_type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>driver_options</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>param</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter role="reference">var</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>maxLength</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>driverOptions</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Binds a PHP variable to a corresponding named or question mark placeholder
@@ -27,7 +27,7 @@
   <para>
    Most parameters are input parameters, that is, parameters that are used
    in a read-only fashion to build up the query (but may nonetheless be cast
-   according to <parameter>data_type</parameter>).  Some drivers support the
+   according to <parameter>type</parameter>).  Some drivers support the
    invocation of stored procedures that return data as output parameters,
    and some also as input/output parameters that both send in data and are
    updated to receive it.
@@ -40,7 +40,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>parameter</parameter></term>
+     <term><parameter>param</parameter></term>
       <listitem>
        <para>
         Parameter identifier. For a prepared statement using named
@@ -52,7 +52,7 @@
       </listitem>
      </varlistentry>
     <varlistentry>
-     <term><parameter>variable</parameter></term>
+     <term><parameter>var</parameter></term>
       <listitem>
        <para>
         Name of the PHP variable to bind to the SQL statement parameter.
@@ -60,20 +60,19 @@
       </listitem>
      </varlistentry>
     <varlistentry>
-     <term><parameter>data_type</parameter></term>
+     <term><parameter>type</parameter></term>
       <listitem>
        <para>
-        Explicit data type for the parameter using the <link
-        linkend="pdo.constants"><literal>PDO::PARAM_*</literal>
+        Explicit data type for the parameter using the <link linkend="pdo.constants"><literal>PDO::PARAM_*</literal>
         constants</link>.
         To return an INOUT parameter from a stored procedure, 
         use the bitwise OR operator to set the PDO::PARAM_INPUT_OUTPUT bits
-        for the <parameter>data_type</parameter> parameter.
+        for the <parameter>type</parameter> parameter.
        </para>
       </listitem>
      </varlistentry>
     <varlistentry>
-     <term><parameter>length</parameter></term>
+     <term><parameter>maxLength</parameter></term>
       <listitem>
        <para>
         Length of the data type. To indicate that a parameter is an OUT
@@ -83,7 +82,7 @@
       </listitem>
      </varlistentry>
     <varlistentry>
-     <term><parameter>driver_options</parameter></term>
+     <term><parameter>driverOptions</parameter></term>
      <listitem>
       <para>
          
@@ -190,7 +189,6 @@ print("After pureeing fruit, the colour is: $colour");
 
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/bindvalue.xml b/reference/pdo/pdostatement/bindvalue.xml
index befcfb178d..9df75503de 100644
--- a/reference/pdo/pdostatement/bindvalue.xml
+++ b/reference/pdo/pdostatement/bindvalue.xml
@@ -11,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::bindValue</methodname>
-   <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>param</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>data_type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>PDO::PARAM_STR</initializer></methodparam>
   </methodsynopsis>
   <para>
    Binds a value to a corresponding named or question mark placeholder
@@ -26,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>parameter</parameter></term>
+     <term><parameter>param</parameter></term>
       <listitem>
        <para>
         Parameter identifier. For a prepared statement using named
@@ -46,11 +46,10 @@
       </listitem>
      </varlistentry>
     <varlistentry>
-     <term><parameter>data_type</parameter></term>
+     <term><parameter>type</parameter></term>
       <listitem>
        <para>
-        Explicit data type for the parameter using the <link
-        linkend="pdo.constants"><literal>PDO::PARAM_*</literal>
+        Explicit data type for the parameter using the <link linkend="pdo.constants"><literal>PDO::PARAM_*</literal>
         constants</link>.
        </para>
       </listitem>
@@ -119,7 +118,6 @@ $sth->execute();
 
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/closecursor.xml b/reference/pdo/pdostatement/closecursor.xml
index aba9f5c7c3..436df9e270 100644
--- a/reference/pdo/pdostatement/closecursor.xml
+++ b/reference/pdo/pdostatement/closecursor.xml
@@ -44,7 +44,11 @@ do {
 ]]>
    </programlisting>
   </para>
+ </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
diff --git a/reference/pdo/pdostatement/columncount.xml b/reference/pdo/pdostatement/columncount.xml
index 95a71ccf6f..b83cabdb10 100644
--- a/reference/pdo/pdostatement/columncount.xml
+++ b/reference/pdo/pdostatement/columncount.xml
@@ -27,8 +27,13 @@
    <function>PDO::prepare</function>, an accurate column count will not be
    available until you invoke <function>PDOStatement::execute</function>.
   </para>
-
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdostatement/debugdumpparams.xml b/reference/pdo/pdostatement/debugdumpparams.xml
index 5034fcad98..c4155a6b24 100644
--- a/reference/pdo/pdostatement/debugdumpparams.xml
+++ b/reference/pdo/pdostatement/debugdumpparams.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>PDOStatement::debugDumpParams</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>PDOStatement::debugDumpParams</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Dumps the information contained by a prepared statement directly on the
@@ -34,10 +34,42 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.void;
+   Returns &null;, or &false; in case of an error.
+  </para>
+ </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>7.2.0</entry>
+       <entry>
+        <methodname>PDOStatement::debugDumpParams</methodname> now returns the SQL sent to
+        the database, including the full, raw query (including the replaced placeholders with
+        their bounded values). Note, that this will only be available if emulated prepared
+        statements are turned on.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
   </para>
  </refsect1>
 
@@ -130,33 +162,6 @@ param_type=2
   </example>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.2.0</entry>
-       <entry>
-        <methodname>PDOStatement::debugDumpParams</methodname> now returns the SQL sent to 
-        the database, including the full, raw query (including the replaced placeholders with 
-        their bounded values). Note, that this will only be available if emulated prepared 
-        statements are turned on.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -169,7 +174,6 @@ param_type=2
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/errorcode.xml b/reference/pdo/pdostatement/errorcode.xml
index d79232ec8b..afef0eca06 100644
--- a/reference/pdo/pdostatement/errorcode.xml
+++ b/reference/pdo/pdostatement/errorcode.xml
@@ -10,11 +10,16 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>PDOStatement::errorCode</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>PDOStatement::errorCode</methodname>
    <void/>
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -62,7 +67,6 @@ PDOStatement::errorCode(): 42S02
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/errorinfo.xml b/reference/pdo/pdostatement/errorinfo.xml
index 51942a91db..1f6362c092 100644
--- a/reference/pdo/pdostatement/errorinfo.xml
+++ b/reference/pdo/pdostatement/errorinfo.xml
@@ -13,7 +13,11 @@
    <modifier>public</modifier> <type>array</type><methodname>PDOStatement::errorInfo</methodname>
    <void/>
   </methodsynopsis>
+ </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
  </refsect1>
 
  <refsect1 role="returnvalues">
diff --git a/reference/pdo/pdostatement/execute.xml b/reference/pdo/pdostatement/execute.xml
index 29e2df8b20..544963ed17 100644
--- a/reference/pdo/pdostatement/execute.xml
+++ b/reference/pdo/pdostatement/execute.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::execute</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>params</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Execute the <link linkend="pdo.prepared-statements">prepared
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>input_parameters</parameter></term>
+     <term><parameter>params</parameter></term>
      <listitem>
       <para>
        An array of values with as many elements as there are bound
@@ -48,7 +48,7 @@
       </para>
       <para>
        Binding more values than specified is not possible; if more keys exist in 
-       <parameter>input_parameters</parameter> than in the SQL specified 
+       <parameter>params</parameter> than in the SQL specified 
        in the <methodname>PDO::prepare</methodname>, then the statement will 
        fail and an error is emitted.
       </para>
@@ -85,7 +85,7 @@ $sth->execute();
    </programlisting>
   </example>
 
-  <example><title>Execute a prepared statement with an array of insert values (named parameters)</title>
+  <example><title>Execute a prepared statement with an array of named values</title>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -101,7 +101,7 @@ $sth->execute(array(':calories' => $calories, ':colour' => $colour));
    </programlisting>
   </example>
 
-  <example><title>Execute a prepared statement with an array of insert values (placeholders)</title>
+  <example><title>Execute a prepared statement with an array of positional values</title>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -117,7 +117,7 @@ $sth->execute(array($calories, $colour));
    </programlisting>
   </example>
 
-  <example><title>Execute a prepared statement with question mark placeholders</title>
+  <example><title>Execute a prepared statement with variables bound to positional placeholders</title>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -184,7 +184,6 @@ $sth->execute($params);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/fetch.xml b/reference/pdo/pdostatement/fetch.xml
index f0096bf930..1a741edc4e 100644
--- a/reference/pdo/pdostatement/fetch.xml
+++ b/reference/pdo/pdostatement/fetch.xml
@@ -11,14 +11,14 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>mixed</type><methodname>PDOStatement::fetch</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>cursor_orientation</parameter><initializer>PDO::FETCH_ORI_NEXT</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>cursor_offset</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_DEFAULT</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>cursorOrientation</parameter><initializer>PDO::FETCH_ORI_NEXT</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>cursorOffset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
 
   <para>
    Fetches a row from a result set associated with a PDOStatement object. The
-   <parameter>fetch_style</parameter> parameter determines how PDO returns
+   <parameter>mode</parameter> parameter determines how PDO returns
    the row.
   </para>
  </refsect1>
@@ -28,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fetch_style</parameter></term>
+     <term><parameter>mode</parameter></term>
      <listitem>
       <para>
        Controls how the next row will be returned to the caller. This value
@@ -56,7 +56,7 @@
          requested class, mapping the columns of the result set to named
          properties in the class, and calling the constructor afterwards, unless
          <literal>PDO::FETCH_PROPS_LATE</literal> is also given.
-         If <parameter>fetch_style</parameter>
+         If <parameter>mode</parameter>
          includes PDO::FETCH_CLASSTYPE (e.g. <literal>PDO::FETCH_CLASS |
          PDO::FETCH_CLASSTYPE</literal>) then the name of the class is
          determined from a value of the first column.
@@ -98,7 +98,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>cursor_orientation</parameter></term>
+     <term><parameter>cursorOrientation</parameter></term>
      <listitem>
       <para>
        For a PDOStatement object representing a scrollable cursor, this
@@ -325,7 +325,6 @@ I am Bob.
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/fetchall.xml b/reference/pdo/pdostatement/fetchall.xml
index 9870bfe6a4..ef16a1ffa4 100644
--- a/reference/pdo/pdostatement/fetchall.xml
+++ b/reference/pdo/pdostatement/fetchall.xml
@@ -10,12 +10,28 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>PDOStatement::fetchAll</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>fetch_argument</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter><initializer>array()</initializer></methodparam>
+   <modifier>public</modifier> <type>array</type><methodname>PDOStatement::fetchAll</methodname>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_DEFAULT</initializer></methodparam>
   </methodsynopsis>
 
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>PDOStatement::fetchAll</methodname>
+   <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_COLUMN</initializer></methodparam>
+   <methodparam><type>int</type><parameter>colno</parameter></methodparam>
+  </methodsynopsis>
+
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>PDOStatement::fetchAll</methodname>
+   <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_CLASS</initializer></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>constructorArgs</parameter></methodparam>
+  </methodsynopsis>
+
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>PDOStatement::fetchAll</methodname>
+   <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_INTO</initializer></methodparam>
+   <methodparam><type>object</type><parameter>object</parameter></methodparam>
+  </methodsynopsis>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -23,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fetch_style</parameter></term>
+     <term><parameter>mode</parameter></term>
      <listitem>
       <para>
        Controls the contents of the returned array as documented in
@@ -35,7 +51,7 @@
        To return an array consisting of all values of a single column from
        the result set, specify <constant>PDO::FETCH_COLUMN</constant>. You
        can specify which column you want with the
-       <parameter>fetch_argument</parameter> parameter.
+       <parameter>colno</parameter> parameter.
       </para>
       <para>
        To fetch only the unique values of a single column from the result set,
@@ -50,11 +66,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>fetch_argument</parameter></term>
+     <term><parameter>args</parameter></term>
      <listitem>
       <para>
        This argument has a different meaning depending on the value of 
-       the <parameter>fetch_style</parameter> parameter:
+       the <parameter>mode</parameter> parameter:
        <itemizedlist>
         <listitem>
          <para>
@@ -79,10 +95,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ctor_args</parameter></term>
+     <term><parameter>constructorArgs</parameter></term>
      <listitem>
       <para>
-       Arguments of custom class constructor when the <parameter>fetch_style</parameter> 
+       Arguments of custom class constructor when the <parameter>mode</parameter> 
        parameter is <constant>PDO::FETCH_CLASS</constant>.
       </para>
      </listitem>
@@ -365,7 +381,6 @@ array(3) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/fetchcolumn.xml b/reference/pdo/pdostatement/fetchcolumn.xml
index db28a8d283..03030d13b0 100644
--- a/reference/pdo/pdostatement/fetchcolumn.xml
+++ b/reference/pdo/pdostatement/fetchcolumn.xml
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>mixed</type><methodname>PDOStatement::fetchColumn</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>column_number</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>column</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
 
   <para>
@@ -35,7 +35,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>column_number</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        0-indexed number of the column you wish to retrieve from the row. If
@@ -108,7 +108,6 @@ colour = red
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/fetchobject.xml b/reference/pdo/pdostatement/fetchobject.xml
index d87c15390f..fc1d44d155 100644
--- a/reference/pdo/pdostatement/fetchobject.xml
+++ b/reference/pdo/pdostatement/fetchobject.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>object</type><type>false</type></type><methodname>PDOStatement::fetchObject</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"stdClass"</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>class</parameter><initializer>"stdClass"</initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>constructorArgs</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
 
   <para>
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>class_name</parameter></term>
+     <term><parameter>class</parameter></term>
      <listitem>
       <para>
        Name of the created class.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ctor_args</parameter></term>
+     <term><parameter>constructorArgs</parameter></term>
      <listitem>
       <para>
        Elements of this array are passed to the constructor.
@@ -67,7 +67,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/getattribute.xml b/reference/pdo/pdostatement/getattribute.xml
index be46b2dd17..b56b5f7a96 100644
--- a/reference/pdo/pdostatement/getattribute.xml
+++ b/reference/pdo/pdostatement/getattribute.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>mixed</type><methodname>PDOStatement::getAttribute</methodname>
-   <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
+   <methodparam><type>int</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -45,7 +45,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/getcolumnmeta.xml b/reference/pdo/pdostatement/getcolumnmeta.xml
index 08c564fb42..693a450b57 100644
--- a/reference/pdo/pdostatement/getcolumnmeta.xml
+++ b/reference/pdo/pdostatement/getcolumnmeta.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>PDOStatement::getColumnMeta</methodname>
+   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>PDOStatement::getColumnMeta</methodname>
    <methodparam><type>int</type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   
@@ -59,8 +59,8 @@
    <table>
     <title>Column metadata</title>
     <tgroup cols="2">
-     <colspec colname='c1'/> 
-     <colspec colname='c2'/> 
+     <colspec colname="c1"/> 
+     <colspec colname="c2"/> 
      <thead>
       <row>
        <entry>Name</entry>
@@ -180,7 +180,6 @@ array(6) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/pdostatement/nextrowset.xml b/reference/pdo/pdostatement/nextrowset.xml
index ee2e680652..d170c1c846 100644
--- a/reference/pdo/pdostatement/nextrowset.xml
+++ b/reference/pdo/pdostatement/nextrowset.xml
@@ -21,8 +21,13 @@
    second and subsequent rowsets associated with a PDOStatement object. Each
    rowset can have a different set of columns from the preceding rowset.
   </para>
-
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo/pdostatement/rowcount.xml b/reference/pdo/pdostatement/rowcount.xml
index ddb535f11c..177cfcc629 100644
--- a/reference/pdo/pdostatement/rowcount.xml
+++ b/reference/pdo/pdostatement/rowcount.xml
@@ -35,6 +35,11 @@
      </para>
   </note>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
   <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml
index bd006b7c34..df36b20395 100644
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -9,6 +9,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
+
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
    <methodparam><type>int</type><parameter>mode</parameter></methodparam>
@@ -23,8 +24,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
    <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_CLASS</initializer></methodparam>
-   <methodparam><type>string</type><parameter>classname</parameter></methodparam>
-   <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam>
+   <methodparam><type>string</type><parameter>class</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>constructorArgs</parameter></methodparam>
   </methodsynopsis>
 
   <methodsynopsis>
@@ -55,7 +56,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-    <term><parameter>classname</parameter></term>
+    <term><parameter>class</parameter></term>
      <listitem>
       <para>
        Class name.
@@ -63,7 +64,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ctorargs</parameter></term>
+     <term><parameter>constructorArgs</parameter></term>
      <listitem>
       <para>
        Constructor arguments.
@@ -138,7 +139,6 @@ pear    green   150
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo/prepared-statements.xml b/reference/pdo/prepared-statements.xml
index 9f7e3b603c..1d3ff48f69 100644
--- a/reference/pdo/prepared-statements.xml
+++ b/reference/pdo/prepared-statements.xml
@@ -107,10 +107,9 @@ $stmt->execute();
 <![CDATA[
 <?php
 $stmt = $dbh->prepare("SELECT * FROM REGISTRY where name = ?");
-if ($stmt->execute(array($_GET['name']))) {
-  while ($row = $stmt->fetch()) {
-    print_r($row);
-  }
+$stmt->execute([$_GET['name']]);
+foreach ($stmt as $row) {
+  print_r($row);
 }
 ?>
 ]]>
@@ -175,11 +174,11 @@ print "procedure returned $value\n";
 <![CDATA[
 <?php
 $stmt = $dbh->prepare("SELECT * FROM REGISTRY where name LIKE '%?%'");
-$stmt->execute(array($_GET['name']));
+$stmt->execute([$_GET['name']]);
 
 // placeholder must be used in the place of the whole value
 $stmt = $dbh->prepare("SELECT * FROM REGISTRY where name LIKE ?");
-$stmt->execute(array("%$_GET[name]%"));
+$stmt->execute(["%$_GET[name]%"]);
 ?>
 ]]>
    </programlisting>
diff --git a/reference/pdo/versions.xml b/reference/pdo/versions.xml
index 1c8af89027..ed894fe63a 100644
--- a/reference/pdo/versions.xml
+++ b/reference/pdo/versions.xml
@@ -7,70 +7,70 @@
  FIXME: Discuss how/where to keep PDO version info...
 -->
 <versions>
- <function name="pdo" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
  <function name="pdo::__sleep" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.0"/>
  <function name="pdo::__wakeup" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.0"/>
- <function name="pdo::begintransaction" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::commit" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::begintransaction" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::commit" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
  <function name="pdo::cubrid_schema" from="PECL PDO_CUBRID &gt;= 8.3.0.0001"/>
- <function name="pdo::errorcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::errorinfo" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::exec" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::getattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdo::getavailabledrivers" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.3"/>
- <function name="pdo::intransaction" from="PHP 5 &gt;= 5.3.3, Bundled pdo_pgsql, PHP 7"/>
- <function name="pdo::lastinsertid" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::pgsqlcopyfromarray" from="PHP 5 &gt;= 5.3.3, PHP 7"/>
- <function name="pdo::pgsqlcopyfromfile" from="PHP 5 &gt;= 5.3.3, PHP 7"/>
- <function name="pdo::pgsqlcopytoarray" from="PHP 5 &gt;= 5.3.3, PHP 7"/>
- <function name="pdo::pgsqlcopytofile" from="PHP 5 &gt;= 5.3.3, PHP 7"/>
- <function name="pdo::pgsqlgetnotify" from="PHP 5 &gt;= 5.6.0, PHP 7"/>
- <function name="pdo::pgsqlgetpid" from="PHP 5 &gt;= 5.6.0, PHP 7"/>
- <function name="pdo::pgsqllobcreate" from="PHP 5 &gt;= 5.1.2, PHP 7, PECL pdo_pgsql &gt;= 1.0.2"/>
- <function name="pdo::pgsqllobopen" from="PHP 5 &gt;= 5.1.2, PHP 7, PECL pdo_pgsql &gt;= 1.0.2"/>
- <function name="pdo::pgsqllobunlink" from="PHP 5 &gt;= 5.1.2, PHP 7, PECL pdo_pgsql &gt;= 1.0.2"/>
- <function name="pdo::prepare" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::query" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdo::quote" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.1"/>
- <function name="pdo::rollback" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::setattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdo::sqlitecreateaggregate" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo_sqlite &gt;= 1.0.0"/>
- <function name="pdo::sqlitecreatefunction" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo_sqlite &gt;= 1.0.0"/>
- <function name="pdo::sqlitecreatecollation" from="PHP 5 &gt;= 5.3.11, PHP 7"/>
+ <function name="pdo::errorcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::errorinfo" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::exec" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::getattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdo::getavailabledrivers" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 1.0.3"/>
+ <function name="pdo::intransaction" from="PHP 5 &gt;= 5.3.3, Bundled pdo_pgsql, PHP 7, PHP 8"/>
+ <function name="pdo::lastinsertid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::pgsqlcopyfromarray" from="PHP 5 &gt;= 5.3.3, PHP 7, PHP 8"/>
+ <function name="pdo::pgsqlcopyfromfile" from="PHP 5 &gt;= 5.3.3, PHP 7, PHP 8"/>
+ <function name="pdo::pgsqlcopytoarray" from="PHP 5 &gt;= 5.3.3, PHP 7, PHP 8"/>
+ <function name="pdo::pgsqlcopytofile" from="PHP 5 &gt;= 5.3.3, PHP 7, PHP 8"/>
+ <function name="pdo::pgsqlgetnotify" from="PHP 5 &gt;= 5.6.0, PHP 7, PHP 8"/>
+ <function name="pdo::pgsqlgetpid" from="PHP 5 &gt;= 5.6.0, PHP 7, PHP 8"/>
+ <function name="pdo::pgsqllobcreate" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8, PECL pdo_pgsql &gt;= 1.0.2"/>
+ <function name="pdo::pgsqllobopen" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8, PECL pdo_pgsql &gt;= 1.0.2"/>
+ <function name="pdo::pgsqllobunlink" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8, PECL pdo_pgsql &gt;= 1.0.2"/>
+ <function name="pdo::prepare" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PHP 8,PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::query" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdo::quote" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.1"/>
+ <function name="pdo::rollback" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::setattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdo::sqlitecreateaggregate" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo_sqlite &gt;= 1.0.0"/>
+ <function name="pdo::sqlitecreatefunction" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo_sqlite &gt;= 1.0.0"/>
+ <function name="pdo::sqlitecreatecollation" from="PHP 5 &gt;= 5.3.11, PHP 7, PHP 8"/>
 
- <function name="pdo_drivers" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.9.0"/>
+ <function name="pdo_drivers" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.9.0"/>
 
  <function name="pdo_user" from="PECL pdo_user &gt;= 0.2.0"/>
  <function name="pdo_user::parsesql" from="PECL pdo_user &gt;= 0.2.0"/>
  <function name="pdo_user::tokenizesql" from="PECL pdo_user &gt;= 0.2.0"/>
  <function name="pdo_user::tokenname" from="PECL pdo_user &gt;= 0.2.0"/>
 
- <function name="pdostatement" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.0"/>
+ <function name="pdostatement" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 1.0.0"/>
  <function name="pdostatement::__sleep" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.0"/>
  <function name="pdostatement::__wakeup" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.0"/>
- <function name="pdostatement::bindcolumn" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::bindparam" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::bindvalue" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 1.0.0"/>
- <function name="pdostatement::closecursor" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.9.0"/>
- <function name="pdostatement::columncount" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdostatement::debugdumpparams" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.9.0"/>
- <function name="pdostatement::errorcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::errorinfo" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::execute" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::fetch" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::fetchall" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::fetchcolumn" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.9.0"/>
- <function name="pdostatement::fetchobject" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.4"/>
+ <function name="pdostatement::bindcolumn" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::bindparam" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::bindvalue" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 1.0.0"/>
+ <function name="pdostatement::closecursor" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.9.0"/>
+ <function name="pdostatement::columncount" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdostatement::debugdumpparams" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.9.0"/>
+ <function name="pdostatement::errorcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::errorinfo" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::execute" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::fetch" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::fetchall" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::fetchcolumn" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.9.0"/>
+ <function name="pdostatement::fetchobject" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.4"/>
  <function name="pdostatement::fetchsingle" from="PECL pdo 0.1-0.3"/>
- <function name="pdostatement::getattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdostatement::getcolumnmeta" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdostatement::nextrowset" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdostatement::rowcount" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.1.0"/>
- <function name="pdostatement::setattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
- <function name="pdostatement::setfetchmode" from="PHP 5 &gt;= 5.1.0, PHP 7, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdostatement::getattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdostatement::getcolumnmeta" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdostatement::nextrowset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdostatement::rowcount" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.1.0"/>
+ <function name="pdostatement::setattribute" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
+ <function name="pdostatement::setfetchmode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8, PECL pdo &gt;= 0.2.0"/>
 
- <function name="pdoexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="pdoexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
  <function name="pdo_cubrid dsn" from="PECL PDO_CUBRID &gt;= 8.3.0.0001"/>
  <function name="pdo_dblib dsn" from="PECL PDO_DBLIB &gt;= 0.9.0"/>
diff --git a/reference/pdo_cubrid/reference.xml b/reference/pdo_cubrid/reference.xml
index 1d790bc0b0..3d49b7a490 100644
--- a/reference/pdo_cubrid/reference.xml
+++ b/reference/pdo_cubrid/reference.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
  <reference xml:id="ref.pdo-cubrid" xmlns="http://docbook.org/ns/docbook">
+ <?phpdoc extension-membership="pecl" ?>
   <title>CUBRID Functions (PDO_CUBRID)</title>
   <titleabbrev>CUBRID (PDO)</titleabbrev>
   <partintro>
diff --git a/reference/pdo_dblib/reference.xml b/reference/pdo_dblib/reference.xml
index 0b4c86c75d..f258a29014 100644
--- a/reference/pdo_dblib/reference.xml
+++ b/reference/pdo_dblib/reference.xml
@@ -16,7 +16,7 @@
      Microsoft SQL Server and Sybase databases through the FreeTDS library.
     </para>
     <para>
-     This extension is not available anymore on Windows with PHP 5.3 or later.
+     This extension is not available anymore on Windows.
     </para>
     <para>
      On Windows, you should use SqlSrv, an alternative driver for MS SQL is 
diff --git a/reference/pdo_firebird/constants.xml b/reference/pdo_firebird/constants.xml
index c22a933cff..3e4a37c2ca 100644
--- a/reference/pdo_firebird/constants.xml
+++ b/reference/pdo_firebird/constants.xml
@@ -10,9 +10,6 @@
      (<type>int</type>)
    </term>
    <listitem>
-    <para>
-     Available since PHP 5.3.0.
-    </para>
     <para>
      Sets the date format.
     </para>
@@ -27,9 +24,6 @@
     <para>
      Sets the time format.
     </para>
-    <para>
-     Available since PHP 5.3.0.
-    </para>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="pdo.constants.fb-attr-timestamp-format">
@@ -41,9 +35,6 @@
     <para>
      Sets the timestamp format.
     </para>
-    <para>
-     Available since PHP 5.3.0.
-    </para>
    </listitem>
   </varlistentry>
  </variablelist>
diff --git a/reference/pdo_ibm/reference.xml b/reference/pdo_ibm/reference.xml
index bb905f6c62..6882bde6fb 100644
--- a/reference/pdo_ibm/reference.xml
+++ b/reference/pdo_ibm/reference.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <reference xml:id="ref.pdo-ibm" xmlns="http://docbook.org/ns/docbook">
+ <?phpdoc extension-membership="pecl" ?>
   <title>IBM Functions (PDO_IBM)</title>
   <titleabbrev>IBM (PDO)</titleabbrev>
   <partintro>
diff --git a/reference/pdo_informix/reference.xml b/reference/pdo_informix/reference.xml
index 41a0c9f03a..b5424e07f3 100644
--- a/reference/pdo_informix/reference.xml
+++ b/reference/pdo_informix/reference.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
  <reference xml:id="ref.pdo-informix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
   <title>Informix Functions (PDO_INFORMIX)</title>
   <titleabbrev>Informix (PDO)</titleabbrev>
   <partintro>
diff --git a/reference/pdo_mysql/configure.xml b/reference/pdo_mysql/configure.xml
index 293c5214e6..92495f00be 100644
--- a/reference/pdo_mysql/configure.xml
+++ b/reference/pdo_mysql/configure.xml
@@ -27,7 +27,7 @@
  <para>
   When compiling, use <option role="configure">--with-pdo-mysql[=DIR]</option> to install
   the PDO MySQL extension, where the optional <literal>[=DIR]</literal>
-  is the MySQL base library. As of PHP 5.4, <link linkend="book.mysqlnd">mysqlnd</link>
+  is the MySQL base library. <link linkend="book.mysqlnd">Mysqlnd</link>
   is the default library. For details about choosing a library, see
   <link linkend="mysqlinfo.library.choosing">Choosing a MySQL library</link>.
  </para>
diff --git a/reference/pdo_mysql/reference.xml b/reference/pdo_mysql/reference.xml
index 5ea7006465..90e0fe02dd 100644
--- a/reference/pdo_mysql/reference.xml
+++ b/reference/pdo_mysql/reference.xml
@@ -48,6 +48,13 @@
       commit any pending transactions.
      </para>
     </warning>
+    <note>
+     <para>
+      The MySQL driver does not properly support <constant>PDO::PARAM_INPUT_OUTPUT</constant>
+      via <methodname>PDOStatement::bindParam</methodname>; while such parameters can be used,
+      they are not updated (i.e. the actual output is ignored).
+     </para>
+    </note>
    </section>
    &reference.pdo-mysql.configure;
    &reference.pdo-mysql.constants;
diff --git a/reference/pdo_odbc/configure.xml b/reference/pdo_odbc/configure.xml
index 1f3fab0df3..3e3e1e9c6a 100644
--- a/reference/pdo_odbc/configure.xml
+++ b/reference/pdo_odbc/configure.xml
@@ -6,7 +6,7 @@
   <title>PDO_ODBC on UNIX systems</title>
   <step>
    <para>
-    As of PHP 5.1, PDO_ODBC is included in the PHP source. You can compile the
+    PDO_ODBC is included in the PHP source. You can compile the
     PDO_ODBC extension as either a static or shared module using the following
     <command>configure</command> commands.
     <variablelist>
diff --git a/reference/pdo_odbc/ini.xml b/reference/pdo_odbc/ini.xml
index c5695916ed..570886b93a 100644
--- a/reference/pdo_odbc/ini.xml
+++ b/reference/pdo_odbc/ini.xml
@@ -20,13 +20,13 @@
       <entry><link linkend="ini.pdo-odbc.connection-pooling">pdo_odbc.connection_pooling</link></entry>
       <entry>"strict"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 5.1.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.pdo-odbc.db2-instance-name">pdo_odbc.db2_instance_name</link></entry>
       <entry>NULL</entry>
       <entry>PHP_INI_SYSTEM</entry>
-      <entry>Available since PHP 5.1.1. &removed.php.future;</entry>
+      <entry>&removed.php.future;</entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/pdo_pgsql/PDO/pgsqlGetPid.xml b/reference/pdo_pgsql/PDO/pgsqlGetPid.xml
index 3e6daba6fc..8d002356aa 100644
--- a/reference/pdo_pgsql/PDO/pgsqlGetPid.xml
+++ b/reference/pdo_pgsql/PDO/pgsqlGetPid.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -23,7 +28,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_sqlsrv/configure.xml b/reference/pdo_sqlsrv/configure.xml
index 536629ee3a..9826419207 100644
--- a/reference/pdo_sqlsrv/configure.xml
+++ b/reference/pdo_sqlsrv/configure.xml
@@ -5,18 +5,11 @@
  <para>
   The PDO_SQLSRV extension is enabled by adding appropriate DLL file to your PHP 
   extension directory and the corresponding entry to the &php.ini; file. The 
-  PDO_SQLSRV download comes 8 driver files, four of which are for PDO support. 
-  If you are running non-thread-safe PHP (PHP 5.3), use the php_pdo_sqlsrv_53_nts.dll 
-  file. (You should use a non-thread-safe version if you are using IIS as your 
-  web server). If you are running thread-safe PHP, use the php_pdo_sqlsrv_53_ts.dll 
-  file. Similarly for PHP 5.4, use the php_pdo_sqlsrv_54_nts.dll or php_pdo_sqlsrv_54_ts.dll
-  depending on whether your PHP installation is non-thread-safe or thread-safe. 
+  PDO_SQLSRV download comes with 8 driver files, four of which are for PDO support.
  </para>
  <para>
   The most recent version of the driver is available for download here:
-  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>. If you need support 
-  for PHP 5.2 and/or PHP compiled with VC6, use the 2.0 release of the driver: 
-  <link xlink:href="&url.sqlsrv.v2driverdownload;">SQLSRV 2.0 download</link>.
+  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>. 
   The driver sources are hosted in a <link xlink:href="&url.sqlsrv.repo;">public repository</link>.
  </para>
  <para>
diff --git a/reference/pdo_sqlsrv/reference.xml b/reference/pdo_sqlsrv/reference.xml
index 26014724d6..8ad501bf2a 100644
--- a/reference/pdo_sqlsrv/reference.xml
+++ b/reference/pdo_sqlsrv/reference.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
  <reference xml:id="ref.pdo-sqlsrv" xmlns="http://docbook.org/ns/docbook">
+ <?phpdoc extension-membership="pecl" ?>
   <title>Microsoft SQL Server Functions (PDO_SQLSRV)</title>
   <titleabbrev>MS SQL Server (PDO)</titleabbrev>
   <partintro>
diff --git a/reference/pgsql/constants.xml b/reference/pgsql/constants.xml
index 361ad3d82f..3829a94da0 100644
--- a/reference/pgsql/constants.xml
+++ b/reference/pgsql/constants.xml
@@ -85,7 +85,7 @@
    <listitem>
     <simpara>
       Passed to <function>pg_connect</function> to create an asynchronous
-      connection. Added in PHP 5.6.0.
+      connection.
     </simpara>
    </listitem>
   </varlistentry>
@@ -96,7 +96,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.6.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -107,7 +107,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.6.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -130,7 +130,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.6.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -153,7 +153,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.6.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -164,7 +164,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.6.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -175,7 +175,7 @@
    </term>
    <listitem>
     <simpara>
-      Available since PHP 5.6.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -796,7 +796,6 @@
      Apply escape to all parameters instead of calling <function>pg_convert</function>
      internally. This option omits meta data look up. Query could be as fast as
      <function>pg_query</function> and <function>pg_send_query</function>.
-     Available since PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -809,7 +808,6 @@
     <simpara>
      Returned by <function>pg_connect_poll</function> to indicate that the
      connection attempt failed.
-     Available since PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -822,7 +820,6 @@
     <simpara>
      Returned by <function>pg_connect_poll</function> to indicate that the
      connection is waiting for the PostgreSQL socket to be readable.
-     Available since PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -835,7 +832,6 @@
     <simpara>
      Returned by <function>pg_connect_poll</function> to indicate that the
      connection is waiting for the PostgreSQL socket to be writable.
-     Available since PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -848,7 +844,6 @@
     <simpara>
      Returned by <function>pg_connect_poll</function> to indicate that the
      connection is ready to be used.
-     Available since PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
@@ -861,7 +856,6 @@
     <simpara>
      Returned by <function>pg_connect_poll</function> to indicate that the
      connection is currently active.
-     Available since PHP 5.6.0.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/pgsql/functions/pg-connect.xml b/reference/pgsql/functions/pg-connect.xml
index 86252b0c4e..f8d12d5fe9 100644
--- a/reference/pgsql/functions/pg-connect.xml
+++ b/reference/pgsql/functions/pg-connect.xml
@@ -92,31 +92,6 @@
    PostgreSQL connection resource on success, &false; on failure.
   </para>
  </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Support for giving the <constant>PGSQL_CONNECT_ASYNC</constant>
-        constant as the <parameter>connect_type</parameter> was added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/pgsql/functions/pg-convert.xml b/reference/pgsql/functions/pg-convert.xml
index 981894ce7d..77f54f19d1 100644
--- a/reference/pgsql/functions/pg-convert.xml
+++ b/reference/pgsql/functions/pg-convert.xml
@@ -31,16 +31,10 @@
   </para>
   <note>
    <para>
-    Since PHP 5.6.0, it accepts boolean values, converting them to PostgreSQL
-    booleans. String representations of boolean values are also supported. &null; is
+    Boolean values are accepted and converted to PostgreSQL booleans.
+    String representations of boolean values are also supported. &null; is
     converted to PostgreSQL NULL.
    </para>
-   <para>
-    Prior to PHP 5.6.0, if there are boolean fields in <parameter>table_name</parameter> 
-    don't use the constant &true; in <parameter>assoc_array</parameter>. It will be
-    converted to the string 'TRUE' which is not a valid entry for boolean fields
-    in PostgreSQL. Use one of "t", "true", 1, "y", "yes" instead.
-   </para>
   </note>
  </refsect1>
 
@@ -117,32 +111,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        No longer experimental. Boolean/NULL data types are supported. Unknown/unsupported
-        data types are escaped without validation. <function>pg_convert</function> can
-        be used with any data types.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-fetch-all.xml b/reference/pgsql/functions/pg-fetch-all.xml
index 46bdf1f8f3..4bf00fc489 100644
--- a/reference/pgsql/functions/pg-fetch-all.xml
+++ b/reference/pgsql/functions/pg-fetch-all.xml
@@ -50,57 +50,6 @@
    other error.
   </para>
  </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>PostgreSQL fetch all</title>
-    <programlisting role="php">
-<![CDATA[
-<?php 
-$conn = pg_pconnect("dbname=publisher");
-if (!$conn) {
-    echo "An error occurred.\n";
-    exit;
-}
-
-$result = pg_query($conn, "SELECT * FROM authors");
-if (!$result) {
-    echo "An error occurred.\n";
-    exit;
-}
-
-$arr = pg_fetch_all($result);
-
-print_r($arr);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [id] => 1
-            [name] => Fred
-        )
-
-    [1] => Array
-        (
-            [id] => 2
-            [name] => Bob
-        )
-
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
 
  <refsect1 role="changelog">
   &reftitle.changelog;
@@ -126,6 +75,57 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>PostgreSQL fetch all</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php 
+$conn = pg_pconnect("dbname=publisher");
+if (!$conn) {
+    echo "An error occurred.\n";
+    exit;
+}
+
+$result = pg_query($conn, "SELECT * FROM authors");
+if (!$result) {
+    echo "An error occurred.\n";
+    exit;
+}
+
+$arr = pg_fetch_all($result);
+
+print_r($arr);
+
+?>
+]]>
+    </programlisting>
+    &example.outputs.similar;
+    <screen>
+     <![CDATA[
+Array
+(
+    [0] => Array
+        (
+            [id] => 1
+            [name] => Fred
+        )
+
+    [1] => Array
+        (
+            [id] => 2
+            [name] => Bob
+        )
+
+)
+]]>
+    </screen>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-get-notify.xml b/reference/pgsql/functions/pg-get-notify.xml
index b0d85046d8..13149dc5e9 100644
--- a/reference/pgsql/functions/pg-get-notify.xml
+++ b/reference/pgsql/functions/pg-get-notify.xml
@@ -58,7 +58,7 @@
   &reftitle.returnvalues;
   <para>
    An <type>array</type> containing the <literal>NOTIFY</literal> message name and backend PID.
-   As of PHP 5.4.0 and if supported by the server, the array also contains the server version and the payload.
+   If supported by the server, the array also contains the server version and the payload.
    Otherwise if no <literal>NOTIFY</literal> is waiting, then &false; is returned.
   </para>
  </refsect1>
diff --git a/reference/pgsql/functions/pg-insert.xml b/reference/pgsql/functions/pg-insert.xml
index 5406200dbd..7078d99439 100644
--- a/reference/pgsql/functions/pg-insert.xml
+++ b/reference/pgsql/functions/pg-insert.xml
@@ -125,45 +125,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Unless <constant>PGSQL_DML_STRING</constant> is passed, the function
-        now returns the connection resource instead of &true; on success.
-       </entry>
-      </row>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        No longer experimental. Added <constant>PGSQL_DML_ESCAPE</constant> constant,
-        &true;/&false; and &null; data type support.
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.3/5.4.19</entry>
-       <entry>
-        Direct SQL injection to <parameter>table_name</parameter> and Indirect SQL
-        injection to identifiers are fixed.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-last-notice.xml b/reference/pgsql/functions/pg-last-notice.xml
index 2ce50e5b00..205b9cad7e 100644
--- a/reference/pgsql/functions/pg-last-notice.xml
+++ b/reference/pgsql/functions/pg-last-notice.xml
@@ -76,34 +76,6 @@
    or &false; on error.
   </para>
  </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>pg_last_notice</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-  $pgsql_conn = pg_connect("dbname=mark host=localhost");
-  
-  $res = pg_query("CREATE TABLE test (id SERIAL)");
-  
-  $notice = pg_last_notice($pgsql_conn);
-  
-  echo $notice;
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CREATE TABLE will create implicit sequence "test_id_seq" for "serial" column "test.id"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
  
  <refsect1 role="changelog">
   &reftitle.changelog;
@@ -129,6 +101,34 @@ CREATE TABLE will create implicit sequence "test_id_seq" for "serial" column "te
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>pg_last_notice</function> example</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+  $pgsql_conn = pg_connect("dbname=mark host=localhost");
+  
+  $res = pg_query("CREATE TABLE test (id SERIAL)");
+  
+  $notice = pg_last_notice($pgsql_conn);
+  
+  echo $notice;
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+     <![CDATA[
+CREATE TABLE will create implicit sequence "test_id_seq" for "serial" column "test.id"
+]]>
+    </screen>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-lo-create.xml b/reference/pgsql/functions/pg-lo-create.xml
index f00d82d951..b8c17a827f 100644
--- a/reference/pgsql/functions/pg-lo-create.xml
+++ b/reference/pgsql/functions/pg-lo-create.xml
@@ -66,7 +66,7 @@
        If an <parameter>object_id</parameter> is given the function
        will try to create a large object with this id, else a free
        object id is assigned by the server. The parameter
-       was added in PHP 5.3 and relies on functionality that first
+       relies on functionality that first
        appeared in PostgreSQL 8.1.
       </para>
      </listitem>
diff --git a/reference/pgsql/functions/pg-lo-import.xml b/reference/pgsql/functions/pg-lo-import.xml
index 66f17f33d5..6d496e2a66 100644
--- a/reference/pgsql/functions/pg-lo-import.xml
+++ b/reference/pgsql/functions/pg-lo-import.xml
@@ -62,7 +62,7 @@
        If an <parameter>object_id</parameter> is given the function
        will try to create a large object with this id, else a free
        object id is assigned by the server. The parameter
-       was added in PHP 5.3 and relies on functionality that first
+       relies on functionality that first
        appeared in PostgreSQL 8.1.
       </para>
      </listitem>
diff --git a/reference/pgsql/functions/pg-lo-seek.xml b/reference/pgsql/functions/pg-lo-seek.xml
index e3a08b15d7..fcd2637ecd 100644
--- a/reference/pgsql/functions/pg-lo-seek.xml
+++ b/reference/pgsql/functions/pg-lo-seek.xml
@@ -92,31 +92,6 @@
    </example> 
   </para>
  </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Added PostgreSQL 9.3's 64bit large object support. Both client and server must
-        support PostgreSQL 9.3 and PHP must be 64bit build to use 64bit large object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/pgsql/functions/pg-lo-tell.xml b/reference/pgsql/functions/pg-lo-tell.xml
index 99100d6abd..56e09ef647 100644
--- a/reference/pgsql/functions/pg-lo-tell.xml
+++ b/reference/pgsql/functions/pg-lo-tell.xml
@@ -80,31 +80,6 @@ Seek position is: 50000
   </para>
  </refsect1>
  
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Added PostgreSQL 9.3's 64bit large object support. Both client and server must
-        support PostgreSQL 9.3 and PHP must be 64bit build to use 64bit large object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-lo-truncate.xml b/reference/pgsql/functions/pg-lo-truncate.xml
index 44daff83b7..eddf0193ed 100644
--- a/reference/pgsql/functions/pg-lo-truncate.xml
+++ b/reference/pgsql/functions/pg-lo-truncate.xml
@@ -79,31 +79,6 @@
    </example> 
   </para>
  </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Added truncate function. It supports PostgreSQL 9.3's 64bit large object. Both client and server must
-        support PostgreSQL 9.3 and PHP must be 64bit build to use 64bit large object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/pgsql/functions/pg-meta-data.xml b/reference/pgsql/functions/pg-meta-data.xml
index eff3e61921..5cf8817bff 100644
--- a/reference/pgsql/functions/pg-meta-data.xml
+++ b/reference/pgsql/functions/pg-meta-data.xml
@@ -131,31 +131,6 @@ array(5) {
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        No longer experimental. Added "is enum" as default attribute.
-        <parameter>extended</parameter> flag is added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-select.xml b/reference/pgsql/functions/pg-select.xml
index 9e59dc81ef..98de4cecc0 100644
--- a/reference/pgsql/functions/pg-select.xml
+++ b/reference/pgsql/functions/pg-select.xml
@@ -100,32 +100,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>pg_select</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php 
-  $db = pg_connect('dbname=foo');
-  // This is safe somewhat, since all values are escaped.
-  // However PostgreSQL supports JSON/Array. These are not
-  // safe by neither escape nor prepared query.
-  $rec = pg_select($db, 'post_log', $_POST, PG_DML_ESCAPE);
-  if ($rec) {
-      echo "Records selected\n";
-      var_dump($rec);
-  } else {
-      echo "User must have sent wrong inputs\n";
-  }
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -144,26 +118,38 @@
         The <parameter>result_type</parameter> parameter was added.
        </entry>
       </row>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        No longer experimental. Added <constant>PGSQL_DML_ESCAPE</constant> constant,
-        &true;/&false; and &null; data type support.
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.3/5.4.19</entry>
-       <entry>
-        Direct SQL injection to <parameter>table_name</parameter> and Indirect SQL
-        injection to identifiers are fixed.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>pg_select</function> example</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php 
+  $db = pg_connect('dbname=foo');
+  // This is safe somewhat, since all values are escaped.
+  // However PostgreSQL supports JSON/Array. These are not
+  // safe by neither escape nor prepared query.
+  $rec = pg_select($db, 'post_log', $_POST, PG_DML_ESCAPE);
+  if ($rec) {
+      echo "Records selected\n";
+      var_dump($rec);
+  } else {
+      echo "User must have sent wrong inputs\n";
+  }
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-unescape-bytea.xml b/reference/pgsql/functions/pg-unescape-bytea.xml
index c9cfdc361b..9e7ec86da2 100644
--- a/reference/pgsql/functions/pg-unescape-bytea.xml
+++ b/reference/pgsql/functions/pg-unescape-bytea.xml
@@ -86,30 +86,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.5.1</entry>
-       <entry>
-        A warning is thrown if the input string is invalid.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/functions/pg-update.xml b/reference/pgsql/functions/pg-update.xml
index a1a0bd95d4..003fc5dcab 100644
--- a/reference/pgsql/functions/pg-update.xml
+++ b/reference/pgsql/functions/pg-update.xml
@@ -140,38 +140,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        No longer experimental. Added <constant>PGSQL_DML_ESCAPE</constant> constant,
-        &true;/&false; and &null; data type support.
-       </entry>
-      </row>
-      <row>
-       <entry>5.5.3/5.4.19</entry>
-       <entry>
-        Direct SQL injection to <parameter>table_name</parameter> and Indirect 
-        SQL injection to identifiers are fixed.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pgsql/ini.xml b/reference/pgsql/ini.xml
index b974583408..2dc345d256 100644
--- a/reference/pgsql/ini.xml
+++ b/reference/pgsql/ini.xml
@@ -38,19 +38,19 @@
      <entry><link linkend="ini.pgsql.auto-reset-persistent">pgsql.auto_reset_persistent</link></entry>
      <entry>"0"</entry>
      <entry>PHP_INI_SYSTEM</entry>
-     <entry>Available since PHP 4.2.0.</entry>
+     <entry></entry>
     </row>
     <row>
      <entry><link linkend="ini.pgsql.ignore-notice">pgsql.ignore_notice</link></entry>
      <entry>"0"</entry>
      <entry>PHP_INI_ALL</entry>
-     <entry>Available since PHP 4.3.0.</entry>
+     <entry></entry>
     </row>
     <row>
      <entry><link linkend="ini.pgsql.log-notice">pgsql.log_notice</link></entry>
      <entry>"0"</entry>
      <entry>PHP_INI_ALL</entry>
-     <entry>Available since PHP 4.3.0.</entry>
+     <entry></entry>
     </row>
    </tbody>
   </tgroup>
diff --git a/reference/phar/Phar/buildFromIterator.xml b/reference/phar/Phar/buildFromIterator.xml
index 61ab754e45..a8247a3987 100644
--- a/reference/phar/Phar/buildFromIterator.xml
+++ b/reference/phar/Phar/buildFromIterator.xml
@@ -58,6 +58,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   This method returns <classname>UnexpectedValueException</classname> when the
+   iterator returns incorrect values, such as an integer key instead of a
+   string, a <classname>BadMethodCallException</classname> when an
+   SplFileInfo-based iterator is passed without a <parameter>base_directory</parameter>
+   parameter, or a <classname>PharException</classname> if there were errors
+   saving the phar archive.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
    <example>
@@ -155,20 +167,7 @@ $phar->setStub($phar->createDefaultStub('cli/index.php', 'www/index.php'));
   </para>
   </example>
  </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method returns <classname>UnexpectedValueException</classname> when the
-   iterator returns incorrect values, such as an integer key instead of a
-   string, a <classname>BadMethodCallException</classname> when an
-   SplFileInfo-based iterator is passed without a <parameter>base_directory</parameter>
-   parameter, or a <classname>PharException</classname> if there were errors
-   saving the phar archive.
-  </para>
- </refsect1>
-
-
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/phar/Phar/createDefaultStub.xml b/reference/phar/Phar/createDefaultStub.xml
index 037e0f474a..e44a2d48ed 100644
--- a/reference/phar/Phar/createDefaultStub.xml
+++ b/reference/phar/Phar/createDefaultStub.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>final</modifier> <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Phar::createDefaultStub</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>indexfile</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>webindexfile</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>index</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>webIndex</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -47,6 +47,31 @@ php myphar.phar
   </para>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>index</parameter></term>
+     <listitem>
+      <para>
+       Relative path within the phar archive to run if accessed on the command-line
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><parameter>webIndex</parameter></term>
+     <listitem>
+      <para>
+       Relative path within the phar archive to run if accessed through a web browser
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/Phar/decompressFiles.xml b/reference/phar/Phar/decompressFiles.xml
index 37ce9303a0..690201c57f 100644
--- a/reference/phar/Phar/decompressFiles.xml
+++ b/reference/phar/Phar/decompressFiles.xml
@@ -32,6 +32,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/Phar/getStub.xml b/reference/phar/Phar/getStub.xml
index 6ed34f9ed6..b9aaafcc60 100644
--- a/reference/phar/Phar/getStub.xml
+++ b/reference/phar/Phar/getStub.xml
@@ -32,6 +32,12 @@ php myphar.phar
   </para>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/Phar/isBuffering.xml b/reference/phar/Phar/isBuffering.xml
index 1b98636895..5b4a996e8a 100644
--- a/reference/phar/Phar/isBuffering.xml
+++ b/reference/phar/Phar/isBuffering.xml
@@ -25,6 +25,11 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/Phar/startBuffering.xml b/reference/phar/Phar/startBuffering.xml
index c1f8661572..ceede7ec51 100644
--- a/reference/phar/Phar/startBuffering.xml
+++ b/reference/phar/Phar/startBuffering.xml
@@ -36,6 +36,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/Phar/stopBuffering.xml b/reference/phar/Phar/stopBuffering.xml
index cbb7ea1fab..e347174657 100644
--- a/reference/phar/Phar/stopBuffering.xml
+++ b/reference/phar/Phar/stopBuffering.xml
@@ -38,6 +38,11 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/Phar/webPhar.xml b/reference/phar/Phar/webPhar.xml
index 9209b3ee3b..87016e8198 100644
--- a/reference/phar/Phar/webPhar.xml
+++ b/reference/phar/Phar/webPhar.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="phar.webphar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Phar::webPhar</refname>
-  <refpurpose>mapPhar for web-based phars. front controller for web applications</refpurpose>
+  <refpurpose>Routes a request from a web browser to an internal file within the phar archive</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -17,14 +17,13 @@
    <methodparam choice="opt"><type>callable</type><parameter>rewrites</parameter></methodparam>
   </methodsynopsis>
   <para>
-   <function>Phar::mapPhar</function> for web-based phars.  This method parses
-   <varname>$_SERVER['REQUEST_URI']</varname> and routes a request from a web
-   browser to an internal file within the phar archive.  In essence, it simulates
-   a web server, routing requests to the correct file, echoing the correct headers
-   and parsing PHP files as needed.  This powerful method is part of what makes it easy
-   to convert an existing PHP application into a phar archive.  Combined with
-   <function>Phar::mungServer</function> and <function>Phar::interceptFileFuncs</function>,
-   any web application can be used unmodified from a phar archive.
+   <function>Phar::webPhar</function> serves as <function>Phar::mapPhar</function> for 
+   web-based phars.  This method parses <varname>$_SERVER['REQUEST_URI']</varname> and 
+   routes a request from a web browser to an internal file within the phar archive.  
+   It simulates a web server, routing requests to the correct file, echoing the correct 
+   headers and parsing PHP files as needed.  Combined with <function>Phar::mungServer</function> 
+   and <function>Phar::interceptFileFuncs</function>, any web application can be used 
+   unmodified from a phar archive.
   </para>
   <para>
    <function>Phar::webPhar</function> should only be
diff --git a/reference/phar/PharData/buildFromIterator.xml b/reference/phar/PharData/buildFromIterator.xml
index 3369faa2b8..c338a9340e 100644
--- a/reference/phar/PharData/buildFromIterator.xml
+++ b/reference/phar/PharData/buildFromIterator.xml
@@ -21,98 +21,6 @@
    parameter is required.
   </para>
  </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-   <example>
-    <title>A <function>PharData::buildFromIterator</function> with SplFileInfo</title>
-  <para>
-   For most tar/zip archives, the archive will reflect an actual directory layout, and
-   the second style is the most useful.  For instance, to create a tar/zip archive
-   containing the files in this sample directory layout:
-  </para>
-  <para>
-   <screen>
-    <![CDATA[
-/path/to/project/
-                 config/
-                        dist.xml
-                        debug.xml
-                 lib/
-                     file1.php
-                     file2.php
-                 src/
-                     processthing.php
-                 www/
-                     index.php
-                 cli/
-                     index.php
-    ]]>
-   </screen>
-  </para>
-  <para>
-   This code could be used to add these files to the &quot;project.tar&quot; tar archive:
-  </para>
-  <para>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-$phar = new PharData('project.tar');
-$phar->buildFromIterator(
-    new RecursiveIteratorIterator(
-     new RecursiveDirectoryIterator('/path/to/project')),
-    '/path/to/project');
-?>
-    ]]>
-   </programlisting>
-  </para>
-  <para>
-   The file <literal>project.tar</literal> can then be used immediately.  <function>PharData::buildFromIterator</function> does not
-   set values such as compression, metadata, and this can be done after creating the
-   tar/zip archive.
-  </para>
-  <para>
-   As an interesting note, <function>PharData::buildFromIterator</function> can also be used to
-   copy the contents of an existing phar, tar or zip archive, as the PharData object descends
-   from <classname>DirectoryIterator</classname>:
-  </para>
-  <para>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-$phar = new PharData('project.tar');
-$phar->buildFromIterator(
-    new RecursiveIteratorIterator(
-     new Phar('/path/to/anotherphar.phar')),
-    'phar:///path/to/anotherphar.phar/path/to/project');
-$phar->setStub($phar->createDefaultStub('cli/index.php', 'www/index.php'));
-?>
-    ]]>
-   </programlisting>
-  </para>
-  </example>
-  <example>
-    <title>A <function>PharData::buildFromIterator</function> with other iterators</title>
-  <para>
-   The second form of the iterator can be used with any iterator that returns
-   a key => value mapping, such as an <classname>ArrayIterator</classname>:
-  </para>
-  <para>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-$phar = new PharData('project.tar');
-$phar->buildFromIterator(
-    new ArrayIterator(
-     array(
-        'internal/file.php' => dirname(__FILE__) . '/somefile.php',
-        'another/file.jpg' => fopen('/path/to/bigfile.jpg', 'rb'),
-     )));
-?>
-    ]]>
-   </programlisting>
-  </para>
-  </example>
- </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
@@ -161,6 +69,99 @@ $phar->buildFromIterator(
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <example>
+   <title>A <function>PharData::buildFromIterator</function> with SplFileInfo</title>
+   <para>
+    For most tar/zip archives, the archive will reflect an actual directory layout, and
+    the second style is the most useful.  For instance, to create a tar/zip archive
+    containing the files in this sample directory layout:
+   </para>
+   <para>
+    <screen>
+     <![CDATA[
+/path/to/project/
+                 config/
+                        dist.xml
+                        debug.xml
+                 lib/
+                     file1.php
+                     file2.php
+                 src/
+                     processthing.php
+                 www/
+                     index.php
+                 cli/
+                     index.php
+    ]]>
+    </screen>
+   </para>
+   <para>
+    This code could be used to add these files to the &quot;project.tar&quot; tar archive:
+   </para>
+   <para>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+$phar = new PharData('project.tar');
+$phar->buildFromIterator(
+    new RecursiveIteratorIterator(
+     new RecursiveDirectoryIterator('/path/to/project')),
+    '/path/to/project');
+?>
+    ]]>
+    </programlisting>
+   </para>
+   <para>
+    The file <literal>project.tar</literal> can then be used immediately.  <function>PharData::buildFromIterator</function> does not
+    set values such as compression, metadata, and this can be done after creating the
+    tar/zip archive.
+   </para>
+   <para>
+    As an interesting note, <function>PharData::buildFromIterator</function> can also be used to
+    copy the contents of an existing phar, tar or zip archive, as the PharData object descends
+    from <classname>DirectoryIterator</classname>:
+   </para>
+   <para>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+$phar = new PharData('project.tar');
+$phar->buildFromIterator(
+    new RecursiveIteratorIterator(
+     new Phar('/path/to/anotherphar.phar')),
+    'phar:///path/to/anotherphar.phar/path/to/project');
+$phar->setStub($phar->createDefaultStub('cli/index.php', 'www/index.php'));
+?>
+    ]]>
+    </programlisting>
+   </para>
+  </example>
+  <example>
+   <title>A <function>PharData::buildFromIterator</function> with other iterators</title>
+   <para>
+    The second form of the iterator can be used with any iterator that returns
+    a key => value mapping, such as an <classname>ArrayIterator</classname>:
+   </para>
+   <para>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+$phar = new PharData('project.tar');
+$phar->buildFromIterator(
+    new ArrayIterator(
+     array(
+        'internal/file.php' => dirname(__FILE__) . '/somefile.php',
+        'another/file.jpg' => fopen('/path/to/bigfile.jpg', 'rb'),
+     )));
+?>
+    ]]>
+    </programlisting>
+   </para>
+  </example>
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/phar/PharData/decompressFiles.xml b/reference/phar/PharData/decompressFiles.xml
index f84c15a2c1..0b57e72925 100644
--- a/reference/phar/PharData/decompressFiles.xml
+++ b/reference/phar/PharData/decompressFiles.xml
@@ -29,6 +29,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/PharFileInfo/compress.xml b/reference/phar/PharFileInfo/compress.xml
index 328a1ccfc9..741b5e2b26 100644
--- a/reference/phar/PharFileInfo/compress.xml
+++ b/reference/phar/PharFileInfo/compress.xml
@@ -27,6 +27,22 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>compression</parameter></term>
+     <listitem>
+      <para>
+       Compression must be <constant>Phar::GZ</constant> or <constant>Phar::BZ2</constant>.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/PharFileInfo/decompress.xml b/reference/phar/PharFileInfo/decompress.xml
index 7e74f0ddf1..aa17d2200b 100644
--- a/reference/phar/PharFileInfo/decompress.xml
+++ b/reference/phar/PharFileInfo/decompress.xml
@@ -24,6 +24,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/PharFileInfo/getCRC32.xml b/reference/phar/PharFileInfo/getCRC32.xml
index adf5cbd7ec..fa3ea2a591 100644
--- a/reference/phar/PharFileInfo/getCRC32.xml
+++ b/reference/phar/PharFileInfo/getCRC32.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/PharFileInfo/getCompressedSize.xml b/reference/phar/PharFileInfo/getCompressedSize.xml
index 04437259fa..1622dd803a 100644
--- a/reference/phar/PharFileInfo/getCompressedSize.xml
+++ b/reference/phar/PharFileInfo/getCompressedSize.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/PharFileInfo/getPharFlags.xml b/reference/phar/PharFileInfo/getPharFlags.xml
index f9aacaa6a0..188055139a 100644
--- a/reference/phar/PharFileInfo/getPharFlags.xml
+++ b/reference/phar/PharFileInfo/getPharFlags.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/PharFileInfo/isCRCChecked.xml b/reference/phar/PharFileInfo/isCRCChecked.xml
index 6471c0bcb5..f1fb3fac45 100644
--- a/reference/phar/PharFileInfo/isCRCChecked.xml
+++ b/reference/phar/PharFileInfo/isCRCChecked.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/phar/book.xml b/reference/phar/book.xml
index da1c8b3aca..46457ba882 100644
--- a/reference/phar/book.xml
+++ b/reference/phar/book.xml
@@ -30,7 +30,7 @@
   <para>
    Phar implements this functionality through a <link linkend="book.stream">Stream
    Wrapper</link>.  Normally, to use an external file within a PHP script, you
-   would use <function>include</function>
+   would use <function>include</function>:
   </para>
   <para>
    <example>
@@ -137,7 +137,7 @@
   </para>
   <para>
    If you are using phar applications, there are helpful tips in
-   <link linkend="phar.using">How to use Phar Archives</link>
+   <link linkend="phar.using">How to use Phar Archives</link>.
   </para>
   <para>
    The word <literal>phar</literal> is a portmanteau of <literal>PHP</literal> and
diff --git a/reference/phar/fileformat.xml b/reference/phar/fileformat.xml
index 310b2a6eca..a855595597 100644
--- a/reference/phar/fileformat.xml
+++ b/reference/phar/fileformat.xml
@@ -114,7 +114,7 @@ __HALT_COMPILER();
       <entry>Whole-archive signature validation</entry>
       <entry>Yes</entry>
       <entry>Yes</entry>
-      <entry>Yes (PHP 5.3.1+)</entry>
+      <entry>Yes</entry>
      </row>
      <row>
       <entry>Web-specific application support</entry>
diff --git a/reference/phar/installation.xml b/reference/phar/installation.xml
index 9186e54ccc..7ca6f0e34d 100644
--- a/reference/phar/installation.xml
+++ b/reference/phar/installation.xml
@@ -3,7 +3,7 @@
 <section xml:id="phar.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  The Phar extension is bundled with PHP as of PHP version 5.3.0, and enabled by default.
+  The Phar extension is bundled with PHP, and enabled by default.
   To disable Phar support, use <option role="configure">--disable-phar</option>.
  </para>
  <para>  
diff --git a/reference/phar/setup.xml b/reference/phar/setup.xml
index c9627f6c79..028057a134 100644
--- a/reference/phar/setup.xml
+++ b/reference/phar/setup.xml
@@ -7,12 +7,6 @@
  <!-- {{{ Requirements -->
  <section xml:id="phar.requirements">
   &reftitle.required;
-  <para>
-   Phar requires PHP 5.2.0 or newer.  Additional features require the
-   <link linkend="book.spl">SPL</link> extension in order to take advantage
-   of iteration and array access to a Phar's file contents.  The <literal>phar</literal>
-   stream does not require any additional extensions to function.
-  </para>
   <para>
    You may optionally wish to enable the <link linkend="book.zlib" >zlib</link>
    and <link linkend="book.bzip2" >bzip2</link> extensions to take
@@ -21,12 +15,7 @@
    enabled.
   </para>
   <para>
-   Note that a bug in the <link linkend="filters.compression">zlib.deflate</link> stream filter
-   fixed in PHP version 5.2.6 and newer may cause truncation of gzip and bzip2-compressed
-   phar archives.
-  </para>
-  <para>
-   PHP 5.3 configured with <literal>--enable-zend-multibyte</literal> makes <link linkend="book.phar">phar</link> dependant on the ini option <literal>detect_unicode</literal>. 
+   If <link linkend="ini.zend.multibyte">zend.multibyte</link> is enabled, <link linkend="ini.zend.detect-unicode">zend.detect_unicode</link> must be enabled as well.
   </para>
  </section>
  <!-- }}} -->
diff --git a/reference/phar/versions.xml b/reference/phar/versions.xml
index cf2fd32e1a..36ef460907 100644
--- a/reference/phar/versions.xml
+++ b/reference/phar/versions.xml
@@ -5,110 +5,110 @@
 -->
 <versions>
 
- <function name='phar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::__construct' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::addemptydir' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::addfile' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::addfromstring' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::apiversion' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::buildfromdirectory' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::buildfromiterator' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::cancompress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::canwrite' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::compress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::compressfiles' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::converttodata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::converttotar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::converttozip' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::converttophar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::converttoexecutable' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::copy' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::count' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::createdefaultstub' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::decompress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::decompressfiles' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::delete' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::delmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.0'/>
- <function name='phar::extractto' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::getalias' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.1'/>
- <function name='phar::getmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::getmodified' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::getpath' from='PHP 5 &gt;= 5.3.0, PHP 7'/>
- <function name='phar::getsignature' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::getstub' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::getsupportedcompression' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.0'/>
- <function name='phar::getsupportedsignatures' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.1.0'/>
- <function name='phar::getversion' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::hasmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.0'/>
- <function name='phar::interceptfilefuncs' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::iscompressed' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::isphar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::istar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::iszip' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::isfileformat' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::iswritable' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::isbuffering' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::isvalidpharfilename' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.0'/>
- <function name='phar::loadphar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::mapphar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::mount' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::mungserver' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::offsetexists' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::offsetget' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::offsetset' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::offsetunset' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::running' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::setalias' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.1'/>
- <function name='phar::setdefaultstub' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::setmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::setsignaturealgorithm' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.1.0'/>
- <function name='phar::setstub' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::startbuffering' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::stopbuffering' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='phar::unlinkarchive' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phar::webphar' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
+ <function name="phar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::addemptydir" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::addfile" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::addfromstring" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::apiversion" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::buildfromdirectory" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::buildfromiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::cancompress" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::canwrite" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::compress" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::compressfiles" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::converttodata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::converttotar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::converttozip" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::converttophar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::converttoexecutable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::copy" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::createdefaultstub" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::decompress" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::decompressfiles" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::delete" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::delmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.0"/>
+ <function name="phar::extractto" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::getalias" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.1"/>
+ <function name="phar::getmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::getmodified" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::getpath" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="phar::getsignature" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::getstub" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::getsupportedcompression" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.0"/>
+ <function name="phar::getsupportedsignatures" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.1.0"/>
+ <function name="phar::getversion" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::hasmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.0"/>
+ <function name="phar::interceptfilefuncs" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::iscompressed" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::isphar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::istar" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::iszip" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::isfileformat" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::iswritable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::isbuffering" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::isvalidpharfilename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.0"/>
+ <function name="phar::loadphar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::mapphar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::mount" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::mungserver" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::running" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::setalias" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.1"/>
+ <function name="phar::setdefaultstub" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::setmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::setsignaturealgorithm" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.1.0"/>
+ <function name="phar::setstub" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::startbuffering" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::stopbuffering" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="phar::unlinkarchive" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phar::webphar" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
 
- <function name='phardata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::addemptydir' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::addfile' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::addfromstring' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::buildfromdirectory' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::buildfromiterator' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::compress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::compressfiles' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::_construct' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::converttodata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::converttoexecutable' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::copy' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::decompress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::decompressfiles' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::delmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::delete' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::extractto' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::iswritable' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::offsetset' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::offsetunset' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::setalias' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::setdefaultstub' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='phardata::setstub' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
+ <function name="phardata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::addemptydir" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::addfile" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::addfromstring" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::buildfromdirectory" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::buildfromiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::compress" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::compressfiles" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::_construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::converttodata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::converttoexecutable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::copy" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::decompress" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::decompressfiles" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::delmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::delete" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::extractto" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::iswritable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::setalias" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::setdefaultstub" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
+ <function name="phardata::setstub" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 2.0.0"/>
 
- <function name='pharexception' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
+ <function name="pharexception" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
 
- <function name='pharfileinfo' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::__construct' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::chmod' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo_compress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='pharfileinfo_decompress' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0'/>
- <function name='pharfileinfo::delmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.0'/>
- <function name='pharfileinfo::getcompressedsize' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::getcontent' from='PHP 5 &gt;= 5.3.0, PHP 7'/>
- <function name='pharfileinfo::getcrc32' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::getmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::getpharflags' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::hasmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.2.0'/>
- <function name='pharfileinfo::iscompressed' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::iscrcchecked' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
- <function name='pharfileinfo::setmetadata' from='PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 1.0.0'/>
+ <function name="pharfileinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::chmod" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo_compress" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="pharfileinfo_decompress" from="PHP 5 &gt;= 5.3.0, PHP 7, PECL phar &gt;= 2.0.0"/>
+ <function name="pharfileinfo::delmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.0"/>
+ <function name="pharfileinfo::getcompressedsize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::getcontent" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="pharfileinfo::getcrc32" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::getmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::getpharflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::hasmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.2.0"/>
+ <function name="pharfileinfo::iscompressed" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::iscrcchecked" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
+ <function name="pharfileinfo::setmetadata" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8, PECL phar &gt;= 1.0.0"/>
 </versions>
 
 <!-- Keep this comment at the end of the file
@@ -130,4 +130,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/phpdbg/book.xml b/reference/phpdbg/book.xml
index 9f3cdbe3a9..f0e16d465d 100644
--- a/reference/phpdbg/book.xml
+++ b/reference/phpdbg/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.phpdbg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="bundled" ?>
  <title>Interactive PHP Debugger</title>
  <titleabbrev>phpdbg</titleabbrev>
 
diff --git a/reference/phpdbg/ini.xml b/reference/phpdbg/ini.xml
index c12b18bfbd..0b4933a7ad 100644
--- a/reference/phpdbg/ini.xml
+++ b/reference/phpdbg/ini.xml
@@ -21,13 +21,13 @@
       <entry><link linkend="ini.phpdbg.eol">phpdbg.eol</link></entry>
       <entry>2</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available as of PHP 7.0.0</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.phpdbg.path">phpdbg.path</link></entry>
       <entry></entry>
       <entry>6</entry>
-      <entry>Available as of PHP 5.6.3</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/posix/constants.xml b/reference/posix/constants.xml
index 62d227f159..6b3a9e72ce 100644
--- a/reference/posix/constants.xml
+++ b/reference/posix/constants.xml
@@ -7,8 +7,7 @@
   <title><function>posix_access</function> constants</title>
   <note>
    <para>
-    These constants are available starting with PHP 5.1.0. Please note that
-    some of them may not be available on your system.
+    Please note that some of these constants may not be available on every system.
    </para>
   </note>
   <variablelist>
@@ -63,8 +62,7 @@
   <title><function>posix_mknod</function> constants</title>
   <note>
    <para>
-    These constants are available starting with PHP 5.1.0. Please note that
-    some of them may not be available on your system.
+    Please note that some of them may not be available on your system.
    </para>
   </note>
   <variablelist>
@@ -130,8 +128,7 @@
   <title><function>posix_setrlimit</function> constants</title>
   <note>
    <para>
-    These constants are available starting with PHP 7.0.0. Please note that
-    some of them may not be available on your system.
+    Please note that some of them may not be available on your system.
    </para>
   </note>
   <note>
diff --git a/reference/posix/functions/posix-ctermid.xml b/reference/posix/functions/posix-ctermid.xml
index b6ac810d91..366a4c24c6 100644
--- a/reference/posix/functions/posix-ctermid.xml
+++ b/reference/posix/functions/posix-ctermid.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-get-last-error.xml b/reference/posix/functions/posix-get-last-error.xml
index 3a69abda88..fdeedf495e 100644
--- a/reference/posix/functions/posix-get-last-error.xml
+++ b/reference/posix/functions/posix-get-last-error.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getcwd.xml b/reference/posix/functions/posix-getcwd.xml
index 0821c374ec..a8075d19fc 100644
--- a/reference/posix/functions/posix-getcwd.xml
+++ b/reference/posix/functions/posix-getcwd.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getegid.xml b/reference/posix/functions/posix-getegid.xml
index 8ca23386d5..ceccdd2ef9 100644
--- a/reference/posix/functions/posix-getegid.xml
+++ b/reference/posix/functions/posix-getegid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-geteuid.xml b/reference/posix/functions/posix-geteuid.xml
index e906749bd1..e18c7e0426 100644
--- a/reference/posix/functions/posix-geteuid.xml
+++ b/reference/posix/functions/posix-geteuid.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getgid.xml b/reference/posix/functions/posix-getgid.xml
index c3723bb28b..ad1470bc56 100644
--- a/reference/posix/functions/posix-getgid.xml
+++ b/reference/posix/functions/posix-getgid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getgroups.xml b/reference/posix/functions/posix-getgroups.xml
index 22bae36cb0..c77e249b6a 100644
--- a/reference/posix/functions/posix-getgroups.xml
+++ b/reference/posix/functions/posix-getgroups.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getlogin.xml b/reference/posix/functions/posix-getlogin.xml
index e502ebd6c7..e5739453fc 100644
--- a/reference/posix/functions/posix-getlogin.xml
+++ b/reference/posix/functions/posix-getlogin.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getpgrp.xml b/reference/posix/functions/posix-getpgrp.xml
index fd71ba377a..e5e8762e9d 100644
--- a/reference/posix/functions/posix-getpgrp.xml
+++ b/reference/posix/functions/posix-getpgrp.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getpid.xml b/reference/posix/functions/posix-getpid.xml
index 9e04e0526a..1fc430b202 100644
--- a/reference/posix/functions/posix-getpid.xml
+++ b/reference/posix/functions/posix-getpid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getppid.xml b/reference/posix/functions/posix-getppid.xml
index 440a3c4c83..d28ff0764d 100644
--- a/reference/posix/functions/posix-getppid.xml
+++ b/reference/posix/functions/posix-getppid.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getrlimit.xml b/reference/posix/functions/posix-getrlimit.xml
index 46c28da64d..961a7d9623 100644
--- a/reference/posix/functions/posix-getrlimit.xml
+++ b/reference/posix/functions/posix-getrlimit.xml
@@ -19,6 +19,11 @@
   &posix.rlimits;
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-getuid.xml b/reference/posix/functions/posix-getuid.xml
index 3afe886123..70dc00270a 100644
--- a/reference/posix/functions/posix-getuid.xml
+++ b/reference/posix/functions/posix-getuid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-setsid.xml b/reference/posix/functions/posix-setsid.xml
index 334d33bc4d..bf54d2eafb 100644
--- a/reference/posix/functions/posix-setsid.xml
+++ b/reference/posix/functions/posix-setsid.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/posix/functions/posix-times.xml b/reference/posix/functions/posix-times.xml
index d87c8bf408..917bf0ba25 100644
--- a/reference/posix/functions/posix-times.xml
+++ b/reference/posix/functions/posix-times.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -54,16 +59,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    This function isn't reliable to use, it may return negative values for
-    high times.
-   </para>
-  </warning>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -96,6 +91,16 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <warning>
+   <para>
+    This function isn't reliable to use, it may return negative values for
+    high times.
+   </para>
+  </warning>
+ </refsect1>
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/posix/functions/posix-uname.xml b/reference/posix/functions/posix-uname.xml
index 1fac9ac2b4..de58852963 100644
--- a/reference/posix/functions/posix-uname.xml
+++ b/reference/posix/functions/posix-uname.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/proctitle/book.xml b/reference/proctitle/book.xml
deleted file mode 100644
index 95e06b7d3d..0000000000
--- a/reference/proctitle/book.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<book xml:id="book.proctitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Proctitle</title>
- <titleabbrev>Proctitle</titleabbrev>
-
- <preface xml:id="intro.proctitle">
-  &reftitle.intro;
-  <para>
-   This extension allows changing the current process', and thread, name on Linux and *BSD
-   systems. This is useful when using <function>pcntl_fork</function> to identify running
-   processes in process list
-  </para>
- </preface>
-
- &reference.proctitle.setup;
- &reference.proctitle.constants;
- &reference.proctitle.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/configure.xml b/reference/proctitle/configure.xml
deleted file mode 100644
index 0cb4bc410b..0000000000
--- a/reference/proctitle/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<section xml:id="proctitle.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;proctitle">&url.pecl.package;proctitle</link>.
- </para>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/constants.xml b/reference/proctitle/constants.xml
deleted file mode 100644
index 7ab37de5c2..0000000000
--- a/reference/proctitle/constants.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<appendix xml:id="proctitle.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &no.constants;
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/functions/setproctitle.xml b/reference/proctitle/functions/setproctitle.xml
deleted file mode 100644
index bf0147391a..0000000000
--- a/reference/proctitle/functions/setproctitle.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.setproctitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>setproctitle</refname>
-  <refpurpose>Set the process title</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>setproctitle</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the process title of the current process.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>title</parameter></term>
-     <listitem>
-      <para>
-       The title to use as the process title.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <example xml:id="setproctitle.example.basic"><!-- {{{ -->
-   <title><function>setproctitle</function> example</title>
-   <para>
-    Running the example below will change the process title (visible with
-    <literal>ps a</literal> for example).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-setproctitle("myscript");
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-$ ps a
-  PID TTY      STAT   TIME COMMAND
- 1168 pts/3    S      0:00 myscript                                                                                                                         
-]]>
-   </screen>
-  </example><!-- }}} -->
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cli_set_process_title</function></member>
-   <member><function>pcntl_fork</function></member>
-   <member><function>setthreadtitle</function></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/functions/setthreadtitle.xml b/reference/proctitle/functions/setthreadtitle.xml
deleted file mode 100644
index c123be24fa..0000000000
--- a/reference/proctitle/functions/setthreadtitle.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="function.setthreadtitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>setthreadtitle</refname>
-  <refpurpose>Set the thread title</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>setthreadtitle</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the thread title.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>title</parameter></term>
-     <listitem>
-      <para>
-       The title to use as the thread title.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <example xml:id="setthreadtitle.example.basic"><!-- {{{ -->
-   <title><function>setthreadtitle</function> example</title>
-   <para>
-    Running the example below will change the thread title (visible with
-    <literal>ps c</literal> for example).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-setthreadtitle("myscript");
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-$ ps c
-  PID TTY      STAT   TIME COMMAND
- 1178 pts/3    S      0:00 myscript
-]]>
-   </screen>
-  </example><!-- }}} -->
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>pcntl_fork</function></member>
-   <member><function>setproctitle</function></member>
-  </simplelist>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/reference.xml b/reference/proctitle/reference.xml
deleted file mode 100644
index 3cd3662dc5..0000000000
--- a/reference/proctitle/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<reference xml:id="ref.proctitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Proctitle &Functions;</title>
-
- &reference.proctitle.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/setup.xml b/reference/proctitle/setup.xml
deleted file mode 100644
index 3a12a7da2a..0000000000
--- a/reference/proctitle/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<chapter xml:id="proctitle.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="proctitle.requirements">
-  &reftitle.required;
-  <para>
-   Nothing special.
-  </para>
- </section>
-
- <section xml:id="proctitle.installation">
-  &reftitle.install;
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;proctitle">&url.pecl.package;proctitle</link>.
- </para>
- </section>
-
- <section xml:id="proctitle.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
-
- <section xml:id="proctitle.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/proctitle/versions.xml b/reference/proctitle/versions.xml
deleted file mode 100644
index e54b5efd7c..0000000000
--- a/reference/proctitle/versions.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-<!--
-  Do NOT translate this file
--->
-
-<versions>
- <!-- Functions -->
- <function name='setproctitle' from='PECL proctitle &gt;= 0.1.0'/>
- <function name='setthreadtitle' from='PECL proctitle &gt;= 0.1.2'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ps/book.xml b/reference/ps/book.xml
index b76c6a8d71..ae6d2cba94 100644
--- a/reference/ps/book.xml
+++ b/reference/ps/book.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Author: Uwe Steinmann <steinm@php.net> -->
-<!-- State: experimental -->
  
 <book xml:id="book.ps" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>PostScript document creation</title>
  <titleabbrev>PS</titleabbrev>
  
diff --git a/reference/pthreads/book.xml b/reference/pthreads/book.xml
index 44e6283288..56369e29fb 100644
--- a/reference/pthreads/book.xml
+++ b/reference/pthreads/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.pthreads" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>pthreads</title>
  <titleabbrev>pthreads</titleabbrev>
 
diff --git a/reference/pthreads/collectable/isgarbage.xml b/reference/pthreads/collectable/isgarbage.xml
index 62f6166089..b5b3c1759c 100644
--- a/reference/pthreads/collectable/isgarbage.xml
+++ b/reference/pthreads/collectable/isgarbage.xml
@@ -18,6 +18,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Always returns &true;
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pthreads/collectable/setgarbage.xml b/reference/pthreads/collectable/setgarbage.xml
index f321ca96c0..ef2c92e56a 100644
--- a/reference/pthreads/collectable/setgarbage.xml
+++ b/reference/pthreads/collectable/setgarbage.xml
@@ -26,6 +26,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/pthreads/cond/broadcast.xml b/reference/pthreads/cond/broadcast.xml
index 22bbbe1fb9..0fdc6c523f 100644
--- a/reference/pthreads/cond/broadcast.xml
+++ b/reference/pthreads/cond/broadcast.xml
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean indication of success.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/cond/destroy.xml b/reference/pthreads/cond/destroy.xml
index e02183f7cc..848a132cde 100644
--- a/reference/pthreads/cond/destroy.xml
+++ b/reference/pthreads/cond/destroy.xml
@@ -51,7 +51,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean indication of success.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/cond/signal.xml b/reference/pthreads/cond/signal.xml
index e26dd87bac..92739ce854 100644
--- a/reference/pthreads/cond/signal.xml
+++ b/reference/pthreads/cond/signal.xml
@@ -47,7 +47,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>A boolean indication of success.</para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/pthreads/cond/wait.xml b/reference/pthreads/cond/wait.xml
index 9b9209fa5a..3a4dfad542 100644
--- a/reference/pthreads/cond/wait.xml
+++ b/reference/pthreads/cond/wait.xml
@@ -65,7 +65,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>A boolean indication of success.</para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/pthreads/mutex/destroy.xml b/reference/pthreads/mutex/destroy.xml
index e521641320..03d7b52634 100644
--- a/reference/pthreads/mutex/destroy.xml
+++ b/reference/pthreads/mutex/destroy.xml
@@ -48,7 +48,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>A boolean indication of success</para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/pthreads/mutex/lock.xml b/reference/pthreads/mutex/lock.xml
index ec59f58c92..5af9b56db3 100644
--- a/reference/pthreads/mutex/lock.xml
+++ b/reference/pthreads/mutex/lock.xml
@@ -46,7 +46,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>A boolean indication of success.</para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/pthreads/mutex/trylock.xml b/reference/pthreads/mutex/trylock.xml
index 89b1f82584..477954016f 100644
--- a/reference/pthreads/mutex/trylock.xml
+++ b/reference/pthreads/mutex/trylock.xml
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean indication of success.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/mutex/unlock.xml b/reference/pthreads/mutex/unlock.xml
index 8fddbfdab0..63bde681f9 100644
--- a/reference/pthreads/mutex/unlock.xml
+++ b/reference/pthreads/mutex/unlock.xml
@@ -58,7 +58,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>A boolean indication of success.</para>
+  <para>
+   &return.success;
+  </para>
  </refsect1>
 
 
diff --git a/reference/pthreads/pool/resize.xml b/reference/pthreads/pool/resize.xml
index 4faa6d3b01..5f99d2d8b9 100644
--- a/reference/pthreads/pool/resize.xml
+++ b/reference/pthreads/pool/resize.xml
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  void
+   &return.void;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/pthreads/pool/shutdown.xml b/reference/pthreads/pool/shutdown.xml
index 87028fa947..98067af51b 100644
--- a/reference/pthreads/pool/shutdown.xml
+++ b/reference/pthreads/pool/shutdown.xml
@@ -27,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   No value is returned.
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/thread/isjoined.xml b/reference/pthreads/thread/isjoined.xml
index 951de2225d..e97d1d3259 100644
--- a/reference/pthreads/thread/isjoined.xml
+++ b/reference/pthreads/thread/isjoined.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of state
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/thread/isstarted.xml b/reference/pthreads/thread/isstarted.xml
index 5968654b5b..554822d582 100644
--- a/reference/pthreads/thread/isstarted.xml
+++ b/reference/pthreads/thread/isstarted.xml
@@ -27,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   boolean indication of state
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/pthreads/thread/join.xml b/reference/pthreads/thread/join.xml
index 90ec59a8fb..036c80fe2f 100644
--- a/reference/pthreads/thread/join.xml
+++ b/reference/pthreads/thread/join.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/thread/kill.xml b/reference/pthreads/thread/kill.xml
index a75bd02ee1..2d0329e494 100644
--- a/reference/pthreads/thread/kill.xml
+++ b/reference/pthreads/thread/kill.xml
@@ -39,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/pthreads/thread/start.xml b/reference/pthreads/thread/start.xml
index e19e4b5e2b..08b38cb0e3 100644
--- a/reference/pthreads/thread/start.xml
+++ b/reference/pthreads/thread/start.xml
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/threaded/extend.xml b/reference/pthreads/threaded/extend.xml
index 3d2d986a39..4397e684a7 100644
--- a/reference/pthreads/threaded/extend.xml
+++ b/reference/pthreads/threaded/extend.xml
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/threaded/merge.xml b/reference/pthreads/threaded/merge.xml
index b6bc630b8c..4438ca86cf 100644
--- a/reference/pthreads/threaded/merge.xml
+++ b/reference/pthreads/threaded/merge.xml
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
  
diff --git a/reference/pthreads/threaded/notify.xml b/reference/pthreads/threaded/notify.xml
index 7d2ff465e4..80a2059529 100644
--- a/reference/pthreads/threaded/notify.xml
+++ b/reference/pthreads/threaded/notify.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/threaded/notifyone.xml b/reference/pthreads/threaded/notifyone.xml
index 7ece3de824..7901930f03 100644
--- a/reference/pthreads/threaded/notifyone.xml
+++ b/reference/pthreads/threaded/notifyone.xml
@@ -28,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/threaded/pop.xml b/reference/pthreads/threaded/pop.xml
index cff8d541f5..5b9312dd55 100644
--- a/reference/pthreads/threaded/pop.xml
+++ b/reference/pthreads/threaded/pop.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pthreads/threaded/shift.xml b/reference/pthreads/threaded/shift.xml
index 166ad8d841..56193936c0 100644
--- a/reference/pthreads/threaded/shift.xml
+++ b/reference/pthreads/threaded/shift.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pthreads/threaded/unlock.xml b/reference/pthreads/threaded/unlock.xml
index e031d163df..7ebea264e3 100644
--- a/reference/pthreads/threaded/unlock.xml
+++ b/reference/pthreads/threaded/unlock.xml
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/threaded/wait.xml b/reference/pthreads/threaded/wait.xml
index 17ed6d4b17..a604a01dbd 100644
--- a/reference/pthreads/threaded/wait.xml
+++ b/reference/pthreads/threaded/wait.xml
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of success
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/worker/isworking.xml b/reference/pthreads/worker/isworking.xml
index 2f44976a3f..7a6f329ce8 100644
--- a/reference/pthreads/worker/isworking.xml
+++ b/reference/pthreads/worker/isworking.xml
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  A boolean indication of state
+   Returns whether the worker is still working or not.
   </para>
  </refsect1>
 
diff --git a/reference/pthreads/worker/shutdown.xml b/reference/pthreads/worker/shutdown.xml
index 8fe68db80d..0990041f67 100644
--- a/reference/pthreads/worker/shutdown.xml
+++ b/reference/pthreads/worker/shutdown.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Whether the worker was successfully shutdown or not.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/quickhash/book.xml b/reference/quickhash/book.xml
deleted file mode 100644
index 3b96e09076..0000000000
--- a/reference/quickhash/book.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.quickhash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Quickhash</title>
- <titleabbrev>Quickhash</titleabbrev>
-
- <preface xml:id="intro.quickhash">
-  &reftitle.intro;
-  <para>
-   The quickhash extension contains a set of specific strongly-typed classes
-   to deal with specific set and hash implementations.
-  </para>
- </preface>
-
- &reference.quickhash.setup;
- &reference.quickhash.constants;
- &reference.quickhash.examples;
-
- &reference.quickhash.quickhashintset;
- &reference.quickhash.quickhashinthash;
- &reference.quickhash.quickhashstringinthash;
- &reference.quickhash.quickhashintstringhash;
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/quickhash/constants.xml b/reference/quickhash/constants.xml
deleted file mode 100644
index 4407f951b7..0000000000
--- a/reference/quickhash/constants.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="quickhash.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &no.constants;
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/quickhash/examples.xml b/reference/quickhash/examples.xml
deleted file mode 100644
index e21c1e6330..0000000000
--- a/reference/quickhash/examples.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="quickhash.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Quickhash Example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$set = new QuickHashIntSet( 1024, QuickHashIntSet::CHECK_FOR_DUPES );
-$set->add( 1 );
-$set->add( 3 );
-
-var_dump( $set->exists( 3 ) );
-var_dump( $set->exists( 4 ) );
-
-$set->saveToFile( "/tmp/test-set.set" );
-
-$newSet = QuickHashIntSet::loadFromFile(
-    "/tmp/test-set.set"
-);
-
-var_dump( $newSet->exists( 3 ) );
-var_dump( $newSet->exists( 4 ) );
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-bool(true)
-bool(false)
-bool(true)
-bool(false)
-]]>
-  </screen>
- </example>
- <example>
-  <title>Quickhash ArrayAccess Example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 64 );
-
-// Adding and updating hash entries.
-$hash[3] = 145926;
-$hash[3] = 1415926;
-$hash[2] = 72;
-
-// Checking if keys exist
-var_dump( isset( $hash[3] ) );
-
-// Removing hash entries
-unset( $hash[2] );
-
-// Retrieving the value stored for a hash
-echo $hash[3], "\n";
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-bool(true)
-1415926
-]]>
-  </screen>
- </example>
- <example>
-  <title>Quickhash Iterator Example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 64 );
-
-// Adding hash entries.
-$hash[1] = 145926;
-$hash[2] = 1415926;
-$hash[3] = 72;
-$hash[4] = 712314;
-$hash[5] = -4234;
-
-foreach( $hash as $key => $value )
-{
-    echo $key, ' => ', $value, "\n";
-}
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-5 => -4234
-4 => 712314
-1 => 145926
-2 => 1415926
-3 => 72
-]]>
-  </screen>
- </example>
- <example>
-  <title>Quickhash String Values Example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntStringHash( 64 );
-
-// Adding hash entries.
-$hash[1] = "one million four hundred fifteen thousand nine hundred twenty six";
-$hash->add( 2, "one more" );
-
-foreach( $hash as $key => $value )
-{
-    echo $key, ' => ', $value, "\n";
-}
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-1 => one million four hundred fifteen thousand nine hundred twenty six
-2 => one more
-]]>
-  </screen>
- </example>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/quickhash/quickhashinthash.xml b/reference/quickhash/quickhashinthash.xml
deleted file mode 100644
index de2912c2c5..0000000000
--- a/reference/quickhash/quickhashinthash.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.quickhashinthash" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The QuickHashIntHash class</title>
- <titleabbrev>QuickHashIntHash</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashIntHash intro -->
-  <section xml:id="quickhashinthash.intro">
-   &reftitle.intro;
-   <para>
-    This class wraps around a hash containing integer numbers, where the
-    values are also integer numbers. Hashes are also available as
-    implementation of the ArrayAccess interface.
-   </para>
-   <para>
-    Hashes can also be iterated over with foreach as the Iterator interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="quickhashinthash.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>QuickHashIntHash</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>QuickHashIntHash</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashinthash.constants.check-for-dupes">QuickHashIntHash::CHECK_FOR_DUPES</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashinthash.constants.do-not-use-zend-alloc">QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashinthash.constants.hasher-no-hash">QuickHashIntHash::HASHER_NO_HASH</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashinthash.constants.hasher-jenkins1">QuickHashIntHash::HASHER_JENKINS1</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashinthash.constants.hasher-jenkins2">QuickHashIntHash::HASHER_JENKINS2</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.quickhashinthash')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ QuickHashIntHash constants -->
-  <section xml:id="quickhashinthash.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="quickhashinthash.constants.check-for-dupes">
-     <term><constant>QuickHashIntHash::CHECK_FOR_DUPES</constant></term>
-     <listitem>
-      <para>If enabled, adding duplicate elements to a set (through either add() or
-      loadFromFile()) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <para>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the memory_limit settings.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.hasher-no-hash">
-     <term><constant>QuickHashIntHash::HASHER_NO_HASH</constant></term>
-     <listitem>
-      <para>Selects to not use a hashing function, but merely use a modulo to
-      find the bucket list index. This is not faster than normal hashing, and
-      gives more collisions.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.hasher-jenkins1">
-     <term><constant>QuickHashIntHash::HASHER_JENKINS1</constant></term>
-     <listitem>
-      <para>This is the default hashing function to turn the integer hashes
-      into bucket list indexes.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.hasher-jenkins2">
-     <term><constant>QuickHashIntHash::HASHER_JENKINS2</constant></term>
-     <listitem>
-      <para>Selects a variant hashing algorithm.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashinthash;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/add.xml b/reference/quickhash/quickhashinthash/add.xml
deleted file mode 100644
index e0abc73c6c..0000000000
--- a/reference/quickhash/quickhashinthash/add.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::add</refname>
-  <refpurpose>This method adds a new entry to the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::add</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method adds a new entry to the hash, and returns whether the entry was
-   added. Entries are by default always added unless
-   QuickHashIntHash::CHECK_FOR_DUPES has been passed when the hash was created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The optional value of the entry to add. If no value is specified,
-       <literal>1</literal> will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::add</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo "without dupe checking\n";
-$hash = new QuickHashIntHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, 22 ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, 12 ) );
-
-echo "\nwith dupe checking\n";
-$hash = new QuickHashIntHash( 1024, QuickHashIntHash::CHECK_FOR_DUPES );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, 78 ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, 9 ) );
-
-echo "\ndefault value\n";
-var_dump( $hash->add( 5 ) );
-var_dump( $hash->get( 5 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-without dupe checking
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-int(22)
-bool(true)
-
-with dupe checking
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-int(78)
-bool(false)
-
-default value
-bool(true)
-int(1)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/construct.xml b/reference/quickhash/quickhashinthash/construct.xml
deleted file mode 100644
index a7d19dc45d..0000000000
--- a/reference/quickhash/quickhashinthash/construct.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::__construct</refname>
-  <refpurpose>Creates a new QuickHashIntHash object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>QuickHashIntHash::__construct</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This constructor creates a new QuickHashIntHash. The size is the amount of
-   bucket lists to create. The more lists there are, the less collisions you
-   will have. Options are also supported.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 64 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The options that you can pass in are: QuickHashIntHash::CHECK_FOR_DUPES,
-       which makes sure no duplicate entries are added to the hash;
-       QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC to not use PHP's internal memory
-       manager as well as one of QuickHashIntHash::HASHER_NO_HASH,
-       QuickHashIntHash::HASHER_JENKINS1 or QuickHashIntHash::HASHER_JENKINS2.
-       These last three configure which hashing algorithm to use. All options
-       can be combined using bitmasks.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntHash object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::__construct</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-var_dump( new QuickHashIntHash( 1024 ) );
-var_dump( new QuickHashIntHash( 1024, QuickHashIntHash::CHECK_FOR_DUPES ) );
-var_dump(
-    new QuickHashIntHash(
-        1024,
-        QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC | QuickHashIntHash::HASHER_JENKINS2 
-    )
-);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/delete.xml b/reference/quickhash/quickhashinthash/delete.xml
deleted file mode 100644
index 4ea3f92ea6..0000000000
--- a/reference/quickhash/quickhashinthash/delete.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::delete</refname>
-  <refpurpose>This method deletes am entry from the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::delete</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method deletes an entry from the hash, and returns whether the entry was
-   deleted or not. Associated memory structures will not be freed immediately,
-   but rather when the hash itself is freed.
-  </para>
-  <para>
-   Elements can not be deleted when the hash is used in an iterator. The
-   method will not throw an exception, but simply return &false; like would
-   happen with any other deletion failure.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to delete.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::delete</function> example</title>
-    <programlisting role="php">
-<![CDATA[<?php
-$hash = new QuickHashIntHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, 5 ) );
-var_dump( $hash->delete( 4 ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->delete( 4 ) );
-?>]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/exists.xml b/reference/quickhash/quickhashinthash/exists.xml
deleted file mode 100644
index d8a91c37c6..0000000000
--- a/reference/quickhash/quickhashinthash/exists.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::exists</refname>
-  <refpurpose>This method checks whether a key is part of the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::exists</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method checks whether an entry with the provided key exists in the
-   hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to check for whether it exists in the hash.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::exists</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-//generate 200000 elements
-$array = range( 0, 199999 );
-$existingEntries = array_rand( array_flip( $array ), 180000 );
-$testForEntries = array_rand( array_flip( $array ), 1000 );
-$foundCount = 0;
-
-echo "Creating hash: ", microtime( true ), "\n";
-$hash = new QuickHashIntHash( 100000 );
-echo "Adding elements: ", microtime( true ), "\n";
-foreach( $existingEntries as $key )
-{
-     $hash->add( $key, 56 );
-}
-
-echo "Doing 1000 tests: ", microtime( true ), "\n";
-foreach( $testForEntries as $key )
-{
-     $foundCount += $hash->exists( $key );
-}
-echo "Done, $foundCount found: ", microtime( true ), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Creating hash: 1263588703.0748
-Adding elements: 1263588703.0757
-Doing 1000 tests: 1263588703.7851
-Done, 898 found: 1263588703.7897
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/get.xml b/reference/quickhash/quickhashinthash/get.xml
deleted file mode 100644
index 75a2f7d3db..0000000000
--- a/reference/quickhash/quickhashinthash/get.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::get</refname>
-  <refpurpose>This method retrieves a value from the hash by its key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntHash::get</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method retrieves a value from the hash by its key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The value if the key exists, or &null; if the key wasn't part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::get</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 8 );
-var_dump( $hash->get( 1 ) );
-
-var_dump( $hash->add( 2 ) );
-var_dump( $hash->get( 2 ) );
-
-var_dump( $hash->add( 3, 5 ) );
-var_dump( $hash->get( 3 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-int(1)
-bool(true)
-int(5)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/getsize.xml b/reference/quickhash/quickhashinthash/getsize.xml
deleted file mode 100644
index c8722174f3..0000000000
--- a/reference/quickhash/quickhashinthash/getsize.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::getSize</refname>
-  <refpurpose>Returns the number of elements in the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntHash::getSize</methodname><void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of elements in the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of elements in the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::getSize</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 8 );
-var_dump( $hash->add( 2 ) );
-var_dump( $hash->add( 3, 5 ) );
-var_dump( $hash->getSize() );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-bool(true)
-int(2)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/loadfromfile.xml b/reference/quickhash/quickhashinthash/loadfromfile.xml
deleted file mode 100644
index 1768319ee6..0000000000
--- a/reference/quickhash/quickhashinthash/loadfromfile.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.loadfromfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::loadFromFile</refname>
-  <refpurpose>This factory method creates a hash from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntHash</type><methodname>QuickHashIntHash::loadFromFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new hash from a definition file on disk. The
-   file format consists of a signature 'QH\0x11\0', the number of elements as
-   a 32 bit signed integer in system Endianness, followed by 32 bit signed
-   integers packed together in the Endianness that the system that the code
-   runs on uses. For each hash element there are two 32 bit signed integers
-   stored.  The first of each element is the key, and the second is the value
-   belonging to the key. An example could be:
-  </para>
-  <para>
-   <example>
-    <title>QuickHash IntHash file format</title>
-    <screen><![CDATA[00000000  51 48 11 00 02 00 00 00  01 00 00 00 01 00 00 00  |QH..............|
-00000010  03 00 00 00 09 00 00 00                           |........|
-00000018
-]]></screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>QuickHash IntHash file format</title>
-    <screen><![CDATA[header signature ('QH'; key type: 1; value type: 1; filler: \0x00)
-00000000  51 48 11 00
-
-number of elements:
-00000004  02 00 00 00
-
-data string:
-00000000  01 00 00 00 01 00 00 00  03 00 00 00 09 00 00 00
-
-key/value 1 (key = 1, value = 1)
-01 00 00 00  01 00 00 00
-
-key/value 2 (key = 3, value = 9)
-03 00 00 00  09 00 00 00
-]]></screen>
-   </example>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to read the hash from.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the hash, rounded up to the nearest power of two
-       with a maximum limit of 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntHash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::loadFromFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = dirname( __FILE__ ) . "/simple.hash";
-$hash = QuickHashIntHash::loadFromFile(
-    $file,
-    QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    printf( "Key %3d (%2x) is %s\n",
-        $key, $key, 
-        $hash->exists( $key ) ? 'set' : 'unset'
-    );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Key   0 ( 0) is unset
-Key   1 ( 1) is set
-Key   2 ( 2) is set
-Key   3 ( 3) is set
-Key   4 ( 4) is unset
-Key   5 ( 5) is set
-Key   6 ( 6) is unset
-Key   7 ( 7) is set
-Key   8 ( 8) is unset
-Key   9 ( 9) is unset
-Key  10 ( a) is unset
-Key  11 ( b) is set
-Key  12 ( c) is unset
-Key  13 ( d) is set
-Key  14 ( e) is unset
-Key  15 ( f) is unset
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/loadfromstring.xml b/reference/quickhash/quickhashinthash/loadfromstring.xml
deleted file mode 100644
index 4f46c3554d..0000000000
--- a/reference/quickhash/quickhashinthash/loadfromstring.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.loadfromstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::loadFromString</refname>
-  <refpurpose>This factory method creates a hash from a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntHash</type><methodname>QuickHashIntHash::loadFromString</methodname>
-   <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new hash from a definition in a string. The
-   file format consists of 32 bit signed integers packed together in the
-   Endianness that the system that the code runs on uses. For each element
-   there are two 32 bit signed integers stored. The first of each element is
-   the key, and the second is the value belonging to the key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>contents</parameter></term>
-     <listitem>
-      <para>
-       The string containing a serialized format of the hash.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the hash, rounded up to the nearest power of two
-       with a maximum limit of 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntHash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::loadFromString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$contents = file_get_contents( dirname( __FILE__ ) . "/simple.hash" );
-$hash = QuickHashIntHash::loadFromString(
-    $contents,
-    QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    printf( "Key %3d (%2x) is %s\n",
-        $key, $key, 
-        $hash->exists( $key ) ? 'set' : 'unset'
-    );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Key   0 ( 0) is unset
-Key   1 ( 1) is set
-Key   2 ( 2) is set
-Key   3 ( 3) is set
-Key   4 ( 4) is unset
-Key   5 ( 5) is set
-Key   6 ( 6) is unset
-Key   7 ( 7) is set
-Key   8 ( 8) is unset
-Key   9 ( 9) is unset
-Key  10 ( a) is unset
-Key  11 ( b) is set
-Key  12 ( c) is unset
-Key  13 ( d) is set
-Key  14 ( e) is unset
-Key  15 ( f) is unset
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/savetofile.xml b/reference/quickhash/quickhashinthash/savetofile.xml
deleted file mode 100644
index c2d017ca72..0000000000
--- a/reference/quickhash/quickhashinthash/savetofile.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.savetofile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::saveToFile</refname>
-  <refpurpose>This method stores an in-memory hash to disk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>QuickHashIntHash::saveToFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method stores an existing hash to a file on disk, in the same format
-   that loadFromFile() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to store the hash in.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::saveToFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, 43 ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, 52 ) );
-
-$hash->saveToFile( '/tmp/test.hash' );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/savetostring.xml b/reference/quickhash/quickhashinthash/savetostring.xml
deleted file mode 100644
index fc7bf92863..0000000000
--- a/reference/quickhash/quickhashinthash/savetostring.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.savetostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::saveToString</refname>
-  <refpurpose>This method returns a serialized version of the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>QuickHashIntHash::saveToString</methodname><void/>
-  </methodsynopsis>
-  <para>
-   This method returns a serialized version of the hash in the same format that
-   loadFromString() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a string containing a serialized format of the hash.
-   Each element is stored as a four byte value in the Endianness that the
-   current system uses.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::saveToString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, 34 ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, 55 ) );
-
-var_dump( $hash->saveToString() );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/set.xml b/reference/quickhash/quickhashinthash/set.xml
deleted file mode 100644
index cc18e40040..0000000000
--- a/reference/quickhash/quickhashinthash/set.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::set</refname>
-  <refpurpose>This method updates an entry in the hash with a new value, or
-  adds a new one if the entry doesn't exist</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::set</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method tries to update an entry with a new value. In case the entry
-   did not yet exist, it will instead add a new entry. It returns whether the
-   entry was added or update. If there are duplicate keys, only the first
-   found element will get an updated value. Use
-   QuickHashIntHash::CHECK_FOR_DUPES during hash creation to prevent duplicate
-   keys from being part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add or update.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The new value to set the entry with.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   2 if the entry was found and updated, 1 if the entry was newly added or 0
-   if there was an error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::set</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 1024 );
-
-echo "Set->Add\n";
-var_dump( $hash->get( 46692 ) );
-var_dump( $hash->set( 46692, 16091 ) );
-var_dump( $hash->get( 46692 ) );
-
-echo "Set->Update\n";
-var_dump( $hash->set( 46692, 29906 ) );
-var_dump( $hash->get( 46692 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-int(2)
-int(16091)
-Set->Update
-int(1)
-int(29906)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashinthash/update.xml b/reference/quickhash/quickhashinthash/update.xml
deleted file mode 100644
index 1ccfa361ed..0000000000
--- a/reference/quickhash/quickhashinthash/update.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashinthash.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntHash::update</refname>
-  <refpurpose>This method updates an entry in the hash with a new value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::update</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method updates an entry with a new value, and returns whether the entry was
-   update. If there are duplicate keys, only the first found element will get
-   an updated value. Use QuickHashIntHash::CHECK_FOR_DUPES during hash
-   creation to prevent duplicate keys from being part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The new value to update the entry with.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was found and updated, and &false; if the entry was
-   not part of the hash already.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntHash::update</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntHash( 1024 );
-
-var_dump( $hash->add( 141421, 173205 ) );
-var_dump( $hash->update( 141421, 223606 ) );
-var_dump( $hash->get( 141421 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-bool(true)
-int(223606)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset.xml b/reference/quickhash/quickhashintset.xml
deleted file mode 100644
index cdd50463ff..0000000000
--- a/reference/quickhash/quickhashintset.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.quickhashintset" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The QuickHashIntSet class</title>
- <titleabbrev>QuickHashIntSet</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashIntSet intro -->
-  <section xml:id="quickhashintset.intro">
-   &reftitle.intro;
-   <para>
-    This class wraps around a set containing integer numbers.
-   </para>
-   <para>
-    Sets can also be iterated over with foreach as the Iterator interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="quickhashintset.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>QuickHashIntSet</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>QuickHashIntSet</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintset.constants.check-for-dupes">QuickHashIntSet::CHECK_FOR_DUPES</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintset.constants.do-not-use-zend-alloc">QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintset.constants.hasher-no-hash">QuickHashIntSet::HASHER_NO_HASH</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintset.constants.hasher-jenkins1">QuickHashIntSet::HASHER_JENKINS1</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintset.constants.hasher-jenkins2">QuickHashIntSet::HASHER_JENKINS2</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.quickhashintset')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ QuickHashIntSet constants -->
-  <section xml:id="quickhashintset.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="quickhashintset.constants.check-for-dupes">
-     <term><constant>QuickHashIntSet::CHECK_FOR_DUPES</constant></term>
-     <listitem>
-      <para>If enabled, adding duplicate elements to a set (through either add() or
-      loadFromFile()) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <para>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the memory_limit settings.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.hasher-no-hash">
-     <term><constant>QuickHashIntSet::HASHER_NO_HASH</constant></term>
-     <listitem>
-      <para>Selects to not use a hashing function, but merely use a modulo to
-      find the bucket list index. This is not faster than normal hashing, and
-      gives more collisions.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.hasher-jenkins1">
-     <term><constant>QuickHashIntSet::HASHER_JENKINS1</constant></term>
-     <listitem>
-      <para>This is the default hashing function to turn the integer hashes
-      into bucket list indexes.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.hasher-jenkins2">
-     <term><constant>QuickHashIntSet::HASHER_JENKINS2</constant></term>
-     <listitem>
-      <para>Selects a variant hashing algorithm.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashintset;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/add.xml b/reference/quickhash/quickhashintset/add.xml
deleted file mode 100644
index 32193ad561..0000000000
--- a/reference/quickhash/quickhashintset/add.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::add</refname>
-  <refpurpose>This method adds a new entry to the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntSet::add</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method adds a new entry to the set, and returns whether the entry was
-   added. Entries are by default always added unless
-   QuickHashIntSet::CHECK_FOR_DUPES has been passed when the set was created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::add</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo "without dupe checking\n";
-$set = new QuickHashIntSet( 1024 );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-
-echo "\nwith dupe checking\n";
-$set = new QuickHashIntSet( 1024, QuickHashIntSet::CHECK_FOR_DUPES );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-without dupe checking
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-
-with dupe checking
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/construct.xml b/reference/quickhash/quickhashintset/construct.xml
deleted file mode 100644
index f90a56bd59..0000000000
--- a/reference/quickhash/quickhashintset/construct.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::__construct</refname>
-  <refpurpose>Creates a new QuickHashIntSet object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>QuickHashIntSet::__construct</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This constructor creates a new QuickHashIntSet. The size is the amount of
-   bucket lists to create. The more lists there are, the less collisions you
-   will have. Options are also supported.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The options that you can pass in are: QuickHashIntSet::CHECK_FOR_DUPES,
-       which makes sure no duplicate entries are added to the set;
-       QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC to not use PHP's internal memory
-       manager as well as one of QuickHashIntSet::HASHER_NO_HASH,
-       QuickHashIntSet::HASHER_JENKINS1 or QuickHashIntSet::HASHER_JENKINS2.
-       These last three configure which hashing algorithm to use. All options
-       can be combined using bitmasks.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntSet object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::__construct</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-var_dump( new QuickHashIntSet( 1024 ) );
-var_dump( new QuickHashIntSet( 1024, QuickHashIntSet::CHECK_FOR_DUPES ) );
-var_dump(
-    new QuickHashIntSet(
-        1024,
-        QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC | QuickHashIntSet::HASHER_JENKINS2 
-    )
-);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/delete.xml b/reference/quickhash/quickhashintset/delete.xml
deleted file mode 100644
index 0edd3cb9e4..0000000000
--- a/reference/quickhash/quickhashintset/delete.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::delete</refname>
-  <refpurpose>This method deletes an entry from the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntSet::delete</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method deletes an entry from the set, and returns whether the entry was
-   deleted or not. Associated memory structures will not be freed immediately,
-   but rather when the set itself is freed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to delete.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::delete</function> example</title>
-    <programlisting role="php">
-<![CDATA[<?php
-$set = new QuickHashIntSet( 1024 );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-var_dump( $set->delete( 4 ) );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->delete( 4 ) );
-?>]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/exists.xml b/reference/quickhash/quickhashintset/exists.xml
deleted file mode 100644
index a9b6082347..0000000000
--- a/reference/quickhash/quickhashintset/exists.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::exists</refname>
-  <refpurpose>This method checks whether a key is part of the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntSet::exists</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method checks whether an entry with the provided key exists in the
-   set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to check for whether it exists in the set.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::exists</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-//generate 200000 elements
-$array = range( 0, 199999 );
-$existingEntries = array_rand( array_flip( $array ), 180000 );
-$testForEntries = array_rand( array_flip( $array ), 1000 );
-$foundCount = 0;
-
-echo "Creating set: ", microtime( true ), "\n";
-$set = new QuickHashIntSet( 100000 );
-echo "Adding elements: ", microtime( true ), "\n";
-foreach( $existingEntries as $key )
-{
-     $set->add( $key );
-}
-
-echo "Doing 1000 tests: ", microtime( true ), "\n";
-foreach( $testForEntries as $key )
-{
-     $foundCount += $set->exists( $key );
-}
-echo "Done, $foundCount found: ", microtime( true ), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Creating set: 1263588703.0748
-Adding elements: 1263588703.0757
-Doing 1000 tests: 1263588703.7851
-Done, 898 found: 1263588703.7897
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/getsize.xml b/reference/quickhash/quickhashintset/getsize.xml
deleted file mode 100644
index 7078319681..0000000000
--- a/reference/quickhash/quickhashintset/getsize.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::getSize</refname>
-  <refpurpose>Returns the number of elements in the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier><type>int</type><methodname>QuickHashIntSet::getSize</methodname><void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of elements in the set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of elements in the set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::getSize</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$set = new QuickHashIntSet( 8 );
-var_dump( $set->add( 2 ) );
-var_dump( $set->add( 3 ) );
-var_dump( $set->getSize() );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-bool(true)
-int(2)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/loadfromfile.xml b/reference/quickhash/quickhashintset/loadfromfile.xml
deleted file mode 100644
index 21b137c82c..0000000000
--- a/reference/quickhash/quickhashintset/loadfromfile.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.loadfromfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::loadFromFile</refname>
-  <refpurpose>This factory method creates a set from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntSet</type><methodname>QuickHashIntSet::loadFromFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new set from a definition file on disk. The
-   file format consists of 32 bit signed integers packed together in the
-   Endianness that the system that the code runs on uses.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to read the set from.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the set, rounded up to the nearest power of two
-       with a maximum limit of 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntSet.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::loadFromFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = dirname( __FILE__ ) . "/simple.set";
-$set = QuickHashIntSet::loadFromFile(
-    $file,
-    QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    printf( "Key %3d (%2x) is %s\n",
-        $key, $key, 
-        $set->exists( $key ) ? 'set' : 'unset'
-    );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Key   0 ( 0) is unset
-Key   1 ( 1) is set
-Key   2 ( 2) is set
-Key   3 ( 3) is set
-Key   4 ( 4) is unset
-Key   5 ( 5) is set
-Key   6 ( 6) is unset
-Key   7 ( 7) is set
-Key   8 ( 8) is unset
-Key   9 ( 9) is unset
-Key  10 ( a) is unset
-Key  11 ( b) is set
-Key  12 ( c) is unset
-Key  13 ( d) is set
-Key  14 ( e) is unset
-Key  15 ( f) is unset
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/loadfromstring.xml b/reference/quickhash/quickhashintset/loadfromstring.xml
deleted file mode 100644
index 76ac082f27..0000000000
--- a/reference/quickhash/quickhashintset/loadfromstring.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.loadfromstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::loadFromString</refname>
-  <refpurpose>This factory method creates a set from a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntSet</type><methodname>QuickHashIntSet::loadFromString</methodname>
-   <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new set from a definition in a string. The
-   file format consists of 32 bit signed integers packed together in the
-   Endianness that the system that the code runs on uses.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>contents</parameter></term>
-     <listitem>
-      <para>
-       The string containing a serialized format of the set.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the set, rounded up to the nearest power of two
-       automatically limited from 64 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntSet.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::loadFromString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$contents = file_get_contents( dirname( __FILE__ ) . "/simple.set" );
-$set = QuickHashIntSet::loadFromString(
-    $contents,
-    QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    printf( "Key %3d (%2x) is %s\n",
-        $key, $key, 
-        $set->exists( $key ) ? 'set' : 'unset'
-    );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Key   0 ( 0) is unset
-Key   1 ( 1) is set
-Key   2 ( 2) is set
-Key   3 ( 3) is set
-Key   4 ( 4) is unset
-Key   5 ( 5) is set
-Key   6 ( 6) is unset
-Key   7 ( 7) is set
-Key   8 ( 8) is unset
-Key   9 ( 9) is unset
-Key  10 ( a) is unset
-Key  11 ( b) is set
-Key  12 ( c) is unset
-Key  13 ( d) is set
-Key  14 ( e) is unset
-Key  15 ( f) is unset
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/savetofile.xml b/reference/quickhash/quickhashintset/savetofile.xml
deleted file mode 100644
index fc1fb46356..0000000000
--- a/reference/quickhash/quickhashintset/savetofile.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.savetofile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::saveToFile</refname>
-  <refpurpose>This method stores an in-memory set to disk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>QuickHashIntSet::saveToFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method stores an existing set to a file on disk, in the same format
-   that loadFromFile() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to store the hash in.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::saveToFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$set = new QuickHashIntSet( 1024 );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-
-$set->saveToFile( '/tmp/test.set' );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintset/savetostring.xml b/reference/quickhash/quickhashintset/savetostring.xml
deleted file mode 100644
index f6b985d8ab..0000000000
--- a/reference/quickhash/quickhashintset/savetostring.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintset.savetostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntSet::saveToString</refname>
-  <refpurpose>This method returns a serialized version of the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>QuickHashIntSet::saveToString</methodname><void/>
-  </methodsynopsis>
-  <para>
-   This method returns a serialized version of the set in the same format that
-   loadFromString() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a string containing a serialized format of the set.
-   Each element is stored as a four byte value in the Endianness that the
-   current system uses.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntSet::saveToString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$set = new QuickHashIntSet( 1024 );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-var_dump( $set->exists( 4 ) );
-var_dump( $set->add( 4 ) );
-
-var_dump( $set->saveToString() );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash.xml b/reference/quickhash/quickhashintstringhash.xml
deleted file mode 100644
index 2dc4a5ed5e..0000000000
--- a/reference/quickhash/quickhashintstringhash.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.quickhashintstringhash" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The QuickHashIntStringHash class</title>
- <titleabbrev>QuickHashIntStringHash</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashIntStringHash intro -->
-  <section xml:id="quickhashintstringhash.intro">
-   &reftitle.intro;
-   <para>
-    This class wraps around a hash containing integer numbers, where the
-    values are strings. Hashes are also available as implementation of the
-    ArrayAccess interface.
-   </para>
-   <para>
-    Hashes can also be iterated over with foreach as the Iterator interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="quickhashintstringhash.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>QuickHashIntStringHash</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>QuickHashIntStringHash</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintstringhash.constants.check-for-dupes">QuickHashIntStringHash::CHECK_FOR_DUPES</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintstringhash.constants.do-not-use-zend-alloc">QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintstringhash.constants.hasher-no-hash">QuickHashIntStringHash::HASHER_NO_HASH</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintstringhash.constants.hasher-jenkins1">QuickHashIntStringHash::HASHER_JENKINS1</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashintstringhash.constants.hasher-jenkins2">QuickHashIntStringHash::HASHER_JENKINS2</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.quickhashintstringhash')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ QuickHashIntStringHash constants -->
-  <section xml:id="quickhashintstringhash.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.check-for-dupes">
-     <term><constant>QuickHashIntStringHash::CHECK_FOR_DUPES</constant></term>
-     <listitem>
-      <para>If enabled, adding duplicate elements to a set (through either add() or
-      loadFromFile()) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <para>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the memory_limit settings.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.hasher-no-hash">
-     <term><constant>QuickHashIntStringHash::HASHER_NO_HASH</constant></term>
-     <listitem>
-      <para>Selects to not use a hashing function, but merely use a modulo to
-      find the bucket list index. This is not faster than normal hashing, and
-      gives more collisions.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.hasher-jenkins1">
-     <term><constant>QuickHashIntStringHash::HASHER_JENKINS1</constant></term>
-     <listitem>
-      <para>This is the default hashing function to turn the integer hashes
-      into bucket list indexes.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.hasher-jenkins2">
-     <term><constant>QuickHashIntStringHash::HASHER_JENKINS2</constant></term>
-     <listitem>
-      <para>Selects a variant hashing algorithm.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashintstringhash;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/add.xml b/reference/quickhash/quickhashintstringhash/add.xml
deleted file mode 100644
index f0239cab51..0000000000
--- a/reference/quickhash/quickhashintstringhash/add.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::add</refname>
-  <refpurpose>This method adds a new entry to the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::add</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method adds a new entry to the hash, and returns whether the entry was
-   added. Entries are by default always added unless
-   QuickHashIntStringHash::CHECK_FOR_DUPES has been passed when the hash was created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the entry to add. If a non-string is passed, it will be
-       converted to a string automatically if possible.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::add</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo "without dupe checking\n";
-$hash = new QuickHashIntStringHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, "twenty two" ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, "twelve" ) );
-
-echo "\nwith dupe checking\n";
-$hash = new QuickHashIntStringHash( 1024, QuickHashIntStringHash::CHECK_FOR_DUPES );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, "seventy eight" ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->get( 4 ) );
-var_dump( $hash->add( 4, "nine" ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-without dupe checking
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-string(10) "twenty two"
-bool(true)
-
-with dupe checking
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-string(13) "seventy eight"
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/construct.xml b/reference/quickhash/quickhashintstringhash/construct.xml
deleted file mode 100644
index 44b7c50421..0000000000
--- a/reference/quickhash/quickhashintstringhash/construct.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::__construct</refname>
-  <refpurpose>Creates a new QuickHashIntStringHash object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>QuickHashIntStringHash::__construct</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This constructor creates a new QuickHashIntStringHash. The size is the amount of
-   bucket lists to create. The more lists there are, the less collisions you
-   will have. Options are also supported.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 64 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The options that you can pass in are: QuickHashIntStringHash::CHECK_FOR_DUPES,
-       which makes sure no duplicate entries are added to the hash;
-       QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC to not use PHP's internal memory
-       manager as well as one of QuickHashIntStringHash::HASHER_NO_HASH,
-       QuickHashIntStringHash::HASHER_JENKINS1 or QuickHashIntStringHash::HASHER_JENKINS2.
-       These last three configure which hashing algorithm to use. All options
-       can be combined using bitmasks.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntStringHash object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::__construct</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-var_dump( new QuickHashIntStringHash( 1024 ) );
-var_dump( new QuickHashIntStringHash( 1024, QuickHashIntStringHash::CHECK_FOR_DUPES ) );
-var_dump(
-    new QuickHashIntStringHash(
-        1024,
-        QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC | QuickHashIntStringHash::HASHER_JENKINS2 
-    )
-);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/delete.xml b/reference/quickhash/quickhashintstringhash/delete.xml
deleted file mode 100644
index 73f784f477..0000000000
--- a/reference/quickhash/quickhashintstringhash/delete.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::delete</refname>
-  <refpurpose>This method deletes am entry from the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::delete</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method deletes an entry from the hash, and returns whether the entry was
-   deleted or not. Associated memory structures will not be freed immediately,
-   but rather when the hash itself is freed.
-  </para>
-  <para>
-   Elements can not be deleted when the hash is used in an iterator. The
-   method will not throw an exception, but simply return &false; like would
-   happen with any other deletion failure.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to delete.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::delete</function> example</title>
-    <programlisting role="php">
-<![CDATA[<?php
-$hash = new QuickHashIntStringHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, "five" ) );
-var_dump( $hash->delete( 4 ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->delete( 4 ) );
-?>]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/exists.xml b/reference/quickhash/quickhashintstringhash/exists.xml
deleted file mode 100644
index d46833bbb3..0000000000
--- a/reference/quickhash/quickhashintstringhash/exists.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::exists</refname>
-  <refpurpose>This method checks whether a key is part of the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::exists</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method checks whether an entry with the provided key exists in the
-   hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to check for whether it exists in the hash.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/get.xml b/reference/quickhash/quickhashintstringhash/get.xml
deleted file mode 100644
index 5945335f37..0000000000
--- a/reference/quickhash/quickhashintstringhash/get.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::get</refname>
-  <refpurpose>This method retrieves a value from the hash by its key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>QuickHashIntStringHash::get</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method retrieves a value from the hash by its key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The value if the key exists, or &null; if the key wasn't part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::get</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntStringHash( 8 );
-var_dump( $hash->get( 1 ) );
-
-var_dump( $hash->add( 2, "two" ) );
-var_dump( $hash->get( 2 ) );
-
-var_dump( $hash->add( 3, 5 ) );
-var_dump( $hash->get( 3 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-string(3) "two"
-bool(true)
-string(1) "5"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/getsize.xml b/reference/quickhash/quickhashintstringhash/getsize.xml
deleted file mode 100644
index 1de848c82c..0000000000
--- a/reference/quickhash/quickhashintstringhash/getsize.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::getSize</refname>
-  <refpurpose>Returns the number of elements in the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntStringHash::getSize</methodname><void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of elements in the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of elements in the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::getSize</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntStringHash( 8 );
-var_dump( $hash->add( 2, "two" ) );
-var_dump( $hash->add( 3, 5 ) );
-var_dump( $hash->getSize() );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-bool(true)
-int(2)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/loadfromfile.xml b/reference/quickhash/quickhashintstringhash/loadfromfile.xml
deleted file mode 100644
index 34f26edf21..0000000000
--- a/reference/quickhash/quickhashintstringhash/loadfromfile.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.loadfromfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::loadFromFile</refname>
-  <refpurpose>This factory method creates a hash from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntStringHash</type><methodname>QuickHashIntStringHash::loadFromFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new hash from a definition file on disk. The
-   file format consists of a signature 'QH\0x12\0', the number of elements as
-   a 32 bit signed integer in system Endianness, an unsigned 32 bit integer
-   containing the number of element data to follow in characters. This element
-   data contains all the strings. After the header and the strings, the
-   elements follow in pairs of two unsigned 32 bit integers where the first
-   one is the key, and the second one the index in the element data
-   string. An example could be:
-  </para>
-  <para>
-   <example>
-    <title>QuickHash IntString file format</title>
-    <screen><![CDATA[00000000  51 48 12 00 02 00 00 00  09 00 00 00 4f 4e 45 00  |QH..........ONE.|
-00000010  4e 49 4e 45 00 01 00 00  00 00 00 00 00 03 00 00  |NINE............|
-00000020  00 04 00 00 00                                    |.....|
-00000025
-]]></screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>QuickHash IntString file format</title>
-    <screen><![CDATA[
-header signature ('QH'; key type: 1; value type: 2; filler: \0x00)
-00000000  51 48 12 00
-
-number of elements:
-00000004  02 00 00 00
-
-length of string values (9 characters):
-00000008  09 00 00 00
-
-string values:
-0000000C  4f 4e 45 00 4e 49 4e 45  00
-
-data string:
-00000015  01 00 00 00 00 00 00 00  03 00 00 00 04 00 00 00
-
-key/value 1 (key = 1, string index = 0 ("ONE")):
-01 00 00 00  00 00 00 00
-
-key/value 2 (key = 3, string index = 4 ("NINE")):
-03 00 00 00  04 00 00 00
-]]></screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to read the hash from.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the hash, rounded up to the nearest power of two
-       with a maximum limit of 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntStringHash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::loadFromFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = dirname( __FILE__ ) . "/simple.string.hash";
-$hash = QuickHashIntStringHash::loadFromFile(
-    $file,
-    QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    printf( "Key %3d (%2x) is %s\n",
-        $key, $key, 
-        $hash->exists( $key ) ? 'set' : 'unset'
-    );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Key   0 ( 0) is unset
-Key   1 ( 1) is set
-Key   2 ( 2) is set
-Key   3 ( 3) is set
-Key   4 ( 4) is unset
-Key   5 ( 5) is set
-Key   6 ( 6) is unset
-Key   7 ( 7) is set
-Key   8 ( 8) is unset
-Key   9 ( 9) is unset
-Key  10 ( a) is unset
-Key  11 ( b) is set
-Key  12 ( c) is unset
-Key  13 ( d) is set
-Key  14 ( e) is unset
-Key  15 ( f) is unset
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/loadfromstring.xml b/reference/quickhash/quickhashintstringhash/loadfromstring.xml
deleted file mode 100644
index 4e9cd98eea..0000000000
--- a/reference/quickhash/quickhashintstringhash/loadfromstring.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.loadfromstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::loadFromString</refname>
-  <refpurpose>This factory method creates a hash from a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntStringHash</type><methodname>QuickHashIntStringHash::loadFromString</methodname>
-   <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new hash from a definition in a string. The
-   format is the same as the one used in "loadFromFile".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>contents</parameter></term>
-     <listitem>
-      <para>
-       The string containing a serialized format of the hash.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the hash, rounded up to the nearest power of two
-       with a maximum limit of 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashIntStringHash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::loadFromString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$contents = file_get_contents( dirname( __FILE__ ) . "/simple.hash" );
-$hash = QuickHashIntStringHash::loadFromString(
-    $contents,
-    QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    printf( "Key %3d (%2x) is %s\n",
-        $key, $key, 
-        $hash->exists( $key ) ? 'set' : 'unset'
-    );
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Key   0 ( 0) is unset
-Key   1 ( 1) is set
-Key   2 ( 2) is set
-Key   3 ( 3) is set
-Key   4 ( 4) is unset
-Key   5 ( 5) is set
-Key   6 ( 6) is unset
-Key   7 ( 7) is set
-Key   8 ( 8) is unset
-Key   9 ( 9) is unset
-Key  10 ( a) is unset
-Key  11 ( b) is set
-Key  12 ( c) is unset
-Key  13 ( d) is set
-Key  14 ( e) is unset
-Key  15 ( f) is unset
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/savetofile.xml b/reference/quickhash/quickhashintstringhash/savetofile.xml
deleted file mode 100644
index d2eaf036b9..0000000000
--- a/reference/quickhash/quickhashintstringhash/savetofile.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.savetofile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::saveToFile</refname>
-  <refpurpose>This method stores an in-memory hash to disk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>QuickHashIntStringHash::saveToFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method stores an existing hash to a file on disk, in the same format
-   that loadFromFile() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to store the hash in.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::saveToFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntStringHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, "fourty three" ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, "fifty two" ) );
-
-$hash->saveToFile( '/tmp/test.string.hash' );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/savetostring.xml b/reference/quickhash/quickhashintstringhash/savetostring.xml
deleted file mode 100644
index c20d511f41..0000000000
--- a/reference/quickhash/quickhashintstringhash/savetostring.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.savetostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::saveToString</refname>
-  <refpurpose>This method returns a serialized version of the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>QuickHashIntStringHash::saveToString</methodname><void/>
-  </methodsynopsis>
-  <para>
-   This method returns a serialized version of the hash in the same format that
-   loadFromString() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a string containing a serialized format of the hash.
-   Each element is stored as a four byte value in the Endianness that the
-   current system uses.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::saveToString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntStringHash( 1024 );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, "thirty four" ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 5, "fifty five" ) );
-
-var_dump( $hash->saveToString() );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/set.xml b/reference/quickhash/quickhashintstringhash/set.xml
deleted file mode 100644
index 5b4d9f45a9..0000000000
--- a/reference/quickhash/quickhashintstringhash/set.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::set</refname>
-  <refpurpose>This method updates an entry in the hash with a new value, or
-  adds a new one if the entry doesn't exist</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntStringHash::set</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method tries to update an entry with a new value. In case the entry
-   did not yet exist, it will instead add a new entry. It returns whether the
-   entry was added or update. If there are duplicate keys, only the first
-   found element will get an updated value. Use
-   QuickHashIntStringHash::CHECK_FOR_DUPES during hash creation to prevent duplicate
-   keys from being part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add or update.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the entry to add. If a non-string is passed, it will be
-       converted to a string automatically if possible.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   2 if the entry was found and updated, 1 if the entry was newly added or 0
-   if there was an error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::set</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashIntStringHash( 1024 );
-
-echo "Set->Add\n";
-var_dump( $hash->get( 46692 ) );
-var_dump( $hash->set( 46692, "sixteen thousand ninety one" ) );
-var_dump( $hash->get( 46692 ) );
-
-echo "Set->Update\n";
-var_dump( $hash->set( 46692, "twenty nine thousand nine hundred six" ) );
-var_dump( $hash->get( 46692 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Set->Add
-bool(false)
-int(2)
-string(27) "sixteen thousand ninety one"
-Set->Update
-int(1)
-string(37) "twenty nine thousand nine hundred six"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashintstringhash/update.xml b/reference/quickhash/quickhashintstringhash/update.xml
deleted file mode 100644
index e02d1fff7e..0000000000
--- a/reference/quickhash/quickhashintstringhash/update.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashintstringhash.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashIntStringHash::update</refname>
-  <refpurpose>This method updates an entry in the hash with a new value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::update</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method updates an entry with a new value, and returns whether the entry was
-   update. If there are duplicate keys, only the first found element will get
-   an updated value. Use QuickHashIntStringHash::CHECK_FOR_DUPES during hash
-   creation to prevent duplicate keys from being part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The new value for the entry. If a non-string is passed, it will be
-       converted to a string automatically if possible.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was found and updated, and &false; if the entry was
-   not part of the hash already.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashIntStringHash::update</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash->add( 161803398, "--" );
-$hash->add( 314159265, "a lot" );
-
-echo $hash->get( 161803398 ), "\n";
-echo $hash->get( 314159265 ), "\n";
-
-var_dump( $hash->update( 314159265, "a lot plus one" ) );
-var_dump( $hash->update( 314159999, "a lot plus one" ) );
-
-echo $hash->get( 161803398 ), "\n";
-echo $hash->get( 314159265 ), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
---
-a lot
-bool(true)
-bool(false)
---
-a lot plus one
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash.xml b/reference/quickhash/quickhashstringinthash.xml
deleted file mode 100644
index d750449d8b..0000000000
--- a/reference/quickhash/quickhashstringinthash.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.quickhashstringinthash" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The QuickHashStringIntHash class</title>
- <titleabbrev>QuickHashStringIntHash</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashStringIntHash intro -->
-  <section xml:id="quickhashstringinthash.intro">
-   &reftitle.intro;
-   <para>
-    This class wraps around a hash containing strings, where the
-    values are integer numbers. Hashes are also available as
-    implementation of the ArrayAccess interface.
-   </para>
-   <para>
-    Hashes can also be iterated over with foreach as the Iterator interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="quickhashstringinthash.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>QuickHashStringIntHash</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>QuickHashStringIntHash</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashstringinthash.constants.check-for-dupes">QuickHashStringIntHash::CHECK_FOR_DUPES</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="quickhashstringinthash.constants.do-not-use-zend-alloc">QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.quickhashstringinthash')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ QuickHashStringIntHash constants -->
-  <section xml:id="quickhashstringinthash.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="quickhashstringinthash.constants.check-for-dupes">
-     <term><constant>QuickHashStringIntHash::CHECK_FOR_DUPES</constant></term>
-     <listitem>
-      <para>If enabled, adding duplicate elements to a set (through either add() or
-      loadFromFile()) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashstringinthash.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <para>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the memory_limit settings.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashstringinthash;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/add.xml b/reference/quickhash/quickhashstringinthash/add.xml
deleted file mode 100644
index 026ef6bc38..0000000000
--- a/reference/quickhash/quickhashstringinthash/add.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::add</refname>
-  <refpurpose>This method adds a new entry to the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method adds a new entry to the hash, and returns whether the entry was
-   added. Entries are by default always added unless
-   QuickHashStringIntHash::CHECK_FOR_DUPES has been passed when the hash was created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::add</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo "without dupe checking\n";
-$hash = new QuickHashStringIntHash( 1024 );
-var_dump( $hash );
-var_dump( $hash->exists( "four" ) );
-var_dump( $hash->get( "four" ) );
-var_dump( $hash->add( "four", 22 ) );
-var_dump( $hash->exists( "four" ) );
-var_dump( $hash->get( "four" ) );
-var_dump( $hash->add( "four", 12 ) );
-
-echo "\nwith dupe checking\n";
-$hash = new QuickHashStringIntHash( 1024, QuickHashStringIntHash::CHECK_FOR_DUPES );
-var_dump( $hash );
-var_dump( $hash->exists( "four" ) );
-var_dump( $hash->get( "four" ) );
-var_dump( $hash->add( "four", 78 ) );
-var_dump( $hash->exists( "four" ) );
-var_dump( $hash->get( "four" ) );
-var_dump( $hash->add( "four", 9 ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-without dupe checking
-object(QuickHashStringIntHash)#1 (0) {
-}
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-int(22)
-bool(true)
-
-with dupe checking
-object(QuickHashStringIntHash)#2 (0) {
-}
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-int(78)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/construct.xml b/reference/quickhash/quickhashstringinthash/construct.xml
deleted file mode 100644
index 20f5247f79..0000000000
--- a/reference/quickhash/quickhashstringinthash/construct.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::__construct</refname>
-  <refpurpose>Creates a new QuickHashStringIntHash object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>QuickHashStringIntHash::__construct</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This constructor creates a new QuickHashStringIntHash. The size is the amount of
-   bucket lists to create. The more lists there are, the less collisions you
-   will have. Options are also supported.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 64 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The options that you can pass in are:
-       QuickHashStringIntHash::CHECK_FOR_DUPES, which makes sure no duplicate
-       entries are added to the hash and
-       QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC to not use PHP's internal
-       memory manager.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashStringIntHash object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::__construct</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-var_dump( new QuickHashStringIntHash( 1024 ) );
-var_dump( new QuickHashStringIntHash( 1024, QuickHashStringIntHash::CHECK_FOR_DUPES ) );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/delete.xml b/reference/quickhash/quickhashstringinthash/delete.xml
deleted file mode 100644
index d8724d2ec4..0000000000
--- a/reference/quickhash/quickhashstringinthash/delete.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::delete</refname>
-  <refpurpose>This method deletes am entry from the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::delete</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method deletes an entry from the hash, and returns whether the entry was
-   deleted or not. Associated memory structures will not be freed immediately,
-   but rather when the hash itself is freed.
-  </para>
-  <para>
-   Elements can not be deleted when the hash is used in an iterator. The
-   method will not throw an exception, but simply return &false; like would
-   happen with any other deletion failure.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to delete.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::delete</function> example</title>
-    <programlisting role="php">
-<![CDATA[<?php
-$hash = new QuickHashStringIntHash( 1024 );
-var_dump( $hash->exists( 'four' ) );
-var_dump( $hash->add( 'four', 5 ) );
-var_dump( $hash->get( 'four' ) );
-var_dump( $hash->delete( 'four' ) );
-var_dump( $hash->exists( 'four' ) );
-var_dump( $hash->get( 'four' ) );
-var_dump( $hash->delete( 'four' ) );
-?>]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-int(5)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/exists.xml b/reference/quickhash/quickhashstringinthash/exists.xml
deleted file mode 100644
index fd334454c4..0000000000
--- a/reference/quickhash/quickhashstringinthash/exists.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::exists</refname>
-  <refpurpose>This method checks whether a key is part of the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::exists</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method checks whether an entry with the provided key exists in the
-   hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to check for whether it exists in the hash.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/get.xml b/reference/quickhash/quickhashstringinthash/get.xml
deleted file mode 100644
index b5de095933..0000000000
--- a/reference/quickhash/quickhashstringinthash/get.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::get</refname>
-  <refpurpose>This method retrieves a value from the hash by its key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>QuickHashStringIntHash::get</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method retrieves a value from the hash by its key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The value if the key exists, or &null; if the key wasn't part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::get</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 8 );
-var_dump( $hash->get( "one" ) );
-
-var_dump( $hash->add( "two", 2 ) );
-var_dump( $hash->get( "two" ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-bool(true)
-int(2)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/getsize.xml b/reference/quickhash/quickhashstringinthash/getsize.xml
deleted file mode 100644
index 2ea1c74780..0000000000
--- a/reference/quickhash/quickhashstringinthash/getsize.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::getSize</refname>
-  <refpurpose>Returns the number of elements in the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>QuickHashStringIntHash::getSize</methodname><void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of elements in the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of elements in the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::getSize</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 8 );
-var_dump( $hash->add( "two", 2 ) );
-var_dump( $hash->add( "three", 5 ) );
-var_dump( $hash->getSize() );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-bool(true)
-int(2)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/loadfromfile.xml b/reference/quickhash/quickhashstringinthash/loadfromfile.xml
deleted file mode 100644
index 1aa42545e4..0000000000
--- a/reference/quickhash/quickhashstringinthash/loadfromfile.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.loadfromfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::loadFromFile</refname>
-  <refpurpose>This factory method creates a hash from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashStringIntHash</type><methodname>QuickHashStringIntHash::loadFromFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new hash from a definition file on disk. The
-   file format consists of a signature 'QH\0x21\0', the number of elements as
-   a 32 bit signed integer in system Endianness, an unsigned 32 bit integer
-   containing the number of element data to follow in characters. This element
-   data contains all the strings. The follows another signed 32 bit integer
-   containing the number of bucket lists.  After the header and the strings,
-   the elements follow. They are ordered by bucket list so that the keys don't
-   have to be hashed in order to restore the hash. For each bucket list, the
-   following information is stored (all as 32 bit integers): the bucket list
-   index, the number of elements in that list, and then in pairs of two
-   unsigned 32 bit integers the elements, where the first one is the index
-   into the string list containing the keys, and the second one the value.  An
-   example could be:
-  </para>
-  <para>
-   <example>
-    <title>QuickHash StringIntHash file format</title>
-    <screen><![CDATA[00000000  51 48 21 00 02 00 00 00  09 00 00 00 40 00 00 00  |QH!.........@...|
-00000010  4f 4e 45 00 4e 49 4e 45  00 07 00 00 00 01 00 00  |ONE.NINE........|
-00000020  00 00 00 00 00 01 00 00  00 2f 00 00 00 01 00 00  |........./......|
-00000030  00 04 00 00 00 03 00 00  00                       |.........|
-00000039]]></screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>QuickHash IntHash file format</title>
-    <screen><![CDATA[header signature ('QH'; key type: 2; value type: 1; filler: \0x00)
-00000000  51 48 21 00
-
-number of elements:
-00000004  02 00 00 00
-
-length of string values (9 characters):
-00000008  09 00 00 00
-
-number of hash bucket lists (this is configured for hashes as argument to the
-constructor normally, 64 in this case):
-0000000C  40 00 00 00
-
-string values:
-00000010  4f 4e 45 00 4e 49 4e 45  00
-
-bucket lists:
-  bucket list 1 (with key 7, and 1 element):
-    header:
-    07 00 00 00 01 00 00 00
-    elements (key index: 0 ('ONE'), value = 0):
-    00 00 00 00 01 00 00 00
-  bucket list 2 (with key 0x2f, and 1 element):
-    header:
-    2f 00 00 00 01 00 00 00
-    elements (key index: 4 ('NINE'), value = 3):
-    04 00 00 00 03 00 00 00
-
-]]></screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to read the hash from.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is read from the file format (unlike the
-       QuickHashIntHash and QuickHashIntStringHash classes, where it is
-       automatically calculated from the number of entries in the hash.)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashStringIntHash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::loadFromFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = dirname( __FILE__ ) . "/simple.hash.string";
-$hash = QuickHashStringIntHash::loadFromFile(
-    $file,
-    QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    $i = 48712 + $key * 1631;
-    $k = base_convert( $i, 10, 36 );
-    echo $k, ' => ', $hash->get( $k ), "\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-11l4 => 48712
-12uf => 50343
-143q => 51974
-15d1 => 53605
-16mc => 55236
-17vn => 56867
-194y => 58498
-1ae9 => 60129
-1bnk => 61760
-1cwv => 63391
-1e66 => 65022
-1ffh => 66653
-1gos => 68284
-1hy3 => 69915
-1j7e => 71546
-1kgp => 73177
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/loadfromstring.xml b/reference/quickhash/quickhashstringinthash/loadfromstring.xml
deleted file mode 100644
index 731a6870d4..0000000000
--- a/reference/quickhash/quickhashstringinthash/loadfromstring.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.loadfromstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::loadFromString</refname>
-  <refpurpose>This factory method creates a hash from a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashStringIntHash</type><methodname>QuickHashStringIntHash::loadFromString</methodname>
-   <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This factory method creates a new hash from a definition in a string. The
-   format is the same as the one used in "loadFromFile".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>contents</parameter></term>
-     <listitem>
-      <para>
-       The string containing a serialized format of the hash.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The amount of bucket lists to configure. The number you pass in will be
-       automatically rounded up to the next power of two. It is also
-       automatically limited from 4 to 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The same options that the class' constructor takes; except that the size
-       option is ignored. It is automatically calculated to be the same as the
-       number of entries in the hash, rounded up to the nearest power of two
-       with a maximum limit of 4194304.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new QuickHashStringIntHash.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::loadFromString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$contents = file_get_contents( dirname( __FILE__ ) . "/simple.hash.string" );
-$hash = QuickHashStringIntHash::loadFromString(
-    $contents,
-    QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC
-);
-foreach( range( 0, 0x0f ) as $key )
-{
-    $i = 48712 + $key * 1631;
-    $k = base_convert( $i, 10, 36 );
-    echo $k, ' => ', $hash->get( $k ), "\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-11l4 => 48712
-12uf => 50343
-143q => 51974
-15d1 => 53605
-16mc => 55236
-17vn => 56867
-194y => 58498
-1ae9 => 60129
-1bnk => 61760
-1cwv => 63391
-1e66 => 65022
-1ffh => 66653
-1gos => 68284
-1hy3 => 69915
-1j7e => 71546
-1kgp => 73177
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/savetofile.xml b/reference/quickhash/quickhashstringinthash/savetofile.xml
deleted file mode 100644
index 7fa64f6f7c..0000000000
--- a/reference/quickhash/quickhashstringinthash/savetofile.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.savetofile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::saveToFile</refname>
-  <refpurpose>This method stores an in-memory hash to disk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>QuickHashStringIntHash::saveToFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method stores an existing hash to a file on disk, in the same format
-   that loadFromFile() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The filename of the file to store the hash in.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::saveToFile</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 1024 );
-var_dump( $hash->add( "fourty three", 42 ) );
-var_dump( $hash->add( "fifty two", 52 ) );
-
-$hash->saveToFile( '/tmp/test.hash.string' );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/savetostring.xml b/reference/quickhash/quickhashstringinthash/savetostring.xml
deleted file mode 100644
index ecb26752d4..0000000000
--- a/reference/quickhash/quickhashstringinthash/savetostring.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.savetostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::saveToString</refname>
-  <refpurpose>This method returns a serialized version of the hash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>QuickHashStringIntHash::saveToString</methodname><void/>
-  </methodsynopsis>
-  <para>
-   This method returns a serialized version of the hash in the same format that
-   loadFromString() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a serialized format of an existing hash, in the same format
-   that loadFromString() can read.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::saveToString</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 1024 );
-var_dump( $hash->add( "fourty three", 42 ) );
-var_dump( $hash->add( "fifty two", 52 ) );
-
-var_dump( $hash->saveToString() );
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/set.xml b/reference/quickhash/quickhashstringinthash/set.xml
deleted file mode 100644
index e26a89d2a4..0000000000
--- a/reference/quickhash/quickhashstringinthash/set.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::set</refname>
-  <refpurpose>This method updates an entry in the hash with a new value, or
-  adds a new one if the entry doesn't exist</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>QuickHashStringIntHash::set</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method tries to update an entry with a new value. In case the entry
-   did not yet exist, it will instead add a new entry. It returns whether the
-   entry was added or update. If there are duplicate keys, only the first
-   found element will get an updated value. Use
-   QuickHashStringIntHash::CHECK_FOR_DUPES during hash creation to prevent duplicate
-   keys from being part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add or update.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the entry to add. If a non-string is passed, it will be
-       converted to a string automatically if possible.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   2 if the entry was found and updated, 1 if the entry was newly added or 0
-   if there was an error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::set</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 1024 );
-
-echo "Set->Add\n";
-var_dump( $hash->get( "fourty six thousand six hundred ninety two" ) );
-var_dump( $hash->set( "fourty six thousand six hundred ninety two", 16091 ) );
-var_dump( $hash->get( "fourty six thousand six hundred ninety two" ) );
-
-echo "Set->Update\n";
-var_dump( $hash->set( "fourty six thousand six hundred ninety two", 29906 ) );
-var_dump( $hash->get( "fourty six thousand six hundred ninety two" ) );
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Set->Add
-bool(false)
-int(2)
-int(16091)
-Set->Update
-int(1)
-int(29906)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/quickhashstringinthash/update.xml b/reference/quickhash/quickhashstringinthash/update.xml
deleted file mode 100644
index 6836460cc0..0000000000
--- a/reference/quickhash/quickhashstringinthash/update.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="quickhashstringinthash.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>QuickHashStringIntHash::update</refname>
-  <refpurpose>This method updates an entry in the hash with a new value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::update</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method updates an entry with a new value, and returns whether the entry was
-   update. If there are duplicate keys, only the first found element will get
-   an updated value. Use QuickHashStringIntHash::CHECK_FOR_DUPES during hash
-   creation to prevent duplicate keys from being part of the hash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the entry to add.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The new value for the entry. If a non-string is passed, it will be
-       converted to a string automatically if possible.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; when the entry was found and updated, and &false; if the entry was
-   not part of the hash already.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>QuickHashStringIntHash::update</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 1024 );
-
-$hash->add( 'six', 314159265 );
-$hash->add( "a lot", 314159265 );
-
-echo $hash->get( 'six' ), "\n";
-echo $hash->get( 'a lot' ), "\n";
-
-var_dump( $hash->update( 'a lot', 314159266 ) ); 
-var_dump( $hash->update( "a lot plus one", 314159999 ) );
-
-echo $hash->get( 'six' ), "\n";
-echo $hash->get( 'a lot' ), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-314159265
-314159265
-bool(true)
-bool(false)
-314159265
-314159266
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/quickhash/reference.xml b/reference/quickhash/reference.xml
deleted file mode 100644
index 6524387406..0000000000
--- a/reference/quickhash/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.quickhash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Quickhash &Functions;</title>
-
- &reference.quickhash.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/quickhash/setup.xml b/reference/quickhash/setup.xml
deleted file mode 100644
index e6b918bbd8..0000000000
--- a/reference/quickhash/setup.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="quickhash.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="quickhash.requirements">
-  &reftitle.required;
-  <para>
-   This extension requires no additional libraries.
-  </para>
- </section>
-
- <section xml:id="quickhash.installation">
-  &reftitle.install;
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;quickhash">&url.pecl.package;quickhash</link>
-  </para>
- </section>
-
- <section xml:id="quickhash.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/quickhash/versions.xml b/reference/quickhash/versions.xml
deleted file mode 100644
index ab265c6cbc..0000000000
--- a/reference/quickhash/versions.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
-  <!-- Methods -->
-
- <function name='quickhashintset' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::__construct' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::add' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::exists' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::delete' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::getsize' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::loadfromfile' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::loadfromstring' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::savetofile' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintset::savetostring' from='PECL quickhash &gt;= Unknown'/>
-
- <function name='quickhashinthash' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::__construct' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::add' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::exists' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::get' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::set' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::update' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::delete' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::getsize' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::loadfromfile' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::loadfromstring' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::savetofile' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashinthash::savetostring' from='PECL quickhash &gt;= Unknown'/>
-
- <function name='quickhashintstringhash' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::__construct' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::add' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::exists' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::get' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::set' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::update' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::delete' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::getsize' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::loadfromfile' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::loadfromstring' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::savetofile' from='PECL quickhash &gt;= Unknown'/>
- <function name='quickhashintstringhash::savetostring' from='PECL quickhash &gt;= Unknown'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/radius/book.xml b/reference/radius/book.xml
index cd8c81846f..c36e275564 100644
--- a/reference/radius/book.xml
+++ b/reference/radius/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.radius" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Radius</title>
  
  <!-- {{{ preface -->
diff --git a/reference/radius/functions/radius-acct-open.xml b/reference/radius/functions/radius-acct-open.xml
index 1ece573975..283ab706da 100644
--- a/reference/radius/functions/radius-acct-open.xml
+++ b/reference/radius/functions/radius-acct-open.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-auth-open.xml b/reference/radius/functions/radius-auth-open.xml
index 5e54fe9036..60886bb8d8 100644
--- a/reference/radius/functions/radius-auth-open.xml
+++ b/reference/radius/functions/radius-auth-open.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-close.xml b/reference/radius/functions/radius-close.xml
index 56394ce78d..5bac7fb896 100644
--- a/reference/radius/functions/radius-close.xml
+++ b/reference/radius/functions/radius-close.xml
@@ -19,6 +19,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-cvt-addr.xml b/reference/radius/functions/radius-cvt-addr.xml
index ca48e99a3e..dec2b86973 100644
--- a/reference/radius/functions/radius-cvt-addr.xml
+++ b/reference/radius/functions/radius-cvt-addr.xml
@@ -14,7 +14,30 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
-   
+   Converts raw data to IP-Address
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>data</parameter></term>
+     <listitem>
+      <para>
+       Input data
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the IP-Address.
   </para>
  </refsect1>
 
diff --git a/reference/radius/functions/radius-cvt-int.xml b/reference/radius/functions/radius-cvt-int.xml
index 611b900104..a820977319 100644
--- a/reference/radius/functions/radius-cvt-int.xml
+++ b/reference/radius/functions/radius-cvt-int.xml
@@ -14,7 +14,30 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
+   Converts raw data to integer
+  </para>
+ </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>data</parameter></term>
+     <listitem>
+      <para>
+       Input data
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the integer, retrieved from data.
   </para>
  </refsect1>
 
diff --git a/reference/radius/functions/radius-cvt-string.xml b/reference/radius/functions/radius-cvt-string.xml
index 106428e11f..ef139354da 100644
--- a/reference/radius/functions/radius-cvt-string.xml
+++ b/reference/radius/functions/radius-cvt-string.xml
@@ -14,10 +14,32 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
-   
+   Converts raw data to string
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>data</parameter></term>
+     <listitem>
+      <para>
+       Input data
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the string, retrieved from data.
+  </para>
+ </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/radius/functions/radius-demangle-mppe-key.xml b/reference/radius/functions/radius-demangle-mppe-key.xml
index 7cc8446856..a515dc1c94 100644
--- a/reference/radius/functions/radius-demangle-mppe-key.xml
+++ b/reference/radius/functions/radius-demangle-mppe-key.xml
@@ -22,6 +22,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+    <varlistentry>
+     <term><parameter>mangled</parameter></term>
+     <listitem>
+      <para>
+       The mangled data to demangle
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-demangle.xml b/reference/radius/functions/radius-demangle.xml
index f54650e1c1..3cd6778f82 100644
--- a/reference/radius/functions/radius-demangle.xml
+++ b/reference/radius/functions/radius-demangle.xml
@@ -20,6 +20,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+    <varlistentry>
+     <term><parameter>mangled</parameter></term>
+     <listitem>
+      <para>
+       The mangled data to demangle
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-get-attr.xml b/reference/radius/functions/radius-get-attr.xml
index c76888eaec..d64399819c 100644
--- a/reference/radius/functions/radius-get-attr.xml
+++ b/reference/radius/functions/radius-get-attr.xml
@@ -23,6 +23,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-get-vendor-attr.xml b/reference/radius/functions/radius-get-vendor-attr.xml
index bbb389ae77..28fae2c107 100644
--- a/reference/radius/functions/radius-get-vendor-attr.xml
+++ b/reference/radius/functions/radius-get-vendor-attr.xml
@@ -21,6 +21,22 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>data</parameter></term>
+     <listitem>
+      <para>
+       Input data
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-put-attr.xml b/reference/radius/functions/radius-put-attr.xml
index 9b87844b33..dc1b0439ba 100644
--- a/reference/radius/functions/radius-put-attr.xml
+++ b/reference/radius/functions/radius-put-attr.xml
@@ -50,29 +50,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>radius_put_attr</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-mt_srand(time());
-$chall = mt_rand();
-$chapval = md5(pack('Ca*',1 , 'sepp' . $chall));
-$pass = pack('CH*', 1, $chapval);
-if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br />";
-    exit;
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -98,6 +75,29 @@ if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>radius_put_attr</function> example</title>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+mt_srand(time());
+$chall = mt_rand();
+$chapval = md5(pack('Ca*',1 , 'sepp' . $chall));
+$pass = pack('CH*', 1, $chapval);
+if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br />";
+    exit;
+}
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/radius/functions/radius-request-authenticator.xml b/reference/radius/functions/radius-request-authenticator.xml
index edeec62f2a..de39991bad 100644
--- a/reference/radius/functions/radius-request-authenticator.xml
+++ b/reference/radius/functions/radius-request-authenticator.xml
@@ -19,6 +19,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-send-request.xml b/reference/radius/functions/radius-send-request.xml
index c79fa8567d..3af0b72b95 100644
--- a/reference/radius/functions/radius-send-request.xml
+++ b/reference/radius/functions/radius-send-request.xml
@@ -24,6 +24,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-server-secret.xml b/reference/radius/functions/radius-server-secret.xml
index c77c1526fe..5df2c5c53e 100644
--- a/reference/radius/functions/radius-server-secret.xml
+++ b/reference/radius/functions/radius-server-secret.xml
@@ -19,6 +19,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/radius/functions/radius-strerror.xml b/reference/radius/functions/radius-strerror.xml
index 0bbb20393d..06c449fb02 100644
--- a/reference/radius/functions/radius-strerror.xml
+++ b/reference/radius/functions/radius-strerror.xml
@@ -18,6 +18,16 @@
    message can be retrieved with this function.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    &radius.parameter.handle;
+   </variablelist>
+  </para>
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/rar/book.xml b/reference/rar/book.xml
index 47de5be5e2..c28a471885 100644
--- a/reference/rar/book.xml
+++ b/reference/rar/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.rar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Rar Archiving</title>
  <titleabbrev>Rar</titleabbrev>
  
diff --git a/reference/rar/rarexception/setusingexceptions.xml b/reference/rar/rarexception/setusingexceptions.xml
index 73718ec555..e99025587b 100644
--- a/reference/rar/rarexception/setusingexceptions.xml
+++ b/reference/rar/rarexception/setusingexceptions.xml
@@ -51,6 +51,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/rar/setup.xml b/reference/rar/setup.xml
index 08bf16f120..e4f69b805c 100644
--- a/reference/rar/setup.xml
+++ b/reference/rar/setup.xml
@@ -54,8 +54,8 @@ phpize
   &reftitle.resources;
   <para>
    This extension registers three internal classes:
-   The archive representations returned by <function>rar_open</function> –
-   <type>RarArchive</type> –, the entry representations returned by
+   the archive representations returned by <function>rar_open</function> –
+   <type>RarArchive</type>, the entry representations returned by
    <function>rar_list</function> and <function>rar_entry_get</function> –
    <type>RarEntry</type> and the exception type <type>RarException</type>.
   </para>
diff --git a/reference/readline/constants.xml b/reference/readline/constants.xml
index 34cdf5dddc..5de58baac3 100644
--- a/reference/readline/constants.xml
+++ b/reference/readline/constants.xml
@@ -14,7 +14,6 @@
     <simpara>
      The library which is used for readline support; currently either
      <literal>readline</literal> or <literal>libedit</literal>.
-     Available as of PHP 5.5.0.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/readline/functions/readline-callback-handler-install.xml b/reference/readline/functions/readline-callback-handler-install.xml
index 9be019942c..3eaaa583f2 100644
--- a/reference/readline/functions/readline-callback-handler-install.xml
+++ b/reference/readline/functions/readline-callback-handler-install.xml
@@ -59,7 +59,7 @@
   </para>
  </refsect1>
  
- <refsect1 role="description">
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
diff --git a/reference/readline/functions/readline-callback-handler-remove.xml b/reference/readline/functions/readline-callback-handler-remove.xml
index e03de00410..c7c328ba75 100644
--- a/reference/readline/functions/readline-callback-handler-remove.xml
+++ b/reference/readline/functions/readline-callback-handler-remove.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/readline/functions/readline-callback-read-char.xml b/reference/readline/functions/readline-callback-read-char.xml
index e2e96f85a0..bec5b46d24 100644
--- a/reference/readline/functions/readline-callback-read-char.xml
+++ b/reference/readline/functions/readline-callback-read-char.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/readline/functions/readline-clear-history.xml b/reference/readline/functions/readline-clear-history.xml
index be8293ccdd..d1533e193d 100644
--- a/reference/readline/functions/readline-clear-history.xml
+++ b/reference/readline/functions/readline-clear-history.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/readline/functions/readline-list-history.xml b/reference/readline/functions/readline-list-history.xml
index ac79a9e972..4960fb7d64 100644
--- a/reference/readline/functions/readline-list-history.xml
+++ b/reference/readline/functions/readline-list-history.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/readline/functions/readline-on-new-line.xml b/reference/readline/functions/readline-on-new-line.xml
index 93bcb5ff18..7c588428fd 100644
--- a/reference/readline/functions/readline-on-new-line.xml
+++ b/reference/readline/functions/readline-on-new-line.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -24,6 +29,15 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function is only available if supported by the underlying readline library.
+    It is not supported on Windows.
+   </para>
+  </note>
+ </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/readline/functions/readline-redisplay.xml b/reference/readline/functions/readline-redisplay.xml
index 68a73e92a2..90dcd13af0 100644
--- a/reference/readline/functions/readline-redisplay.xml
+++ b/reference/readline/functions/readline-redisplay.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/readline/ini.xml b/reference/readline/ini.xml
index b532990626..88f7ad270e 100644
--- a/reference/readline/ini.xml
+++ b/reference/readline/ini.xml
@@ -21,13 +21,13 @@
       <entry><link linkend="ini.cli.pager">cli.pager</link></entry>
       <entry>""</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 5.4.0.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.cli.prompt">cli.prompt</link></entry>
       <entry>"\\b \\> "</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 5.4.0.</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/recode/book.xml b/reference/recode/book.xml
index a858fdcfe3..e90f00b168 100644
--- a/reference/recode/book.xml
+++ b/reference/recode/book.xml
@@ -2,7 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.recode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>GNU Recode</title>
  <titleabbrev>Recode</titleabbrev>
 
diff --git a/reference/reflection/book.xml b/reference/reflection/book.xml
index 7847ce174d..40e8521d19 100644
--- a/reference/reflection/book.xml
+++ b/reference/reflection/book.xml
@@ -43,6 +43,7 @@
  &reference.reflection.reflectionuniontype;
  &reference.reflection.reflectiongenerator;
  &reference.reflection.reflectionreference;
+ &reference.reflection.reflectionattribute;
  &reference.reflection.reflector;
  &reference.reflection.reflectionexception;
 
diff --git a/reference/reflection/configure.xml b/reference/reflection/configure.xml
index 5ff64fede0..060470ff79 100644
--- a/reference/reflection/configure.xml
+++ b/reference/reflection/configure.xml
@@ -5,7 +5,7 @@
  &reftitle.install;
 
  <para>
-  The reflection extension is enabled by default, as of PHP 5.
+  The reflection extension is enabled by default.
  </para>
 
 </section>
diff --git a/reference/reflection/reflection/export.xml b/reference/reflection/reflection/export.xml
index 45282665bf..fec5703c2a 100644
--- a/reference/reflection/reflection/export.xml
+++ b/reference/reflection/reflection/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection.xml b/reference/reflection/reflectionattribute.xml
similarity index 56%
rename from reference/mysqlnd_uh/mysqlnduhconnection.xml
rename to reference/reflection/reflectionattribute.xml
index b2f6c6dcaf..9bc536cb01 100644
--- a/reference/mysqlnd_uh/mysqlnduhconnection.xml
+++ b/reference/reflection/reflectionattribute.xml
@@ -1,39 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<phpdoc:classref xml:id="class.mysqlnduhconnection" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<phpdoc:classref xml:id="class.reflectionattribute" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
- <title>The MysqlndUhConnection class</title>
- <titleabbrev>MysqlndUhConnection</titleabbrev>
+ <title>The ReflectionAttribute class</title>
+ <titleabbrev>ReflectionAttribute</titleabbrev>
 
  <partintro>
 
-<!-- {{{ MysqlndUhConnection intro -->
-  <section xml:id="mysqlnduhconnection.intro">
+<!-- {{{ ReflectionAttribute intro -->
+  <section xml:id="reflectionattribute.intro">
    &reftitle.intro;
    <para>
-
+    The <classname>ReflectionAttribute</classname> class provides information about
+    an <link linkend="language.attributes">Attributes</link>.
    </para>
   </section>
 <!-- }}} -->
 
-  <section xml:id="mysqlnduhconnection.synopsis">
+  <section xml:id="reflectionattribute.synopsis">
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
    <classsynopsis>
-    <ooclass><classname>MysqlndUhConnection</classname></ooclass>
+    <ooclass><classname>ReflectionAttribute</classname></ooclass>
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
      <ooclass>
-      <classname>MysqlndUhConnection</classname>
+      <modifier>final</modifier> <classname>ReflectionAttribute</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysqlnduhconnection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.reflectionattribute')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.reflectionattribute')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+
    </classsynopsis>
 <!-- }}} -->
 
@@ -41,7 +46,7 @@
 
  </partintro>
 
- &reference.mysqlnd-uh.entities.mysqlnduhconnection;
+ &reference.reflection.entities.reflectionattribute;
 
 </phpdoc:classref>
 
diff --git a/reference/sphinx/sphinxclient/construct.xml b/reference/reflection/reflectionattribute/construct.xml
similarity index 62%
rename from reference/sphinx/sphinxclient/construct.xml
rename to reference/reflection/reflectionattribute/construct.xml
index 67b52b6e40..a2a28c47e0 100644
--- a/reference/sphinx/sphinxclient/construct.xml
+++ b/reference/reflection/reflectionattribute/construct.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="reflectionattribute.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>SphinxClient::__construct</refname>
-  <refpurpose>Create a new SphinxClient object</refpurpose>
+  <refname>ReflectionAttribute::__construct</refname>
+  <refpurpose>Private constructor to disallow direct instantiation</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SphinxClient::__construct</methodname>
+  <constructorsynopsis>
+   <modifier>private</modifier> <methodname>ReflectionAttribute::__construct</methodname>
    <void />
-  </methodsynopsis>
-  <para>
-   Creates a new <classname>SphinxClient</classname> object.
-  </para>
+  </constructorsynopsis>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,7 +20,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/suhosin/functions/suhosin-get-raw-cookies.xml b/reference/reflection/reflectionattribute/getarguments.xml
similarity index 72%
rename from reference/suhosin/functions/suhosin-get-raw-cookies.xml
rename to reference/reflection/reflectionattribute/getarguments.xml
index 3efd51455f..889079772e 100644
--- a/reference/suhosin/functions/suhosin-get-raw-cookies.xml
+++ b/reference/reflection/reflectionattribute/getarguments.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="function.suhosin-get-raw-cookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="reflectionattribute.getarguments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>suhosin_get_raw_cookies</refname>
-  <refpurpose>Returns an array containing the raw cookie values</refpurpose>
+  <refname>ReflectionAttribute::getArguments</refname>
+  <refpurpose>Gets arguments passed to attribute.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>suhosin_get_raw_cookies</methodname>
+   <modifier>public</modifier> <type>array</type><methodname>ReflectionAttribute::getArguments</methodname>
    <void />
   </methodsynopsis>
   <para>
-
+   Gets arguments passed to attribute.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,11 +27,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an array containing the raw cookie values.
+   The arguments passed to attribute.
   </para>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/construct.xml b/reference/reflection/reflectionattribute/getname.xml
similarity index 69%
rename from reference/mysqlnd_uh/mysqlnduhconnection/construct.xml
rename to reference/reflection/reflectionattribute/getname.xml
index db4290e616..599e07df0c 100644
--- a/reference/mysqlnd_uh/mysqlnduhconnection/construct.xml
+++ b/reference/reflection/reflectionattribute/getname.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="mysqlnduhconnection.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="reflectionattribute.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MysqlndUhConnection::__construct</refname>
-  <refpurpose>The __construct purpose</refpurpose>
+  <refname>ReflectionAttribute::getName</refname>
+  <refpurpose>Gets attribute name</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <methodname>MysqlndUhConnection::__construct</methodname>
+   <modifier>public</modifier> <type>string</type><methodname>ReflectionAttribute::getName</methodname>
    <void />
   </methodsynopsis>
   <para>
-
+   Gets the attributes name.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,11 +27,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-
+   The name of the attibute.
   </para>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/reflection/reflectionattribute/gettarget.xml b/reference/reflection/reflectionattribute/gettarget.xml
new file mode 100644
index 0000000000..eda301abdc
--- /dev/null
+++ b/reference/reflection/reflectionattribute/gettarget.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="reflectionattribute.gettarget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>ReflectionAttribute::getTarget</refname>
+  <refpurpose>Returns the target of the attribute as bitmask.</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier> <type>int</type><methodname>ReflectionAttribute::getTarget</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+   Gets target of the attribute as bitmask.
+  </para>
+
+  &warn.undocumented.func;
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   <!-- TODO: we should add target constant Attribute::TARGET_METHOD, and so on... -->
+   Gets target of the attribute as bitmask.
+  </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/reflection/reflectionattribute/isrepeated.xml b/reference/reflection/reflectionattribute/isrepeated.xml
new file mode 100644
index 0000000000..c4e465dcb3
--- /dev/null
+++ b/reference/reflection/reflectionattribute/isrepeated.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="reflectionattribute.isrepeated" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>ReflectionAttribute::isRepeated</refname>
+  <refpurpose>Returns whether the attribute of this name could occur repeatedly on a code element.</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier> <type>bool</type><methodname>ReflectionAttribute::isRepeated</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+   Returns whether the attribute of this name could occur repeatedly on a code element.
+  </para>
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns &true; when attribute is used repeatedly, otherwise &false;.
+  </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongo/mongowriteconcernexception/getdocument.xml b/reference/reflection/reflectionattribute/newinstance.xml
similarity index 61%
rename from reference/mongo/mongowriteconcernexception/getdocument.xml
rename to reference/reflection/reflectionattribute/newinstance.xml
index dac57cbccf..0e2ba4dd61 100644
--- a/reference/mongo/mongowriteconcernexception/getdocument.xml
+++ b/reference/reflection/reflectionattribute/newinstance.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="mongowriteconcernexception.getdocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="reflectionattribute.newinstance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MongoWriteConcernException::getDocument</refname>
-  <refpurpose>Get the error document</refpurpose>
+  <refname>ReflectionAttribute::newInstance</refname>
+  <refpurpose>Instantiates the attribute class represented by this ReflectionAttribute class and arguments.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>MongoWriteConcernException::getDocument</methodname>
+   <modifier>public</modifier> <type>object</type><methodname>ReflectionAttribute::newInstance</methodname>
    <void />
   </methodsynopsis>
   <para>
-   Returns the actual response from the server that was interperated as an error.
+   Instantiates the attribute class represented by this ReflectionAttribute class and arguments.
   </para>
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,11 +26,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A MongoDB document, if available, as an array.
+   New instance of the attribute.
   </para>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/reflection/reflectionclass/export.xml b/reference/reflection/reflectionclass/export.xml
index 1bf7c7b467..efb108bbb9 100644
--- a/reference/reflection/reflectionclass/export.xml
+++ b/reference/reflection/reflectionclass/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflectionclass/getattributes.xml b/reference/reflection/reflectionclass/getattributes.xml
new file mode 100644
index 0000000000..ce21a533bf
--- /dev/null
+++ b/reference/reflection/reflectionclass/getattributes.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="reflectionclass.getattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>ReflectionClass::getAttributes</refname>
+  <refpurpose>Gets Attributes</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>ReflectionClass::getAttributes</methodname>
+   <methodparam><type>string</type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
+  </methodsynopsis>
+  <para>
+   Returns all attributes declared on this class as an array of <type>ReflectionAttribute</type>.
+  </para>
+
+  &warn.undocumented.func;
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>name</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>flags</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Array of attributes, as a <classname>ReflectionAttribute</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><methodname>ReflectionClassConstant::getAttributes</methodname></member>
+    <member><methodname>ReflectionFunctionAbstract::getAttributes</methodname></member>
+    <member><methodname>ReflectionParameter::getAttributes</methodname></member>
+    <member><methodname>ReflectionProperty::getAttributes</methodname></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/reflection/reflectionclass/newinstanceargs.xml b/reference/reflection/reflectionclass/newinstanceargs.xml
index b776957df6..d46425bd65 100644
--- a/reference/reflection/reflectionclass/newinstanceargs.xml
+++ b/reference/reflection/reflectionclass/newinstanceargs.xml
@@ -41,6 +41,17 @@
    Returns a new instance of the class.
   </para>
  </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   A <classname>ReflectionException</classname> if the class constructor is not public.
+  </para>
+  <para>
+   A <classname>ReflectionException</classname> if the class does not have a constructor
+   and the <parameter>args</parameter> parameter contains one or more parameters.
+  </para>
+ </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
@@ -69,17 +80,6 @@ object(ReflectionFunction)#2 (1) {
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   A <classname>ReflectionException</classname> if the class constructor is not public.
-  </para>
-  <para>
-   A <classname>ReflectionException</classname> if the class does not have a constructor
-   and the <parameter>args</parameter> parameter contains one or more parameters.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml b/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml
index 7ed357ca16..c6f77c204c 100644
--- a/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml
+++ b/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml
@@ -30,37 +30,12 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        All internal classes can now be instantiated except for those declared
-        <link linkend="language.oop5.final">final</link>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
    A <classname>ReflectionException</classname> if the class is an internal
-   class that cannot be instantiated without invoking the constructor. In PHP
-   5.6.0 onwards, this exception is limited only to internal classes that are
+   class that cannot be instantiated without invoking the constructor.
+   This exception is limited only to internal classes that are
    <link linkend="language.oop5.final">final</link>.
   </para>
  </refsect1>
diff --git a/reference/reflection/reflectionclassconstant.xml b/reference/reflection/reflectionclassconstant.xml
index ab979c009d..c7466d5f43 100644
--- a/reference/reflection/reflectionclassconstant.xml
+++ b/reference/reflection/reflectionclassconstant.xml
@@ -41,16 +41,19 @@
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionclassconstant.constants.is-public">ReflectionClassConstant::IS_PUBLIC</varname>
+     <initializer>1</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionclassconstant.constants.is-protected">ReflectionClassConstant::IS_PROTECTED</varname>
+     <initializer>2</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionclassconstant.constants.is-private">ReflectionClassConstant::IS_PRIVATE</varname>
+     <initializer>4</initializer>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
@@ -114,6 +117,7 @@
        <para>
         Indicates <link linkend="language.oop5.visibility">public</link>
         constants.
+        Prior to PHP 7.4.0, the value was <literal>256</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -124,6 +128,7 @@
        <para>
         Indicates <link linkend="language.oop5.visibility">protected</link>
         constants.
+        Prior to PHP 7.4.0, the value was <literal>512</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -134,11 +139,19 @@
        <para>
         Indicates <link linkend="language.oop5.visibility">private</link>
         constants.
+        Prior to PHP 7.4.0, the value was <literal>1024</literal>.
        </para>
       </listitem>
      </varlistentry>
 
     </variablelist>
+    <note>
+     <para>
+      The values of these constants may change between PHP versions.
+      It is recommended to always use the constants
+      and not rely on the values directly.
+     </para>
+    </note>
    </section>
   </section>
 <!-- }}} -->
diff --git a/reference/reflection/reflectionclassconstant/export.xml b/reference/reflection/reflectionclassconstant/export.xml
index 920f910a6d..03680739f0 100644
--- a/reference/reflection/reflectionclassconstant/export.xml
+++ b/reference/reflection/reflectionclassconstant/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflectionclassconstant/getattributes.xml b/reference/reflection/reflectionclassconstant/getattributes.xml
new file mode 100644
index 0000000000..b8037089a0
--- /dev/null
+++ b/reference/reflection/reflectionclassconstant/getattributes.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="reflectionclassconstant.getattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>ReflectionClassConstant::getAttributes</refname>
+  <refpurpose>Gets Attributes</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>ReflectionClassConstant::getAttributes</methodname>
+   <methodparam><type>string</type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
+  </methodsynopsis>
+  <para>
+   Returns all attributes declared on this class constant as an array of <type>ReflectionAttribute</type>.
+  </para>
+
+  &warn.undocumented.func;
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>name</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>flags</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Array of attributes, as a <classname>ReflectionAttribute</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><methodname>ReflectionClass::getAttributes</methodname></member>
+    <member><methodname>ReflectionFunctionAbstract::getAttributes</methodname></member>
+    <member><methodname>ReflectionParameter::getAttributes</methodname></member>
+    <member><methodname>ReflectionProperty::getAttributes</methodname></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/reflection/reflectionclassconstant/getmodifiers.xml b/reference/reflection/reflectionclassconstant/getmodifiers.xml
index 910c460cc1..9d04db297d 100644
--- a/reference/reflection/reflectionclassconstant/getmodifiers.xml
+++ b/reference/reflection/reflectionclassconstant/getmodifiers.xml
@@ -27,8 +27,8 @@
   &reftitle.returnvalues;
   <para>
    A numeric representation of the modifiers.
-   The actual meanings of these modifiers are described in the
-   <link linkend="reflectionmethod.constants.modifiers">predefined constants</link>.
+   The actual meaning of these modifiers are described under
+   <link linkend="reflectionclassconstant.constants.modifiers">predefined constants</link>.
   </para>
  </refsect1>
 
diff --git a/reference/reflection/reflectionextension/export.xml b/reference/reflection/reflectionextension/export.xml
index 36460c847f..eb01887107 100644
--- a/reference/reflection/reflectionextension/export.xml
+++ b/reference/reflection/reflectionextension/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflectionfunction/export.xml b/reference/reflection/reflectionfunction/export.xml
index ed379d441a..fe7426e86e 100644
--- a/reference/reflection/reflectionfunction/export.xml
+++ b/reference/reflection/reflectionfunction/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflectionfunction/invoke.xml b/reference/reflection/reflectionfunction/invoke.xml
index 4324c0c9ca..58b79bc772 100644
--- a/reference/reflection/reflectionfunction/invoke.xml
+++ b/reference/reflection/reflectionfunction/invoke.xml
@@ -76,7 +76,8 @@ Dr. Phil
   &reftitle.notes;
   <note>
    <para>
-    &reflection.invoke.reference;
+    <methodname>ReflectionFunction::invoke</methodname> cannot be used when reference parameters are expected.
+    <methodname>ReflectionFunction::invokeArgs</methodname> has to be used instead (passing references in the argument list).
    </para>
   </note>
  </refsect1>
diff --git a/reference/mysqlnd_ms/functions/mysqlnd-ms-fabric-select-global.xml b/reference/reflection/reflectionfunctionabstract/getattributes.xml
similarity index 50%
rename from reference/mysqlnd_ms/functions/mysqlnd-ms-fabric-select-global.xml
rename to reference/reflection/reflectionfunctionabstract/getattributes.xml
index fee5dc5ea6..cfa805a2ea 100644
--- a/reference/mysqlnd_ms/functions/mysqlnd-ms-fabric-select-global.xml
+++ b/reference/reflection/reflectionfunctionabstract/getattributes.xml
@@ -1,73 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="function.mysqlnd-ms-fabric-select-global" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="reflectionfunctionabstract.getattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>mysqlnd_ms_fabric_select_global</refname>
-  <refpurpose>Switch to global sharding server for a given table</refpurpose>
+  <refname>ReflectionFunctionAbstract::getAttributes</refname>
+  <refpurpose>Gets Attributes</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type>
-   <methodname>mysqlnd_ms_fabric_select_global</methodname>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>table_name</parameter></methodparam>
+   <modifier>public</modifier> <type>array</type><methodname>ReflectionFunctionAbstract::getAttributes</methodname>
+   <methodparam><type>string</type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
+  <para>
+   Returns all attributes declared on this function or method as an array of <type>ReflectionAttribute</type>.
+  </para>
 
   &warn.undocumented.func;
 
-  <para>
-    MySQL Fabric related.
-  </para>
-  <para>
-    Switch the connection to the nodes handling global sharding queries
-    for the given table name.
-  </para>
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>connection</parameter></term>
+    <term><parameter>name</parameter></term>
     <listitem>
      <para>
-      A MySQL connection handle obtained from any of the
-      connect functions of the <link linkend="ref.mysqli">mysqli</link>,
-      <link linkend="ref.mysql">mysql</link> or
-      <link linkend="ref.pdo-mysql">PDO_MYSQL</link> extensions.
+
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>table_name</parameter></term>
+    <term><parameter>flags</parameter></term>
     <listitem>
      <para>
-      The table name to ask Fabric about.
+
      </para>
     </listitem>
    </varlistentry>
-
   </variablelist>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &false; on error. Otherwise, &true;
+   Array of attributes, as a <classname>ReflectionAttribute</classname> object.
   </para>
  </refsect1>
 
- <refsect1>
-  &reftitle.notes;
-  <note>
-   <para>
-    <function>mysqlnd_ms_fabric_select_global</function> requires
-    PECL mysqlnd_ms &gt;> 1.6.0.
-   </para>
-  </note>
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><methodname>ReflectionClass::getAttributes</methodname></member>
+    <member><methodname>ReflectionClassConstant::getAttributes</methodname></member>
+    <member><methodname>ReflectionParameter::getAttributes</methodname></member>
+    <member><methodname>ReflectionProperty::getAttributes</methodname></member>
+   </simplelist>
+  </para>
  </refsect1>
 
 </refentry>
diff --git a/reference/reflection/reflectionfunctionabstract/getparameters.xml b/reference/reflection/reflectionfunctionabstract/getparameters.xml
index 0dbf610662..aaa7b74574 100644
--- a/reference/reflection/reflectionfunctionabstract/getparameters.xml
+++ b/reference/reflection/reflectionfunctionabstract/getparameters.xml
@@ -14,7 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Get the parameters as an array of <type>ReflectionParameter</type>.
+   Get the parameters as an array of <type>ReflectionParameter</type>,
+   in the order in which they are defined in the source.
   </para>
 
   &warn.undocumented.func;
diff --git a/reference/reflection/reflectionmethod.xml b/reference/reflection/reflectionmethod.xml
index 372d855898..7b5951a65f 100644
--- a/reference/reflection/reflectionmethod.xml
+++ b/reference/reflection/reflectionmethod.xml
@@ -46,38 +46,38 @@
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionmethod.constants.is-static">ReflectionMethod::IS_STATIC</varname>
-     <initializer>1</initializer>
+     <initializer>16</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionmethod.constants.is-public">ReflectionMethod::IS_PUBLIC</varname>
-     <initializer>256</initializer>
+     <initializer>1</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionmethod.constants.is-protected">ReflectionMethod::IS_PROTECTED</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="reflectionmethod.constants.is-private">ReflectionMethod::IS_PRIVATE</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="reflectionmethod.constants.is-abstract">ReflectionMethod::IS_ABSTRACT</varname>
      <initializer>2</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="reflectionmethod.constants.is-final">ReflectionMethod::IS_FINAL</varname>
+     <varname linkend="reflectionmethod.constants.is-private">ReflectionMethod::IS_PRIVATE</varname>
      <initializer>4</initializer>
     </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="reflectionmethod.constants.is-abstract">ReflectionMethod::IS_ABSTRACT</varname>
+     <initializer>64</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="reflectionmethod.constants.is-final">ReflectionMethod::IS_FINAL</varname>
+     <initializer>32</initializer>
+    </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
@@ -136,46 +136,71 @@
      <varlistentry xml:id="reflectionmethod.constants.is-static">
       <term><constant>ReflectionMethod::IS_STATIC</constant></term>
       <listitem>
-       <para>Indicates that the method is static.</para>
+       <para>
+        Indicates that the method is static.
+        Prior to PHP 7.4.0, the value was <literal>1</literal>.
+       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="reflectionmethod.constants.is-public">
       <term><constant>ReflectionMethod::IS_PUBLIC</constant></term>
       <listitem>
-       <para>Indicates that the method is public.</para>
+       <para>
+        Indicates that the method is public.
+        Prior to PHP 7.4.0, the value was <literal>256</literal>.
+       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="reflectionmethod.constants.is-protected">
       <term><constant>ReflectionMethod::IS_PROTECTED</constant></term>
       <listitem>
-       <para>Indicates that the method is protected.</para>
+       <para>
+        Indicates that the method is protected.
+        Prior to PHP 7.4.0, the value was <literal>512</literal>.
+       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="reflectionmethod.constants.is-private">
       <term><constant>ReflectionMethod::IS_PRIVATE</constant></term>
       <listitem>
-       <para>Indicates that the method is private.</para>
+       <para>
+        Indicates that the method is private.
+        Prior to PHP 7.4.0, the value was <literal>1024</literal>.
+       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="reflectionmethod.constants.is-abstract">
       <term><constant>ReflectionMethod::IS_ABSTRACT</constant></term>
       <listitem>
-       <para>Indicates that the method is abstract.</para>
+       <para>
+        Indicates that the method is abstract.
+        Prior to PHP 7.4.0, the value was <literal>2</literal>.
+       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="reflectionmethod.constants.is-final">
       <term><constant>ReflectionMethod::IS_FINAL</constant></term>
       <listitem>
-       <para>Indicates that the method is final.</para>
+       <para>
+        Indicates that the method is final.
+        Prior to PHP 7.4.0, the value was <literal>4</literal>.
+       </para>
       </listitem>
      </varlistentry>
 
     </variablelist>
+    <note>
+     <para>
+      The values of these constants may change between PHP versions.
+      It is recommended to always use the constants
+      and not rely on the values directly.
+     </para>
+    </note>
    </section>
   </section>
 <!-- }}} -->
diff --git a/reference/reflection/reflectionmethod/export.xml b/reference/reflection/reflectionmethod/export.xml
index 9de62318fa..cb7b2fe457 100644
--- a/reference/reflection/reflectionmethod/export.xml
+++ b/reference/reflection/reflectionmethod/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflectionmethod/getmodifiers.xml b/reference/reflection/reflectionmethod/getmodifiers.xml
index c0b9f17437..8b6a1d1b98 100644
--- a/reference/reflection/reflectionmethod/getmodifiers.xml
+++ b/reference/reflection/reflectionmethod/getmodifiers.xml
@@ -26,8 +26,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A numeric representation of the modifiers. The modifiers are listed below.
-   The actual meanings of these modifiers are described in the
+   A numeric representation of the modifiers.
+   The actual meaning of these modifiers are described under
    <link linkend="reflectionmethod.constants.modifiers">predefined constants</link>.
   </para>
  </refsect1>
@@ -70,10 +70,10 @@ echo implode(' ', Reflection::getModifierNames($bar->getModifiers()));
     <screen>
 <![CDATA[
 Modifiers for method foo():
-261
+49
 final public static
 Modifiers for method bar():
-65792
+1
 public
 ]]>
     </screen>
diff --git a/reference/reflection/reflectionmethod/invoke.xml b/reference/reflection/reflectionmethod/invoke.xml
index b4a45c9a3d..1f0ad71d11 100644
--- a/reference/reflection/reflectionmethod/invoke.xml
+++ b/reference/reflection/reflectionmethod/invoke.xml
@@ -98,7 +98,8 @@ Hello Mike
   &reftitle.notes;
   <note>
    <para>
-    &reflection.invoke.reference;
+    <methodname>ReflectionMethod::invoke</methodname> cannot be used when reference parameters are expected.
+    <methodname>ReflectionMethod::invokeArgs</methodname> has to be used instead (passing references in the argument list).
    </para>
   </note>
  </refsect1>
diff --git a/reference/reflection/reflectionnamedtype/isbuiltin.xml b/reference/reflection/reflectionnamedtype/isbuiltin.xml
index 1e18bb8c14..f6f5f719f9 100644
--- a/reference/reflection/reflectionnamedtype/isbuiltin.xml
+++ b/reference/reflection/reflectionnamedtype/isbuiltin.xml
@@ -14,7 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
-   Checks if the type is a built-in type in PHP.
+   Checks if the type is a built-in type in PHP. A built-in type is any type that
+   is not a class, interface, or trait.
   </para>
  </refsect1>
 
diff --git a/reference/reflection/reflectionobject/export.xml b/reference/reflection/reflectionobject/export.xml
index 3c82e727e5..736c8d0bf6 100644
--- a/reference/reflection/reflectionobject/export.xml
+++ b/reference/reflection/reflectionobject/export.xml
@@ -7,6 +7,10 @@
   <refpurpose>Export</refpurpose>
  </refnamediv>
 
+ <refsynopsisdiv>
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
+ </refsynopsisdiv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
diff --git a/reference/reflection/reflectionparameter/construct.xml b/reference/reflection/reflectionparameter/construct.xml
index 4fd1f48cff..9040f36613 100644
--- a/reference/reflection/reflectionparameter/construct.xml
+++ b/reference/reflection/reflectionparameter/construct.xml
@@ -75,7 +75,7 @@ foreach ($reflect->getParameters() as $i => $param) {
         "   Passed to by reference: %s\n".
         "   Is optional?: %s\n".
         "}\n",
-        $i, // $param->getPosition() can be used from PHP 5.2.3
+        $i, // $param->getPosition() can be used
         $param->getName(),
         var_export($param->getClass(), 1),
         var_export($param->allowsNull(), 1),
diff --git a/reference/reflection/reflectionparameter/export.xml b/reference/reflection/reflectionparameter/export.xml
index 68424f4130..479bb0de81 100644
--- a/reference/reflection/reflectionparameter/export.xml
+++ b/reference/reflection/reflectionparameter/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflectionparameter/getattributes.xml b/reference/reflection/reflectionparameter/getattributes.xml
new file mode 100644
index 0000000000..2bfdd5be37
--- /dev/null
+++ b/reference/reflection/reflectionparameter/getattributes.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="reflectionparameter.getattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>ReflectionParameter::getAttributes</refname>
+  <refpurpose>Gets Attributes</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>ReflectionParameter::getAttributes</methodname>
+   <methodparam><type>string</type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
+  </methodsynopsis>
+  <para>
+   Returns all attributes declared on this parameter as an array of <type>ReflectionAttribute</type>.
+  </para>
+
+  &warn.undocumented.func;
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>name</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>flags</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Array of attributes, as a <classname>ReflectionAttribute</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><methodname>ReflectionClass::getAttributes</methodname></member>
+    <member><methodname>ReflectionClassConstant::getAttributes</methodname></member>
+    <member><methodname>ReflectionFunctionAbstract::getAttributes</methodname></member>
+    <member><methodname>ReflectionProperty::getAttributes</methodname></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/reflection/reflectionparameter/getclass.xml b/reference/reflection/reflectionparameter/getclass.xml
index b260bddae3..d4df4b1a25 100644
--- a/reference/reflection/reflectionparameter/getclass.xml
+++ b/reference/reflection/reflectionparameter/getclass.xml
@@ -19,6 +19,11 @@
   <para>
    Gets the class type hinted for the parameter as a <classname>ReflectionClass</classname> object.
   </para>
+  <para>
+   As of PHP 8.0.0 this function is deprecated and not recommended. Instead, use
+   <methodname>ReflectionParameter::getType</methodname> to get the <classname>ReflectionType</classname>
+   of the parameter, then interrogate that object to determine the parameter type.
+  </para>
 
   &warn.undocumented.func;
 
@@ -36,7 +41,7 @@
    or the declared type is not a class or interface.
   </para>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -55,12 +60,6 @@ echo $aParameter->getClass()->name;
 ?>
 ]]>
     </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Exception
-]]>
-    </screen>
    </example>
   </para>
  </refsect1>
diff --git a/reference/reflection/reflectionparameter/gettype.xml b/reference/reflection/reflectionparameter/gettype.xml
index a4a67bbae8..6933de3765 100644
--- a/reference/reflection/reflectionparameter/gettype.xml
+++ b/reference/reflection/reflectionparameter/gettype.xml
@@ -92,6 +92,32 @@ NULL
 ]]>
     </screen>
    </example>
+   <example>
+   <title><methodname>ReflectionParameter::getType</methodname> Usage in PHP 8.0.0 and later</title>
+    <para>
+     As of PHP 8.0.0, this method may return a <classname>ReflectionNamedType</classname> instance or
+     a <classname>ReflectionUnionType</classname> instance.  The latter is a collection of the former.
+     To analyze a type, it is often convenient to normalize it to an array of <classname>ReflectionNamedType</classname>
+     objects.  The following function will return an array of <literal>0</literal> or more <classname>ReflectionNamedType</classname>
+     instances.
+    </para>
+   <programlisting role="php">
+<![CDATA[
+<?php
+function getAllTypes(ReflectionParameter $reflectionParameter): array
+{
+    $reflectionType = $reflectionParameter->getType();
+
+    if (!$reflectionType) return [];
+
+    return $reflectionType instanceof ReflectionUnionType
+        ? $reflectionType->getTypes()
+        : [$reflectionType];
+}
+?>
+]]>
+   </programlisting>
+  </example>
   </para>
  </refsect1>
 
diff --git a/reference/reflection/reflectionparameter/isarray.xml b/reference/reflection/reflectionparameter/isarray.xml
index 50945444bf..5974b61658 100644
--- a/reference/reflection/reflectionparameter/isarray.xml
+++ b/reference/reflection/reflectionparameter/isarray.xml
@@ -9,6 +9,7 @@
 
  <refsynopsisdiv>
    &warn.deprecated.function-8-0-0;
+  <para>See the example below for an alternative way to derive this information.</para>
  </refsynopsisdiv>
 
  <refsect1 role="description">
@@ -34,6 +35,37 @@
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>PHP 8.0.0 equivalent</title>
+    <para>
+     As of PHP 8.0.0, the following code will report if a type declares arrays,
+     including as part of a union.
+    </para>
+    <programlisting role="php">
+<![CDATA[
+<?php
+function declaresArray(ReflectionParameter $reflectionParameter): bool
+{
+    $reflectionType = $reflectionParameter->getType();
+
+    if (!$reflectionType) return false;
+
+    $types = $reflectionType instanceof ReflectionUnionType
+        ? $reflectionType->getTypes()
+        : [$reflectionType];
+
+   return in_array('array', array_map(fn(ReflectionNamedType $t) => $t->getName(), $types));
+}
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/reflection/reflectionparameter/iscallable.xml b/reference/reflection/reflectionparameter/iscallable.xml
index cb6a99e229..33dca2292f 100644
--- a/reference/reflection/reflectionparameter/iscallable.xml
+++ b/reference/reflection/reflectionparameter/iscallable.xml
@@ -9,6 +9,7 @@
 
  <refsynopsisdiv>
    &warn.deprecated.function-8-0-0;
+  <para>See the example below for an alternative way to derive this information.</para>
  </refsynopsisdiv>
 
  <refsect1 role="description">
@@ -38,6 +39,36 @@
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+ &reftitle.examples;
+ <para>
+  <example>
+   <title>PHP 8.0.0 equivalent</title>
+   <para>
+    As of PHP 8.0.0, the following code will report if a type supports callables,
+    including as part of a union.
+   </para>
+   <programlisting role="php">
+<![CDATA[
+<?php
+function declaresCallable(ReflectionParameter $reflectionParameter): bool
+{
+    $reflectionType = $reflectionParameter->getType();
+
+    if (!$reflectionType) return false;
+
+    $types = $reflectionType instanceof ReflectionUnionType
+        ? $reflectionType->getTypes()
+        : [$reflectionType];
+
+   return in_array('callable', array_map(fn(ReflectionNamedType $t) => $t->getName(), $types));
+}
+?>
+]]>
+   </programlisting>
+  </example>
+ </para>
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/reflection/reflectionproperty.xml b/reference/reflection/reflectionproperty.xml
index ad167fc4ad..43b1e2d0f1 100644
--- a/reference/reflection/reflectionproperty.xml
+++ b/reference/reflection/reflectionproperty.xml
@@ -41,25 +41,25 @@
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionproperty.constants.is-static">ReflectionProperty::IS_STATIC</varname>
-     <initializer>1</initializer>
+     <initializer>16</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionproperty.constants.is-public">ReflectionProperty::IS_PUBLIC</varname>
-     <initializer>256</initializer>
+     <initializer>1</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionproperty.constants.is-protected">ReflectionProperty::IS_PROTECTED</varname>
-     <initializer>512</initializer>
+     <initializer>2</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="reflectionproperty.constants.is-private">ReflectionProperty::IS_PRIVATE</varname>
-     <initializer>1024</initializer>
+     <initializer>4</initializer>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
@@ -124,6 +124,7 @@
        <para>
         Indicates <link linkend="language.oop5.static">static</link>
         properties.
+        Prior to PHP 7.4.0, the value was <literal>1</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -134,6 +135,7 @@
        <para>
         Indicates <link linkend="language.oop5.visibility">public</link>
         properties.
+        Prior to PHP 7.4.0, the value was <literal>256</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -144,6 +146,7 @@
        <para>
         Indicates <link linkend="language.oop5.visibility">protected</link>
         properties.
+        Prior to PHP 7.4.0, the value was <literal>512</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -154,11 +157,19 @@
        <para>
         Indicates <link linkend="language.oop5.visibility">private</link>
         properties.
+        Prior to PHP 7.4.0, the value was <literal>1024</literal>.
        </para>
       </listitem>
      </varlistentry>
 
     </variablelist>
+    <note>
+     <para>
+      The values of these constants may change between PHP versions.
+      It is recommended to always use the constants
+      and not rely on the values directly.
+     </para>
+    </note>
    </section>
   </section>
 <!-- }}} -->
diff --git a/reference/reflection/reflectionproperty/construct.xml b/reference/reflection/reflectionproperty/construct.xml
index f499252aee..07cf2ae784 100644
--- a/reference/reflection/reflectionproperty/construct.xml
+++ b/reference/reflection/reflectionproperty/construct.xml
@@ -137,11 +137,11 @@ class Foo {
 $obj = new Foo;
 
 $prop = new ReflectionProperty('Foo', 'y');
-$prop->setAccessible(true); /* As of PHP 5.3.0 */
+$prop->setAccessible(true);
 var_dump($prop->getValue($obj)); // int(2)
 
 $prop = new ReflectionProperty('Foo', 'z');
-$prop->setAccessible(true); /* As of PHP 5.3.0 */
+$prop->setAccessible(true);
 var_dump($prop->getValue($obj)); // int(2)
 
 ?>
diff --git a/reference/reflection/reflectionproperty/export.xml b/reference/reflection/reflectionproperty/export.xml
index 1b6589bd7b..7500be00c5 100644
--- a/reference/reflection/reflectionproperty/export.xml
+++ b/reference/reflection/reflectionproperty/export.xml
@@ -7,6 +7,10 @@
   <refpurpose>Export</refpurpose>
  </refnamediv>
 
+ <refsynopsisdiv>
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
+ </refsynopsisdiv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
diff --git a/reference/reflection/reflectionproperty/getattributes.xml b/reference/reflection/reflectionproperty/getattributes.xml
new file mode 100644
index 0000000000..e8c76e8880
--- /dev/null
+++ b/reference/reflection/reflectionproperty/getattributes.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="reflectionproperty.getattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>ReflectionProperty::getAttributes</refname>
+  <refpurpose>Gets Attributes</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>public</modifier> <type>array</type><methodname>ReflectionProperty::getAttributes</methodname>
+   <methodparam><type>string</type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
+  </methodsynopsis>
+  <para>
+   Returns all attributes declared on this class property as an array of <type>ReflectionAttribute</type>.
+  </para>
+
+  &warn.undocumented.func;
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>name</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>flags</parameter></term>
+    <listitem>
+     <para>
+
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Array of attributes, as a <classname>ReflectionAttribute</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><methodname>ReflectionClass::getAttributes</methodname></member>
+    <member><methodname>ReflectionClassConstant::getAttributes</methodname></member>
+    <member><methodname>ReflectionFunctionAbstract::getAttributes</methodname></member>
+    <member><methodname>ReflectionParameter::getAttributes</methodname></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/reflection/reflectionproperty/getdefaultvalue.xml b/reference/reflection/reflectionproperty/getdefaultvalue.xml
index 235143bb5a..378b8c71b1 100644
--- a/reference/reflection/reflectionproperty/getdefaultvalue.xml
+++ b/reference/reflection/reflectionproperty/getdefaultvalue.xml
@@ -29,7 +29,7 @@
    The default value if the property has any default value (including &null;).
    If there is no default value, then &null; is returned. It is not possible to differentiate
    between a &null; default value and an unitialized typed property.
-   Use <methodname>ReflectionClass::hasDefaultValue</methodname> to detect the difference.
+   Use <methodname>ReflectionProperty::hasDefaultValue</methodname> to detect the difference.
   </para>
  </refsect1>
 
@@ -37,7 +37,7 @@
   &reftitle.examples;
   <para>
    <example>
- <title><methodname>ReflectionClass::getDefaultValue</methodname> example</title>
+ <title><methodname>ReflectionProperty::getDefaultValue</methodname> example</title>
  <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/reflection/reflectionproperty/getmodifiers.xml b/reference/reflection/reflectionproperty/getmodifiers.xml
index d4cce99ad6..74683273b2 100644
--- a/reference/reflection/reflectionproperty/getmodifiers.xml
+++ b/reference/reflection/reflectionproperty/getmodifiers.xml
@@ -30,6 +30,8 @@
   &reftitle.returnvalues;
   <para>
    A numeric representation of the modifiers.
+   The actual meaning of these modifiers are described under
+   <link linkend="reflectionproperty.constants.modifiers">predefined constants</link>.
   </para>
  </refsect1>
 
diff --git a/reference/reflection/reflectionproperty/hasdefaultvalue.xml b/reference/reflection/reflectionproperty/hasdefaultvalue.xml
index d645cd3685..3d26658e91 100644
--- a/reference/reflection/reflectionproperty/hasdefaultvalue.xml
+++ b/reference/reflection/reflectionproperty/hasdefaultvalue.xml
@@ -37,7 +37,7 @@
   &reftitle.examples;
   <para>
    <example>
- <title><methodname>ReflectionClass::hasDefaultValue</methodname> example</title>
+ <title><methodname>ReflectionProperty::hasDefaultValue</methodname> example</title>
  <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/reflection/reflectionproperty/isdefault.xml b/reference/reflection/reflectionproperty/isdefault.xml
index 25d07fd349..58eecd49ad 100644
--- a/reference/reflection/reflectionproperty/isdefault.xml
+++ b/reference/reflection/reflectionproperty/isdefault.xml
@@ -36,7 +36,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title><methodname>ReflectionClass::isDefault</methodname> example</title>
+    <title><methodname>ReflectionProperty::isDefault</methodname> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/reflection/reflectiontype.xml b/reference/reflection/reflectiontype.xml
index 2469e6e0af..d58fa5fa17 100644
--- a/reference/reflection/reflectiontype.xml
+++ b/reference/reflection/reflectiontype.xml
@@ -14,6 +14,11 @@
    <para>
     The <classname>ReflectionType</classname> class reports
     information about a function's return type.
+    The Reflection extension declares the following subtypes:
+    <simplelist>
+     <member><classname>ReflectionNamedType</classname> (as of PHP 7.1.0)</member>
+     <member><classname>ReflectionUnionType</classname> (as of PHP 8.0.0)</member>
+    </simplelist>
    </para>
   </section>
 <!-- }}} -->
diff --git a/reference/reflection/reflectiontype/tostring.xml b/reference/reflection/reflectiontype/tostring.xml
index 36718fe503..0032137c0a 100644
--- a/reference/reflection/reflectiontype/tostring.xml
+++ b/reference/reflection/reflectiontype/tostring.xml
@@ -34,6 +34,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>7.1.0</entry>
+      <entry>
+       <methodname>ReflectionType::__toString</methodname> has been deprecated.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -60,28 +82,6 @@ string
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>7.1.0</entry>
-      <entry>
-       <methodname>ReflectionType::__toString</methodname> has been deprecated.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/reflection/reflectionzendextension/export.xml b/reference/reflection/reflectionzendextension/export.xml
index 657bfb876d..5b3e65ed9d 100644
--- a/reference/reflection/reflectionzendextension/export.xml
+++ b/reference/reflection/reflectionzendextension/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/reflector.xml b/reference/reflection/reflector.xml
index d16676ac7e..02b74c3b5c 100644
--- a/reference/reflection/reflector.xml
+++ b/reference/reflection/reflector.xml
@@ -19,7 +19,7 @@
 <!-- }}} -->
 
   <section xml:id="reflector.synopsis">
-   &reftitle.classsynopsis;
+   &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
    <classsynopsis>
@@ -27,9 +27,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>Reflector</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>Reflector</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/reference/reflection/reflector/export.xml b/reference/reflection/reflector/export.xml
index 3dd12df64f..4f36eb7be8 100644
--- a/reference/reflection/reflector/export.xml
+++ b/reference/reflection/reflector/export.xml
@@ -8,7 +8,7 @@
  </refnamediv>
 
  <refsynopsisdiv>
-   &warn.deprecated.function-7-4-0;
+   &warn.deprecated.function-7-4-0.removed-8-0-0;
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/reflection/versions.xml b/reference/reflection/versions.xml
index a6ec0e8e1e..6da21c2089 100644
--- a/reference/reflection/versions.xml
+++ b/reference/reflection/versions.xml
@@ -4,340 +4,353 @@
   Do NOT translate this file
 -->
 <versions>
- <function name="reflectionexception" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::getmessage" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::getcode" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::getfile" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::getline" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::gettrace" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::getprevious" from="PHP 5, PHP 7"/>
- <function name="reflectionexception::gettraceasstring" from="PHP 5, PHP 7"/>
+ <function name="reflectionexception" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::getmessage" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::getcode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::getfile" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::getline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::gettrace" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::getprevious" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionexception::gettraceasstring" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="reflection" from="PHP 5, PHP 7"/>
+ <function name="reflection" from="PHP 5, PHP 7, PHP 8"/>
  <function name="reflection::__clone" from="PHP 5, PHP 7"/>
- <function name="reflection::getmodifiernames" from="PHP 5, PHP 7"/>
- <function name="reflection::export" from="PHP 5, PHP 7"/>
+ <function name="reflection::getmodifiernames" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflection::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
 
- <function name="reflector" from="PHP 5, PHP 7"/>
- <function name="reflector::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflector::export" from="PHP 5, PHP 7"/>
+ <function name="reflector" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflector::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflector::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
 
- <function name="reflectionfunctionabstract" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::__clone" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::__tostring" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getclosurescopeclass" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getclosurethis" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionfunctionabstract::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunctionabstract::isclosure" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunctionabstract::isdeprecated" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::isgenerator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="reflectionfunctionabstract::isinternal" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::isuserdefined" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::isvariadic" from="PHP 5 &gt;= 5.6.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getclosurescopeclass" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getclosurethis" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getdoccomment" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getendline" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getextension" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getextensionname" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getfilename" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getname" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getnumberofparameters" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getnumberofrequiredparameters" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getparameters" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getstartline" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::getstaticvariables" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::returnsreference" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunctionabstract::hasreturntype" from="PHP 7"/>
- <function name="reflectionfunctionabstract::getreturntype" from="PHP 7"/>
+ <function name="reflectionfunctionabstract" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::__clone" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::__tostring" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getclosurescopeclass" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getclosurethis" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::isclosure" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::isdeprecated" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::isgenerator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::isinternal" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::isuserdefined" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::isvariadic" from="PHP 5 &gt;= 5.6.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getclosurescopeclass" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getclosurethis" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getdoccomment" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getendline" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getextension" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getextensionname" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getfilename" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getname" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getnumberofparameters" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getnumberofrequiredparameters" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getparameters" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getstartline" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getstaticvariables" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::returnsreference" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::hasreturntype" from="PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getreturntype" from="PHP 7, PHP 8"/>
+ <function name="reflectionfunctionabstract::getattributes" from="PHP 8"/>
 
- <function name="reflectionfunction" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::export" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::isdisabled" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionfunction::isgenerator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="reflectionfunction::invoke" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::invokeargs" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionfunction::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunction::isclosure" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunction::isdeprecated" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="reflectionfunction::isinternal" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunction::isuserdefined" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::isvariadic" from="PHP 5 &gt;= 5.6.0, PHP 7"/>
- <function name="reflectionfunction::getclosure" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionfunction::getdoccomment" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::getendline" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::getextension" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionfunction::getextensionname" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionfunction::getfilename" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::getname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunction::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunction::getnumberofparameters" from="PHP 5 &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionfunction::getnumberofrequiredparameters" from="PHP 5 &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionfunction::getparameters" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionfunction::getstartline" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::getstaticvariables" from="PHP 5, PHP 7"/>
- <function name="reflectionfunction::returnsreference" from="PHP 5, PHP 7"/>
+ <function name="reflectionfunction" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionfunction::isdisabled" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::isgenerator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::invoke" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::invokeargs" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::isclosure" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::isdeprecated" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::isinternal" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::isuserdefined" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::isvariadic" from="PHP 5 &gt;= 5.6.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getclosure" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getdoccomment" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getendline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getextension" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getextensionname" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getfilename" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getnumberofparameters" from="PHP 5 &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getnumberofrequiredparameters" from="PHP 5 &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getparameters" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getstartline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::getstaticvariables" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionfunction::returnsreference" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="reflectionparameter" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::export" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::getname" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::getdefaultvalueconstantname" from="PHP 5 &gt;= 5.4.6, PHP 7"/>
- <function name="reflectionparameter::iscallable" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionparameter::isdefaultvalueconstant" from="PHP 5 &gt;= 5.4.6, PHP 7"/>
- <function name="reflectionparameter::ispassedbyreference" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::getdeclaringfunction" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="reflectionparameter::getdeclaringclass" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="reflectionparameter::getclass" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::isarray" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionparameter::allowsnull" from="PHP 5, PHP 7"/>
- <function name="reflectionparameter::getposition" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="reflectionparameter::isoptional" from="PHP 5 &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionparameter::isdefaultvalueavailable" from="PHP 5 &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionparameter::getdefaultvalue" from="PHP 5 &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionparameter::canbepassedbyvalue" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionparameter::isvariadic" from="PHP 5 &gt;= 5.6.0, PHP 7"/>
- <function name="reflectionparameter::hastype" from="PHP 7"/>
- <function name="reflectionparameter::gettype" from="PHP 7"/>
+ <function name="reflectionparameter" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionparameter::getname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getdefaultvalueconstantname" from="PHP 5 &gt;= 5.4.6, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::iscallable" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::isdefaultvalueconstant" from="PHP 5 &gt;= 5.4.6, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::ispassedbyreference" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getdeclaringfunction" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getdeclaringclass" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getclass" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::isarray" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::allowsnull" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getposition" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::isoptional" from="PHP 5 &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::isdefaultvalueavailable" from="PHP 5 &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getdefaultvalue" from="PHP 5 &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::canbepassedbyvalue" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::isvariadic" from="PHP 5 &gt;= 5.6.0, PHP 7, PHP 8"/>
+ <function name="reflectionparameter::hastype" from="PHP 7, PHP 8"/>
+ <function name="reflectionparameter::gettype" from="PHP 7, PHP 8"/>
+ <function name="reflectionparameter::getattributes" from="PHP 8"/>
 
- <function name="reflectionmethod" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::export" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isgenerator" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="reflectionmethod::ispublic" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isprivate" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isprotected" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isabstract" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isfinal" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isstatic" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isconstructor" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isdestructor" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getmodifiers" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::invoke" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::invokeargs" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionmethod::getdeclaringclass" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getprototype" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionmethod::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionmethod::isclosure" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionmethod::isdeprecated" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isinternal" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::isuserdefined" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getdoccomment" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionmethod::getendline" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getextension" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getextensionname" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getfilename" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getname" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionmethod::getnumberofparameters" from="PHP 5  &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionmethod::getnumberofrequiredparameters" from="PHP 5  &gt;= 5.0.3, PHP 7"/>
- <function name="reflectionmethod::getparameters" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionmethod::getstartline" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::getstaticvariables" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::returnsreference" from="PHP 5, PHP 7"/>
- <function name="reflectionmethod::setaccessible" from="PHP 5 &gt;= 5.3.2, PHP 7"/>
- <function name="reflectionmethod::getclosure" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="reflectionmethod" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionmethod::isgenerator" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::ispublic" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isprivate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isprotected" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isabstract" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isfinal" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isstatic" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isconstructor" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isdestructor" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getmodifiers" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::invoke" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::invokeargs" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getdeclaringclass" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getprototype" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isclosure" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isdeprecated" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isinternal" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::isuserdefined" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getdoccomment" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getendline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getextension" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getextensionname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getfilename" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getnumberofparameters" from="PHP 5  &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getnumberofrequiredparameters" from="PHP 5  &gt;= 5.0.3, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getparameters" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getstartline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getstaticvariables" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::returnsreference" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::setaccessible" from="PHP 5 &gt;= 5.3.2, PHP 7, PHP 8"/>
+ <function name="reflectionmethod::getclosure" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
- <function name="reflectionclass" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::export" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getname" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isinternal" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isuserdefined" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isinstantiable" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getfilename" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getstartline" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getendline" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getdoccomment" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getconstructor" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::hasmethod" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionclass::getmethod" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getmethods" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::hasproperty" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionclass::getproperty" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getproperties" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::hasconstant" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionclass::getconstants" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getconstant" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getinterfaces" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getinterfacenames" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="reflectionclass::isinterface" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isabstract" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isfinal" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isanonymous" from="PHP 7"/>
- <function name="reflectionclass::getmodifiers" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isinstance" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isIterable" from="PHP 7 &gt;= 7.2.0"/>
- <function name="reflectionclass::newinstance" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::newinstanceargs" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="reflectionclass::getparentclass" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::issubclassof" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getstaticproperties" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getstaticpropertyvalue" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionclass::setstaticpropertyvalue" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="reflectionclass::getdefaultproperties" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::isiterateable" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::implementsinterface" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getextension" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::getextensionname" from="PHP 5, PHP 7"/>
- <function name="reflectionclass::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionclass::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionclass::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionclass::gettraitaliases" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionclass::gettraitnames" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionclass::gettraits" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionclass::iscloneable" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionclass::istrait" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionclass::newinstancewithoutconstructor" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionclass::getreflectionconstant" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclass::getreflectionconstants" from="PHP 7 &gt;= 7.1.0"/>
+ <function name="reflectionclass" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionclass::getname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isinternal" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isuserdefined" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isinstantiable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getfilename" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getstartline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getendline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getdoccomment" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getconstructor" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::hasmethod" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getmethod" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getmethods" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::hasproperty" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getproperty" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getproperties" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::hasconstant" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getconstants" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getconstant" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getinterfaces" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getinterfacenames" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isinterface" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isabstract" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isfinal" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isanonymous" from="PHP 7, PHP 8"/>
+ <function name="reflectionclass::getmodifiers" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isinstance" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isIterable" from="PHP 7 &gt;= 7.2.0, PHP 8"/>
+ <function name="reflectionclass::newinstance" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::newinstanceargs" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getparentclass" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::issubclassof" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getstaticproperties" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getstaticpropertyvalue" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionclass::setstaticpropertyvalue" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getdefaultproperties" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::isiterateable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::implementsinterface" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getextension" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getextensionname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionclass::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::gettraitaliases" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::gettraitnames" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::gettraits" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::iscloneable" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::istrait" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::newinstancewithoutconstructor" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionclass::getreflectionconstant" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclass::getreflectionconstants" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclass::getattributes" from="PHP 8"/>
  
- <function name="reflectionobject" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::export" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getname" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isinternal" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isuserdefined" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isinstantiable" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getfilename" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getstartline" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getendline" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getdoccomment" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="reflectionobject::getconstructor" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::hasmethod" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getmethod" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getmethods" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::hasproperty" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getproperty" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getproperties" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::hasconstant" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getconstants" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getconstant" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getinterfaces" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getinterfacenames" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isinterface" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isabstract" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isfinal" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getmodifiers" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isinstance" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::newinstance" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::newinstanceargs" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getparentclass" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::issubclassof" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getstaticproperties" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getstaticpropertyvalue" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::setstaticpropertyvalue" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getdefaultproperties" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::isiterateable" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::implementsinterface" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getextension" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::getextensionname" from="PHP 5, PHP 7"/>
- <function name="reflectionobject::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionobject::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionobject::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="reflectionobject" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionobject::getname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isinternal" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isuserdefined" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isinstantiable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getfilename" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getstartline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getendline" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getdoccomment" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getconstructor" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::hasmethod" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getmethod" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getmethods" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::hasproperty" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getproperty" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getproperties" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::hasconstant" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getconstants" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getconstant" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getinterfaces" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getinterfacenames" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isinterface" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isabstract" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isfinal" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getmodifiers" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isinstance" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::newinstance" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::newinstanceargs" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getparentclass" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::issubclassof" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getstaticproperties" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getstaticpropertyvalue" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::setstaticpropertyvalue" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getdefaultproperties" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::isiterateable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::implementsinterface" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getextension" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getextensionname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionobject::innamespace" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getnamespacename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionobject::getshortname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="reflectionclassconstant" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::__construct" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::__tostring" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::export" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::getname" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::ispublic" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::isprivate" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::isprotected" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::getmodifiers" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::getvalue" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::getdeclaringclass" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionclassconstant::getdoccomment" from="PHP 7 &gt;= 7.1.0"/>
+ <function name="reflectionclassconstant" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::__construct" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::__tostring" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::export" from="PHP 7 &gt;= 7.1.0" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionclassconstant::getname" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::ispublic" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::isprivate" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::isprotected" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::getmodifiers" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::getvalue" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::getdeclaringclass" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::getdoccomment" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionclassconstant::getattributes" from="PHP 8"/>
 
- <function name="reflectionproperty" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::export" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::getname" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::getvalue" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::setvalue" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::ispublic" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::isprivate" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::isprotected" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::isstatic" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::isdefault" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::getmodifiers" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::getdeclaringclass" from="PHP 5, PHP 7"/>
- <function name="reflectionproperty::getdoccomment" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="reflectionproperty::setaccessible" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="reflectionproperty::gettype" from="PHP 7 &gt;= 7.4.0"/>
- <function name="reflectionproperty::hastype" from="PHP 7 &gt;= 7.4.0"/>
- <function name="reflectionproperty::isinitialized" from="PHP 7 &gt;= 7.4.0"/>
+ <function name="reflectionproperty" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionproperty::getname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::getvalue" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::setvalue" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::ispublic" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::isprivate" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::isprotected" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::isstatic" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::isdefault" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::getmodifiers" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::getdeclaringclass" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::getdoccomment" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::setaccessible" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="reflectionproperty::gettype" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="reflectionproperty::hastype" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="reflectionproperty::isinitialized" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
  <function name="reflectionproperty::getdefaultvalue" from="PHP 8"/>
+ <function name="reflectionproperty::getattributes" from="PHP 8"/>
  <function name="reflectionproperty::hasdefaultvalue" from="PHP 8"/>
 
- <function name="reflectionextension" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::__clone" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::__construct" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::__tostring" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::export" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getname" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getversion" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getfunctions" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getconstants" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getinientries" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getclasses" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getclassnames" from="PHP 5, PHP 7"/>
- <function name="reflectionextension::getdependencies" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="reflectionextension::info" from="PHP 5 &gt;= 5.2.4, PHP 7"/>
- <function name="reflectionextension::ispersistent" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionextension::istemporary" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="reflectionextension" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::__clone" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::export" from="PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionextension::getname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getversion" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getfunctions" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getconstants" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getinientries" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getclasses" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getclassnames" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="reflectionextension::getdependencies" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="reflectionextension::info" from="PHP 5 &gt;= 5.2.4, PHP 7, PHP 8"/>
+ <function name="reflectionextension::ispersistent" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionextension::istemporary" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
- <function name="reflectionzendextension" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::__clone" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::export" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::getauthor" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::getcopyright" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::getname" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::geturl" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::getversion" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="reflectionzendextension::__tostring" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="reflectionzendextension" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::__clone" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::export" from="PHP 5 &gt;= 5.4.0, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="reflectionzendextension::getauthor" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::getcopyright" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::getname" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::geturl" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::getversion" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="reflectionzendextension::__tostring" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
- <function name="reflectiontype" from="PHP 7"/>
- <function name="reflectiontype::allowsnull" from="PHP 7"/>
+ <function name="reflectiontype" from="PHP 7, PHP 8"/>
+ <function name="reflectiontype::allowsnull" from="PHP 7, PHP 8"/>
 
- <function name="reflectiontype::__tostring" from="PHP 7"/>
+ <function name="reflectiontype::__tostring" from="PHP 7, PHP 8"/>
 
- <function name="reflectionnamedtype" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionnamedtype::getname" from="PHP 7 &gt;= 7.1.0"/>
- <function name="reflectionnamedtype::isbuiltin" from="PHP 7"/>
+ <function name="reflectionnamedtype" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionnamedtype::getname" from="PHP 7 &gt;= 7.1.0, PHP 8"/>
+ <function name="reflectionnamedtype::isbuiltin" from="PHP 7, PHP 8"/>
 
- <function name="reflectiongenerator" from="PHP 7"/>
- <function name="reflectiongenerator::__construct" from="PHP 7"/>
- <function name="reflectiongenerator::getfunction" from="PHP 7"/>
- <function name="reflectiongenerator::getthis" from="PHP 7"/>
- <function name="reflectiongenerator::gettrace" from="PHP 7"/>
- <function name="reflectiongenerator::getexecutingline" from="PHP 7"/>
- <function name="reflectiongenerator::getexecutingfile" from="PHP 7"/>
- <function name="reflectiongenerator::getexecutinggenerator" from="PHP 7"/>
+ <function name="reflectiongenerator" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::__construct" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::getfunction" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::getthis" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::gettrace" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::getexecutingline" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::getexecutingfile" from="PHP 7, PHP 8"/>
+ <function name="reflectiongenerator::getexecutinggenerator" from="PHP 7, PHP 8"/>
 
- <function name="reflectionreference" from="PHP 7 &gt;= 7.4.0" />
- <function name="reflectionreference::fromarrayelement" from="PHP 7 &gt;= 7.4.0" />
- <function name="reflectionreference::getid" from="PHP 7 &gt;= 7.4.0" />
+ <function name="reflectionreference" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="reflectionreference::fromarrayelement" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+ <function name="reflectionreference::getid" from="PHP 7 &gt;= 7.4.0, PHP 8"/>
+
+ <function name="reflectionattribute" from="PHP 8"/>
+ <function name="reflectionattribute::__construct" from="PHP 8"/>
+ <function name="reflectionattribute::isrepeated" from="PHP 8"/>
+ <function name="reflectionattribute::getarguments" from="PHP 8"/>
+ <function name="reflectionattribute::getname" from="PHP 8"/>
+ <function name="reflectionattribute::gettarget" from="PHP 8"/>
+ <function name="reflectionattribute::newinstance" from="PHP 8"/>
 
  <function name="reflectionuniontype" from="PHP 8"/>
  <function name="reflectionuniontype::gettypes" from="PHP 8"/>
diff --git a/reference/regex/book.xml b/reference/regex/book.xml
deleted file mode 100644
index 8f31c92513..0000000000
--- a/reference/regex/book.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.regex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>Regular Expression (POSIX Extended)</title>
- <titleabbrev>POSIX Regex</titleabbrev>
-
- <preface xml:id="intro.regex">
-  &reftitle.intro;
-  <warning>
-   &warn.deprecated.feature.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member>
-     <link linkend="book.pcre">PCRE</link>
-     (for full regular expression support)
-    </member>
-    <member>
-     <function>fnmatch</function>
-     (for simpler shell style wildcard pattern matching)
-    </member>
-   </simplelist>
-  </warning>
-  <tip>
-   <para>
-    PHP also supports regular expressions using a Perl-compatible syntax
-    using the <link linkend="book.pcre">PCRE functions</link>. Those functions
-    support non-greedy matching, assertions, conditional subpatterns, and a
-    number of other features not supported by the POSIX-extended regular
-    expression syntax.
-   </para>
-  </tip>
-  <warning>
-   <para>
-    These regular expression functions are not binary-safe. The <link
-    linkend="book.pcre">PCRE functions</link> are.
-   </para>
-  </warning>
-  <para>
-   Regular expressions are used for complex string manipulation.
-   PHP uses the POSIX extended regular expressions as defined by POSIX
-   1003.2. For a full description of POSIX regular expressions see the <link xlink:href="&url.regex.man;">regex
-   man pages</link> included in the regex directory in the PHP distribution. It's
-   in manpage format, so you'll want to do something along the lines of
-   <command>man /usr/local/src/regex/regex.7</command> in order to read it.
-  </para>
- </preface>
-
- &reference.regex.setup;
- &reference.regex.constants;
- &reference.regex.examples;
- &reference.regex.reference;
-
-</book>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/regex/configure.xml b/reference/regex/configure.xml
deleted file mode 100644
index 3052b533fa..0000000000
--- a/reference/regex/configure.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="regex.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <section xml:id="regex.installation.php7">
-  <title>PHP 7</title>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;regex">&url.pecl.package;regex</link>.
-  </para>
- </section>
-
- <section xml:id="regex.installation.php5">
-  <title>PHP 5</title>
-  <warning>
-   <simpara>
-    Do not change the TYPE unless you know what you are doing.
-   </simpara>
-  </warning>
-  <para>
-   To enable regexp support configure PHP
-   <option role="configure">--with-regex[=TYPE]</option>. TYPE can be one of
-   <literal>system</literal>, <literal>apache</literal>, <literal>php</literal>. 
-   The default value is <literal>php</literal>.
-  </para>
-  &windows.builtin;
- </section>
-
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/regex/constants.xml b/reference/regex/constants.xml
deleted file mode 100644
index 04dbada782..0000000000
--- a/reference/regex/constants.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="regex.constants">
- &reftitle.constants;
- &no.constants;
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/regex/examples.xml b/reference/regex/examples.xml
deleted file mode 100644
index 2a594dfc97..0000000000
--- a/reference/regex/examples.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="regex.examples">
- &reftitle.examples;
- <para>
-  <example>
-  <title>Regular Expression Examples</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Returns true if "abc" is found anywhere in $string.
-ereg("abc", $string);            
-
-// Returns true if "abc" is found at the beginning of $string.
-ereg("^abc", $string);
-
-// Returns true if "abc" is found at the end of $string.
-ereg("abc$", $string);
-
-// Returns true if client browser is Netscape 2, 3 or MSIE 3.
-eregi("(ozilla.[23]|MSIE.3)", $_SERVER["HTTP_USER_AGENT"]);
-
-// Places three space separated words into $regs[1], $regs[2] and $regs[3].
-ereg("([[:alnum:]]+) ([[:alnum:]]+) ([[:alnum:]]+)", $string, $regs); 
-
-// Put a <br /> tag at the beginning of $string.
-$string = ereg_replace("^", "<br />", $string); 
-
-// Put a <br /> tag at the end of $string.
-$string = ereg_replace("$", "<br />", $string); 
-
-// Get rid of any newline characters in $string.
-$string = ereg_replace("\n", "", $string);
-?>
-]]>
-   </programlisting>
-  </example>
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/regex/functions/ereg-replace.xml b/reference/regex/functions/ereg-replace.xml
deleted file mode 100644
index 754678c4d9..0000000000
--- a/reference/regex/functions/ereg-replace.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ereg-replace">
- <refnamediv>
-  <refname>ereg_replace</refname>
-  <refpurpose>Replace regular expression</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>preg_replace</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ereg_replace</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>replacement</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function scans <parameter>string</parameter> for matches to
-   <parameter>pattern</parameter>, then replaces the matched text
-   with <parameter>replacement</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       A POSIX extended regular expression.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>replacement</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>pattern</parameter> contains parenthesized substrings,
-       <parameter>replacement</parameter> may contain substrings of the form
-       <literal>\<replaceable>digit</replaceable></literal>, which will be
-       replaced by the text matching the digit'th parenthesized substring; 
-       <literal>\0</literal> will produce the entire contents of string.
-       Up to nine substrings may be used. Parentheses may be nested, in which
-       case they are counted by the opening parenthesis.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The modified string is returned. If no matches are found in 
-   <parameter>string</parameter>, then it will be returned unchanged.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   For example, the following code snippet prints "This was a test"
-   three times:
-  </para>
-  <para>
-   <example>
-    <title><function>ereg_replace</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$string = "This is a test";
-echo str_replace(" is", " was", $string);
-echo ereg_replace("( )is", "\\1was", $string);
-echo ereg_replace("(( )is)", "\\2was", $string);
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   One thing to take note of is that if you use an integer value as
-   the <parameter>replacement</parameter> parameter, you may not get
-   the results you expect. This is because
-   <function>ereg_replace</function> will interpret the number as
-   the ordinal value of a character, and apply that. For instance:
-  </para>
-  <para>
-   <example>
-    <title><function>ereg_replace</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* This will not work as expected. */
-$num = 4;
-$string = "This string has four words.";
-$string = ereg_replace('four', $num, $string);
-echo $string;   /* Output: 'This string has   words.' */
-
-/* This will work. */
-$num = '4';
-$string = "This string has four words.";
-$string = ereg_replace('four', $num, $string);
-echo $string;   /* Output: 'This string has 4 words.' */
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Replace URLs with links</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",
-                     '<a href="\\0">\\0</a>', $text);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ereg</function></member>
-    <member><function>eregi</function></member>
-    <member><function>eregi_replace</function></member>
-    <member><function>str_replace</function></member>
-    <member><function>preg_replace</function></member>
-    <member><function>quotemeta</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/functions/ereg.xml b/reference/regex/functions/ereg.xml
deleted file mode 100644
index 1b883b4b74..0000000000
--- a/reference/regex/functions/ereg.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ereg">
- <refnamediv>
-  <refname>ereg</refname>
-  <refpurpose>Regular expression match</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>preg_match</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ereg</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">regs</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Searches a <parameter>string</parameter> for matches to the regular
-   expression given in <parameter>pattern</parameter> in a case-sensitive
-   way.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       Case sensitive regular expression.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>regs</parameter></term>
-     <listitem>
-      <para>
-       If matches are found for parenthesized substrings of
-       <parameter>pattern</parameter> and the function is called with the
-       third argument <parameter>regs</parameter>, the matches will be stored
-       in the elements of the array <parameter>regs</parameter>. 
-      </para>
-      <para>
-       <varname>$regs[1]</varname> will contain the substring which starts at
-       the first left parenthesis; <varname>$regs[2]</varname> will contain
-       the substring starting at the second, and so on.
-       <varname>$regs[0]</varname> will contain a copy of the complete string
-       matched.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the length of the matched string if a match for
-   <parameter>pattern</parameter> was found in <parameter>string</parameter>,
-   or &false; if no matches were found or an error occurred.
-  </para>
-  <para>
-   If the optional parameter <parameter>regs</parameter> was not passed or
-   the length of the matched string is <literal>0</literal>, this function returns <literal>1</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>4.1.0</entry>
-       <entry>
-        Up to (and including) PHP 4.1.0 <varname>$regs</varname> will be
-        filled with exactly ten elements, even though more or fewer than
-        ten parenthesized substrings may actually have matched. This has
-        no effect on <function>ereg</function>'s ability to match more
-        substrings. If no matches are found, <literal>$regs</literal>
-        will not be altered by <function>ereg</function>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>ereg</function> example</title>
-    <para>
-     The following code snippet takes a date in ISO format (YYYY-MM-DD) and
-     prints it in DD.MM.YYYY format:
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if (ereg ("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})", $date, $regs)) {
-    echo "$regs[3].$regs[2].$regs[1]";
-} else {
-    echo "Invalid date format: $date";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>eregi</function></member>
-    <member><function>ereg_replace</function></member>
-    <member><function>eregi_replace</function></member>
-    <member><function>preg_match</function></member>
-    <member><function>strpos</function></member>
-    <member><function>strstr</function></member>
-    <member><function>quotemeta</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/functions/eregi-replace.xml b/reference/regex/functions/eregi-replace.xml
deleted file mode 100644
index 859b8f972e..0000000000
--- a/reference/regex/functions/eregi-replace.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.eregi-replace">
- <refnamediv>
-  <refname>eregi_replace</refname>
-  <refpurpose>Replace regular expression case insensitive</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member>
-     <function>preg_replace</function>
-     (with the <literal>i</literal> (<constant>PCRE_CASELESS</constant>)
-      modifier)
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>eregi_replace</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>replacement</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is identical to <function>ereg_replace</function>
-   except that this ignores case distinction when matching
-   alphabetic characters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       A POSIX extended regular expression.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>replacement</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>pattern</parameter> contains parenthesized substrings,
-       <parameter>replacement</parameter> may contain substrings of the form
-       <literal>\<replaceable>digit</replaceable></literal>, which will be
-       replaced by the text matching the digit'th parenthesized substring; 
-       <literal>\0</literal> will produce the entire contents of string.
-       Up to nine substrings may be used. Parentheses may be nested, in which
-       case they are counted by the opening parenthesis.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The modified string is returned. If no matches are found in 
-   <parameter>string</parameter>, then it will be returned unchanged.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Highlight search results</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$pattern = '(>[^<]*)('. quotemeta($_GET['search']) .')';
-$replacement = '\\1<span class="search">\\2</span>';
-$body = eregi_replace($pattern, $replacement, $body);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ereg</function></member>
-    <member><function>eregi</function></member>
-    <member><function>ereg_replace</function></member>
-    <member><function>preg_replace</function></member>
-    <member><function>quotemeta</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/functions/eregi.xml b/reference/regex/functions/eregi.xml
deleted file mode 100644
index 9ee942c4c6..0000000000
--- a/reference/regex/functions/eregi.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.eregi">
- <refnamediv>
-  <refname>eregi</refname>
-  <refpurpose>Case insensitive regular expression match</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member>
-     <function>preg_match</function>
-     (with the <literal>i</literal> (<constant>PCRE_CASELESS</constant>)
-      modifier)
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>eregi</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">regs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is identical to <function>ereg</function> except that it
-   ignores case distinction when matching alphabetic characters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       Case insensitive regular expression.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>regs</parameter></term>
-     <listitem>
-      <para>
-       If matches are found for parenthesized substrings of
-       <parameter>pattern</parameter> and the function is called with the
-       third argument <parameter>regs</parameter>, the matches will be stored
-       in the elements of the array <parameter>regs</parameter>. 
-      </para>
-      <para>
-       <varname>$regs[1]</varname> will contain the substring which starts at
-       the first left parenthesis; <varname>$regs[2]</varname> will contain
-       the substring starting at the second, and so on.
-       <varname>$regs[0]</varname> will contain a copy of the complete string
-       matched.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the length of the matched string if a match for
-   <parameter>pattern</parameter> was found in <parameter>string</parameter>,
-   or &false; if no matches were found or an error occurred.
-  </para>
-  <para>
-   If the optional parameter <parameter>regs</parameter> was not passed or
-   the length of the matched string is <literal>0</literal>, this function returns <literal>1</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>eregi</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$string = 'XYZ';
-if (eregi('z', $string)) {
-    echo "'$string' contains a 'z' or 'Z'!";
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ereg</function></member>
-    <member><function>ereg_replace</function></member>
-    <member><function>eregi_replace</function></member>
-    <member><function>preg_match</function></member>
-    <member><function>stripos</function></member>
-    <member><function>stristr</function></member>
-    <member><function>quotemeta</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/functions/split.xml b/reference/regex/functions/split.xml
deleted file mode 100644
index a3bd79a09d..0000000000
--- a/reference/regex/functions/split.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.split">
- <refnamediv>
-  <refname>split</refname>
-  <refpurpose>Split string into array by regular expression</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>preg_split</function></member>
-    <member><function>explode</function></member>
-    <member><function>str_split</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>split</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Splits a <parameter>string</parameter> into array by regular expression.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       Case sensitive regular expression.
-      </para>
-      <para>
-       If you want to split on any of the characters which are considered
-       special by regular expressions, you'll need to escape them first. If
-       you think <function>split</function> (or any other regex function, for
-       that matter) is doing something weird, please read the file
-       <filename>regex.7</filename>, included in the 
-       <filename>regex/</filename> subdirectory of the PHP distribution. It's
-       in manpage format, so you'll want to do something along the lines of
-       <command>man /usr/local/src/regex/regex.7</command> in order to read it.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>limit</parameter> is set, the returned array will
-       contain a maximum of <parameter>limit</parameter> elements with the
-       last element containing the whole rest of
-       <parameter>string</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of strings, each of which is a substring of
-   <parameter>string</parameter> formed by splitting it on boundaries formed
-   by the case-sensitive regular expression <parameter>pattern</parameter>.
-  </para>
-  <para>
-   If there are <replaceable>n</replaceable> occurrences of
-   <parameter>pattern</parameter>, the returned array will contain
-   <literal><replaceable>n</replaceable>+1</literal> items. For example, if
-   there is no occurrence of <parameter>pattern</parameter>, an array with
-   only one element will be returned. Of course, this is also true if
-   <parameter>string</parameter> is empty. If an error occurs,
-   <function>split</function> returns &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>split</function> example</title>
-    <para>
-     To split off the first four fields from a line from
-     <filename>/etc/passwd</filename>:
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-list($user, $pass, $uid, $gid, $extra) =
-    split(":", $passwd_line, 5);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title><function>split</function> example</title>
-    <para>
-     To parse a date which may be delimited with slashes, dots, or hyphens:
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Delimiters may be slash, dot, or hyphen
-$date = "04/30/1973";
-list($month, $day, $year) = split('[/.-]', $date);
-echo "Month: $month; Day: $day; Year: $year<br />\n";
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <tip>
-   <para>
-    <function>split</function> is deprecated as of PHP 5.3.0. <function>preg_split</function> 
-    is the suggested alternative to this function. If you don't require the power of regular
-    expressions, it is faster to use <function>explode</function>, which
-    doesn't incur the overhead of the regular expression engine.
-   </para>
-  </tip>
-  <tip>
-   <para>
-    For users looking for a way to emulate Perl's <command>@chars =
-    split('', $str)</command> behaviour, please see the examples for
-    <function>preg_split</function> or <function>str_split</function>.
-   </para>
-  </tip>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>preg_split</function></member>
-    <member><function>spliti</function></member>
-    <member><function>str_split</function></member>
-    <member><function>explode</function></member>
-    <member><function>implode</function></member>
-    <member><function>chunk_split</function></member>
-    <member><function>wordwrap</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/functions/spliti.xml b/reference/regex/functions/spliti.xml
deleted file mode 100644
index d1f109c86c..0000000000
--- a/reference/regex/functions/spliti.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.spliti">
- <refnamediv>
-  <refname>spliti</refname>
-  <refpurpose>Split string into array by regular expression case insensitive</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member>
-     <function>preg_split</function>
-     (with the <literal>i</literal> (<constant>PCRE_CASELESS</constant>)
-      modifier)
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>spliti</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Splits a <parameter>string</parameter> into array by regular expression.
-  </para>
-  <para>
-   This function is identical to <function>split</function> except that this
-   ignores case distinction when matching alphabetic characters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       Case insensitive regular expression.
-      </para>
-      <para>
-       If you want to split on any of the characters which are considered
-       special by regular expressions, you'll need to escape them first. If
-       you think <function>spliti</function> (or any other regex function, for
-       that matter) is doing something weird, please read the file
-       <filename>regex.7</filename>, included in the 
-       <filename>regex/</filename> subdirectory of the PHP distribution. It's
-       in manpage format, so you'll want to do something along the lines of
-       <command>man /usr/local/src/regex/regex.7</command> in order to read it.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>limit</parameter> is set, the returned array will
-       contain a maximum of <parameter>limit</parameter> elements with the
-       last element containing the whole rest of
-       <parameter>string</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of strings, each of which is a substring of
-   <parameter>string</parameter> formed by splitting it on boundaries formed
-   by the case insensitive regular expression <parameter>pattern</parameter>.
-  </para>
-  <para>
-   If there are <replaceable>n</replaceable> occurrences of
-   <parameter>pattern</parameter>, the returned array will contain
-   <literal><replaceable>n</replaceable>+1</literal> items. For example, if
-   there is no occurrence of <parameter>pattern</parameter>, an array with
-   only one element will be returned. Of course, this is also true if
-   <parameter>string</parameter> is empty. If an error occurs,
-   <function>spliti</function> returns &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   This example splits a string using 'a' as the separator :
-   <example>
-    <title><function>spliti</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$string = "aBBBaCCCADDDaEEEaGGGA";
-$chunks = spliti ("a", $string, 5);
-print_r($chunks);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-  [0] =>
-  [1] => BBB
-  [2] => CCC
-  [3] => DDD
-  [4] => EEEaGGGA
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>preg_split</function></member>
-    <member><function>split</function></member>
-    <member><function>explode</function></member>
-    <member><function>implode</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/functions/sql-regcase.xml b/reference/regex/functions/sql-regcase.xml
deleted file mode 100644
index 4060355c01..0000000000
--- a/reference/regex/functions/sql-regcase.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sql-regcase">
- <refnamediv>
-  <refname>sql_regcase</refname>
-  <refpurpose>Make regular expression for case insensitive match</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>preg_match</function></member>
-    <member><function>preg_quote</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>sql_regcase</methodname>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a regular expression for a case insensitive match.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       The input string.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a valid regular expression which will match
-   <parameter>string</parameter>, ignoring case. This expression is
-   <parameter>string</parameter> with each alphabetic character converted to
-   a bracket expression; this bracket expression contains that character's
-   uppercase and lowercase form.  Other characters remain unchanged.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sql_regcase</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo sql_regcase("Foo - bar.");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-[Ff][Oo][Oo] - [Bb][Aa][Rr].
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   This can be used to achieve case insensitive pattern matching in
-   products which support only case sensitive regular expressions.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/regex/reference.xml b/reference/regex/reference.xml
deleted file mode 100644
index 87df75b687..0000000000
--- a/reference/regex/reference.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.regex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>POSIX Regex &Functions;</title>
- <partintro xml:id="regex.seealso">
-  &reftitle.seealso;
-  <warning>
-   &warn.deprecated.feature.5-3-0.removed.7-0-0.alternatives;
-   <simplelist role="alternatives">
-    <member>
-     <link linkend="book.pcre">PCRE</link>
-     (for full regular expression support)
-    </member>
-    <member>
-     <function>fnmatch</function>
-     (for simpler shell style wildcard pattern matching)
-    </member>
-   </simplelist>
-  </warning>
- </partintro>
-
- &reference.regex.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/regex/setup.xml b/reference/regex/setup.xml
deleted file mode 100644
index 2bd5c3c48e..0000000000
--- a/reference/regex/setup.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="regex.setup">
- &reftitle.setup;
-
- <section xml:id="regex.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
-
- &reference.regex.configure;
-
- <section xml:id="regex.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
-
- <section xml:id="regex.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/regex/versions.xml b/reference/regex/versions.xml
deleted file mode 100644
index ec0a021a0d..0000000000
--- a/reference/regex/versions.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions> 
- <function name='ereg' from='PHP 4, PHP 5' deprecated='PHP 5.3.0'/>
- <function name='ereg_replace' from='PHP 4, PHP 5' deprecated='PHP 5.3.0'/>
- <function name='eregi' from='PHP 4, PHP 5' deprecated='PHP 5.3.0'/>
- <function name='eregi_replace' from='PHP 4, PHP 5' deprecated='PHP 5.3.0'/>
- <function name='split' from='PHP 4, PHP 5' deprecated='PHP 5.3.0'/>
- <function name='spliti' from='PHP 4 &gt;= 4.0.1, PHP 5' deprecated='PHP 5.3.0'/>
- <function name='sql_regcase' from='PHP 4, PHP 5' deprecated='PHP 5.3.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/rpminfo/book.xml b/reference/rpminfo/book.xml
index e935030d29..4f2aeac183 100644
--- a/reference/rpminfo/book.xml
+++ b/reference/rpminfo/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.rpminfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>RpmInfo</title>
  <titleabbrev>RpmInfo</titleabbrev>
 
diff --git a/reference/rpminfo/functions/rpmdbinfo.xml b/reference/rpminfo/functions/rpmdbinfo.xml
index ee8f55b2a6..cc8a798b13 100644
--- a/reference/rpminfo/functions/rpmdbinfo.xml
+++ b/reference/rpminfo/functions/rpmdbinfo.xml
@@ -49,15 +49,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>rpmaddtag</function></member> 
-   </simplelist>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -93,6 +84,14 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>rpmaddtag</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/rpminfo/functions/rpmdbsearch.xml b/reference/rpminfo/functions/rpmdbsearch.xml
index 2505e9d765..c21480ec30 100644
--- a/reference/rpminfo/functions/rpmdbsearch.xml
+++ b/reference/rpminfo/functions/rpmdbsearch.xml
@@ -67,15 +67,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>rpmaddtag</function></member> 
-   </simplelist>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -110,6 +101,14 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>rpmaddtag</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/rpminfo/functions/rpminfo.xml b/reference/rpminfo/functions/rpminfo.xml
index 256c08300e..2b53391d22 100644
--- a/reference/rpminfo/functions/rpminfo.xml
+++ b/reference/rpminfo/functions/rpminfo.xml
@@ -58,15 +58,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>rpmaddtag</function></member> 
-   </simplelist>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -99,6 +90,14 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>rpmaddtag</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/rrd/book.xml b/reference/rrd/book.xml
index b5b4a5bf8d..dc48e32b4c 100644
--- a/reference/rrd/book.xml
+++ b/reference/rrd/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.rrd" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>RRDtool</title>
  <titleabbrev>RRD</titleabbrev>
 
diff --git a/reference/rrd/functions/rrd-first.xml b/reference/rrd/functions/rrd-first.xml
index c937003b9d..46e1069e08 100644
--- a/reference/rrd/functions/rrd-first.xml
+++ b/reference/rrd/functions/rrd-first.xml
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Integer number of unix timestamp, &false; if some error occurs.
+   Integer number of unix timestamp,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/rrd/functions/rrd-graph.xml b/reference/rrd/functions/rrd-graph.xml
index 8492802913..0d3ada773a 100644
--- a/reference/rrd/functions/rrd-graph.xml
+++ b/reference/rrd/functions/rrd-graph.xml
@@ -37,7 +37,7 @@
     <listitem>
      <para>
       Options for generating image. See man page of rrd graph for all
-      possible options. All options (data definitions, variable defintions, etc.)
+      possible options. All options (data definitions, variable definitions, etc.)
       are allowed.
      </para>
     </listitem>
@@ -48,8 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Array with information about generated image is returned, &false; when error
-   occurs.
+   Array with information about generated image is returned,&return.falseforfailure;.
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/rrd/functions/rrd-info.xml b/reference/rrd/functions/rrd-info.xml
index ca752a0f14..050adcebf3 100644
--- a/reference/rrd/functions/rrd-info.xml
+++ b/reference/rrd/functions/rrd-info.xml
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Array with information about requsted RRD file, &false; when error occurs.
+   Array with information about requested RRD file,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/rrd/functions/rrd-lastupdate.xml b/reference/rrd/functions/rrd-lastupdate.xml
index 1410d1508e..a32e9960ad 100644
--- a/reference/rrd/functions/rrd-lastupdate.xml
+++ b/reference/rrd/functions/rrd-lastupdate.xml
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Array of information about last update, &false; when error occurs.
+   Array of information about last update,&return.falseforfailure;.
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/rrd/functions/rrd-restore.xml b/reference/rrd/functions/rrd-restore.xml
index 35b4865497..00f70df894 100644
--- a/reference/rrd/functions/rrd-restore.xml
+++ b/reference/rrd/functions/rrd-restore.xml
@@ -53,7 +53,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  Returns &true; on success, &false; otherwise.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/rrd/functions/rrd-tune.xml b/reference/rrd/functions/rrd-tune.xml
index 65a4a68e93..95ac019b2e 100644
--- a/reference/rrd/functions/rrd-tune.xml
+++ b/reference/rrd/functions/rrd-tune.xml
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success, &false; otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/rrd/functions/rrd-update.xml b/reference/rrd/functions/rrd-update.xml
index 5660775d2d..d7ff6f63a7 100644
--- a/reference/rrd/functions/rrd-update.xml
+++ b/reference/rrd/functions/rrd-update.xml
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success, &false; when error occurs.
+   &return.success;
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/rrd/functions/rrd-xport.xml b/reference/rrd/functions/rrd-xport.xml
index fb014df9f6..dc65c0a42b 100644
--- a/reference/rrd/functions/rrd-xport.xml
+++ b/reference/rrd/functions/rrd-xport.xml
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Array with information about RRD database file, &false; when error occurs.
+   Array with information about RRD database file,&return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/rrd/rrdcreator/construct.xml b/reference/rrd/rrdcreator/construct.xml
index edeb5c3fa4..1779039ec1 100644
--- a/reference/rrd/rrdcreator/construct.xml
+++ b/reference/rrd/rrdcreator/construct.xml
@@ -16,7 +16,7 @@
    <methodparam choice="opt"><type>int</type><parameter>step</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Creates new RRDCreator instance.
+   Creates new <classname>RRDCreator</classname> instance.
   </para>
  </refsect1>
 
diff --git a/reference/rrd/rrdgraph/construct.xml b/reference/rrd/rrdgraph/construct.xml
index 8b35c0e347..2bb2d58a38 100644
--- a/reference/rrd/rrdgraph/construct.xml
+++ b/reference/rrd/rrdgraph/construct.xml
@@ -14,7 +14,7 @@
    <methodparam><type>string</type><parameter>path</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Creates new RRDGraph instance. This instance is responsible for rendering
+   Creates new <classname>RRDGraph</classname> instance. This instance is responsible for rendering
    the result of RRD database query into image.
   </para>
  </refsect1>
diff --git a/reference/rrd/rrdgraph/save.xml b/reference/rrd/rrdgraph/save.xml
index 4003f92c7d..cea6477843 100644
--- a/reference/rrd/rrdgraph/save.xml
+++ b/reference/rrd/rrdgraph/save.xml
@@ -27,8 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Array with information about generated image is returned, &false; if error
-   occurs.
+   Returns array with information about generated image,&return.falseforfailure;.
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/rrd/rrdgraph/saveverbose.xml b/reference/rrd/rrdgraph/saveverbose.xml
index aa579a86f6..0ab1976e99 100644
--- a/reference/rrd/rrdgraph/saveverbose.xml
+++ b/reference/rrd/rrdgraph/saveverbose.xml
@@ -30,8 +30,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Array with detailed information about generated image is returned, optionally
-   with image data, &false; if error occurs.
+   Returns array with detailed information about generated image,&return.falseforfailure;.
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/rrd/rrdupdater/update.xml b/reference/rrd/rrdupdater/update.xml
index caaede94ba..618040f80d 100644
--- a/reference/rrd/rrdupdater/update.xml
+++ b/reference/rrd/rrdupdater/update.xml
@@ -38,7 +38,7 @@
      <term><parameter>time</parameter></term>
      <listitem>
       <para>
-       Time value for updating the RRD with a particulat data. Default value
+       Time value for updating the RRD with a particular data. Default value
        is current time.
       </para>
      </listitem>
diff --git a/reference/rrd/setup.xml b/reference/rrd/setup.xml
index cc34c8d1da..840a98fda7 100644
--- a/reference/rrd/setup.xml
+++ b/reference/rrd/setup.xml
@@ -8,10 +8,9 @@
   &reftitle.required;
   <para>
    You need to install librrd first to be able to use PECL/rrd. Most common option
-   is using of librrd-dev package from your favourite linux distro.
+   is using of librrd-dev package from your favourite Linux distro.
    PECL/rrd is tested with librrd 1.4.3, older or newer versions might or might not
    work for you.
-   PECL/rrd installation is tested with PHP 5.3.2 or newer.
   </para>
   <warning>
    <para>
diff --git a/reference/runkit7/book.xml b/reference/runkit7/book.xml
index 0e051bc3d1..88bcd9f948 100644
--- a/reference/runkit7/book.xml
+++ b/reference/runkit7/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.runkit7" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>runkit7</title>
  <titleabbrev>runkit7</titleabbrev>
 
diff --git a/reference/runkit7/functions/runkit7-zval-inspect.xml b/reference/runkit7/functions/runkit7-zval-inspect.xml
index c2e39fbf00..35f7b20fbd 100644
--- a/reference/runkit7/functions/runkit7-zval-inspect.xml
+++ b/reference/runkit7/functions/runkit7-zval-inspect.xml
@@ -28,8 +28,73 @@
    </varlistentry>
   </variablelist>
  </refsect1>
-</refentry>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   The array returned by this function contains the following elements:
+   <simplelist>
+    <member><literal>address</literal></member>
+    <member><literal>refcount</literal> (optional)</member>
+    <member><literal>is_ref</literal> (optional)</member>
+    <member><literal>type</literal></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>runkit7_zval_inspect</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+$var = new DateTime();
+var_dump(runkit7_zval_inspect($var));
+
+$var = 1;
+var_dump(runkit7_zval_inspect($var));
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+array(4) {
+  ["address"]=>
+  string(14) "0x7f45ab21b1e0"
+  ["refcount"]=>
+  int(2)
+  ["is_ref"]=>
+  bool(false)
+  ["type"]=>
+  int(8)
+}
+
+array(2) {
+  ["address"]=>
+  string(14) "0x7f45ab21b1e0"
+  ["type"]=>
+  int(4)
+}
+]]>
+    </screen>
+   </example>
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><link linkend="language.references">References Explained</link></member>
+    <member><link xlink:href="&url.derick.references;">References Explained (by Derick Rethans)</link></member>
+   </simplelist>
+  </para>
+ </refsect1>
+</refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/scoutapm/book.xml b/reference/scoutapm/book.xml
index e87b4db52c..c9499926d5 100644
--- a/reference/scoutapm/book.xml
+++ b/reference/scoutapm/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.scoutapm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>ScoutAPM</title>
  <titleabbrev>ScoutAPM</titleabbrev>
 
diff --git a/reference/seaslog/book.xml b/reference/seaslog/book.xml
index de75fb18a6..add6df2546 100644
--- a/reference/seaslog/book.xml
+++ b/reference/seaslog/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.seaslog" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Seaslog</title>
  <titleabbrev>Seaslog</titleabbrev>
 
@@ -10,9 +11,6 @@
    <para>
    The <acronym>Seaslog</acronym> is an effective,fast,stable log extension for PHP.
   </para>
-  <para>
-   SeasLog requires PHP 5.2.0 or greater. Earlier versions may not work.
-  </para>
   <para>
   The log journal，which is usually the operate record of the system，
   software and the application record. 
diff --git a/reference/seaslog/ini.xml b/reference/seaslog/ini.xml
index 8b2527404b..dadbfefab8 100644
--- a/reference/seaslog/ini.xml
+++ b/reference/seaslog/ini.xml
@@ -181,11 +181,11 @@
       </para>
       <para>
         SeasLog will send log to  tcp://remote_host:remote_port or udp://remote_host:remote_port server, 
-        when <emphasis>seaslog.appender</emphasis> configured to `2 (TCP)` or `3 (UDP)`.
+       when <emphasis>seaslog.appender</emphasis> configured to <literal>2 (TCP)</literal> or <literal>3 (UDP)</literal>.
       </para>
       <para>
         When <emphasis>SeasLog</emphasis> send log to TCP/UDP，style follow RFC5424.
-        The `{logInfo}` affected by  <emphasis>seaslog.default_template</emphasis>.
+       The <literal>{logInfo}</literal> affected by  <emphasis>seaslog.default_template</emphasis>.
       </para>
       <screen>
     <![CDATA[
@@ -372,7 +372,7 @@ The log style finally formatted such as:
      </term>
      <listitem>
       <para>
-       Log function recall depth.Will affected variable `LineNo` in `%F`.
+       Log function recall depth.Will affected variable <literal>LineNo</literal> in <literal>%F</literal>.
        Default 0
       </para>
      </listitem>
@@ -515,17 +515,17 @@ The log style finally formatted such as:
       </para>
       <note>
         <para>
-        `SeasLog`The following default variables are provided, 
+        The following default variables are provided, 
         which can be used directly in the log template and replaced as a corresponding value 
         when the log is eventually generated.
         </para>
         <para>
-        Default log template is:`seaslog.default_template = "%T | %L | %P | %Q | %t | %M"`,
-        that's mean,default log style is:`{dateTime} | {level} | {pid} | {uniqid} | {timeStamp} | {logInfo}`
+        Default log template is: <literal>seaslog.default_template = "%T | %L | %P | %Q | %t | %M"</literal>,
+        that's mean,default log style is: <literal>{dateTime} | {level} | {pid} | {uniqid} | {timeStamp} | {logInfo}</literal>
         </para>
         <para>
-        If you custom log template, such as:`seaslog.default_template = "[%T]:%L %P %Q %t %M" `,
-        that's will mean,log style was custom as:`[{dateTime}]:{level} {pid} {uniqid} {timeStamp} {logInfo}`
+         If you custom log template, such as: <literal>seaslog.default_template = "[%T]:%L %P %Q %t %M"</literal>,
+         that's will mean,log style was custom as: <literal>[{dateTime}]:{level} {pid} {uniqid} {timeStamp} {logInfo}</literal>
         </para>
         <table>
           <title>Seaslog Default Variable Table</title>
@@ -547,17 +547,17 @@ The log style finally formatted such as:
               </row>
               <row>
                 <entry>%T</entry>
-                <entry>DateTime. Such as`2017-08-16 19:15:02`,affected by `seaslog.default_datetime_format`.</entry>
+               <entry>DateTime. Such as <literal>2017-08-16 19:15:02</literal>, affected by <literal>seaslog.default_datetime_format</literal>.</entry>
               </row>
               <row>
                 <entry>%t</entry>
-                <entry>Timestamp. Such as`1502882102.862`,accurate to milliseconds.</entry>
+               <entry>Timestamp. Such as <literal>1502882102.862</literal>,accurate to milliseconds.</entry>
               </row>
               <row>
                 <entry>%Q</entry>
                 <entry>RequestId. To distinguish a single request, 
-                such as not invoking the `SeasLog::setRequestId($string)` function,
-                the unique value generated by the built-in `static char *get_uniqid ()` 
+                 such as not invoking the <literal>SeasLog::setRequestId($string)</literal> function,
+                 the unique value generated by the built-in <literal>static char *get_uniqid ()</literal> 
                 function is used when the request is initialized.</entry>
               </row>
               <row>
@@ -570,37 +570,37 @@ The log style finally formatted such as:
               </row>
               <row>
                 <entry>%D</entry>
-                <entry>Domain:Port. Such as`www.cloudwise.com:80`; When Cli, Such as `cli`.</entry>
+               <entry>Domain:Port. Such as <literal>www.cloudwise.com:80</literal>; When Cli, Such as <literal>cli</literal>.</entry>
               </row>
               <row>
                 <entry>%R</entry>
-                <entry>Request URI. Such as`/app/user/signin`; 
-                When Cli it's the index script, Such as `CliIndex.php`.</entry>
+               <entry>Request URI. Such as <literal>/app/user/signin</literal>; 
+                When Cli it's the index script, Such as <literal>CliIndex.php</literal>.</entry>
               </row>
               <row>
                 <entry>%m</entry>
-                <entry>Request Method. Such as`Get`; When Cli it's the command script, Such as `/bin/bash`.</entry>
+               <entry>Request Method. Such as <literal>Get</literal>; When Cli it's the command script, Such as <literal>/bin/bash</literal>.</entry>
               </row>
               <row>
                 <entry>%I</entry>
-                <entry>Client IP; When Cli it's `local`. 
+               <entry>Client IP; When Cli it's <literal>local</literal>. 
                 Priority value: HTTP_X_REAL_IP > HTTP_X_FORWARDED_FOR > REMOTE_ADDR</entry>
               </row>
               <row>
                 <entry>%F</entry>
-                <entry>FileName:LineNo. Such as `UserService.php:118`.</entry>
+               <entry>FileName:LineNo. Such as <literal>UserService.php:118</literal>.</entry>
               </row>
               <row>
                 <entry>%U</entry>
-                <entry>MemoryUsage. byte. Call `zend_memory_usage`.</entry>
+               <entry>MemoryUsage. byte. Call <literal>zend_memory_usage</literal>.</entry>
               </row>
               <row>
                 <entry>%u</entry>
-                <entry>PeakMemoryUsage. byte. Call `zend_memory_peak_usage`.</entry>
+               <entry>PeakMemoryUsage. byte. Call <literal>zend_memory_peak_usage</literal>.</entry>
               </row>
               <row>
                 <entry>%C</entry>
-                <entry>`TODO` Class::Action. Such as `UserService::getUserInfo`</entry>
+               <entry><literal>TODO</literal> Class::Action. Such as <literal>UserService::getUserInfo</literal></entry>
               </row>
             </tbody>
             </tgroup>
diff --git a/reference/sem/book.xml b/reference/sem/book.xml
index 50c63bdd00..2ca0a42c6e 100644
--- a/reference/sem/book.xml
+++ b/reference/sem/book.xml
@@ -10,7 +10,7 @@
  <preface xml:id="intro.sem">
   &reftitle.intro;
   <para>
-   This module provides wrappers for the System V IPC family of functions.
+   These modules provide wrappers for the System V IPC family of functions.
    It includes semaphores, shared memory and inter-process messaging (IPC).
   </para>
   <para>
@@ -60,7 +60,13 @@
    data between processes, without the need for setting up an alternative
    using Unix domain sockets.
   </para>
-  &note.no-windows.extension;
+  <note>
+   <simpara>
+    Only the shared memory functions and <function>ftok</function> are available
+    on Windows. Neither semaphores nor inter-process messaging functions are
+    supported on that platform.
+   </simpara>
+  </note>
  </preface>
  <!-- }}} -->
  
diff --git a/reference/sem/constants.xml b/reference/sem/constants.xml
index 05a75bd106..8d652ada64 100644
--- a/reference/sem/constants.xml
+++ b/reference/sem/constants.xml
@@ -3,49 +3,59 @@
 <appendix xml:id="sem.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
- <para>
-  <table>
-   <title>System V message constants</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Type</entry>
-       <entry>Changelog</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>MSG_IPC_NOWAIT</entry>
-       <entry><type>int</type></entry>
-       <entry />
-      </row>
-      <row>
-        <entry>MSG_EAGAIN</entry>
-        <entry><type>int</type></entry>
-        <entry>As of 5.2.0</entry>
-      </row>
-      <row>
-        <entry>MSG_ENOMSG</entry>
-        <entry><type>int</type></entry>
-        <entry>As of 5.2.0</entry>
-      </row>
-      <row>
-        <entry>MSG_NOERROR</entry>
-        <entry><type>int</type></entry>
-        <entry />
-      </row>
-      <row>
-       <entry>MSG_EXCEPT</entry>
-       <entry><type>int</type></entry>
-       <entry />
-      </row>
-     </tbody>
-    </tgroup>
-  </table>
- </para>
+ <variablelist>
+  <varlistentry xml:id="constant.msg-ipc-nowait">
+   <term>
+    <constant>MSG_IPC_NOWAIT</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.msg-eagain">
+   <term>
+    <constant>MSG_EAGAIN</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.msg-enomsg">
+   <term>
+    <constant>MSG_ENOMSG</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.msg-noerror">
+   <term>
+    <constant>MSG_NOERROR</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.msg-except">
+   <term>
+    <constant>MSG_EXCEPT</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
 </appendix>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/session/constants.xml b/reference/session/constants.xml
index 50c3cc7616..617237181c 100644
--- a/reference/session/constants.xml
+++ b/reference/session/constants.xml
@@ -25,7 +25,7 @@
    </term>
    <listitem>
     <simpara>
-     Since PHP 5.4.0. Return value of <function>session_status</function> if sessions are disabled.
+     Return value of <function>session_status</function> if sessions are disabled.
     </simpara>
    </listitem>
   </varlistentry>
@@ -36,7 +36,7 @@
    </term>
    <listitem>
     <simpara>
-     Since PHP 5.4.0. Return value of <function>session_status</function> if sessions are enabled,
+     Return value of <function>session_status</function> if sessions are enabled,
      but no session exists.
     </simpara>
    </listitem>
@@ -48,7 +48,7 @@
    </term>
    <listitem>
     <simpara>
-     Since PHP 5.4.0. Return value of <function>session_status</function> if sessions are enabled,
+     Return value of <function>session_status</function> if sessions are enabled,
      and a session exists.
     </simpara>
    </listitem>
diff --git a/reference/session/examples.xml b/reference/session/examples.xml
index 8f3c442598..efe6177a6e 100644
--- a/reference/session/examples.xml
+++ b/reference/session/examples.xml
@@ -197,8 +197,8 @@ here</a>.
   <para>
    To implement database storage, or any other storage method, you
    will need to use <function>session_set_save_handler</function> to
-   create a set of user-level storage functions. As of PHP 5.4.0 you may create session handlers
-   using the <classname>SessionHandlerInterface</classname> or extend internal PHP handlers by inheriting
+   create a set of user-level storage functions. A session handlers may be created
+   using the <classname>SessionHandlerInterface</classname> or extending PHP's internal handlers by inheriting
    from <classname>SessionHandler</classname>.
   </para>
   <para>
diff --git a/reference/session/functions/session-abort.xml b/reference/session/functions/session-abort.xml
index 60c55e61b6..335ec7072f 100644
--- a/reference/session/functions/session-abort.xml
+++ b/reference/session/functions/session-abort.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-destroy.xml b/reference/session/functions/session-destroy.xml
index bd475a8c1f..e135c05096 100644
--- a/reference/session/functions/session-destroy.xml
+++ b/reference/session/functions/session-destroy.xml
@@ -59,6 +59,11 @@
   </warning>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-encode.xml b/reference/session/functions/session-encode.xml
index 1dda3a1486..2ac4379a85 100644
--- a/reference/session/functions/session-encode.xml
+++ b/reference/session/functions/session-encode.xml
@@ -22,6 +22,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-gc.xml b/reference/session/functions/session-gc.xml
index 1c986a24f2..bbcfcc59a5 100644
--- a/reference/session/functions/session-gc.xml
+++ b/reference/session/functions/session-gc.xml
@@ -32,6 +32,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-get-cookie-params.xml b/reference/session/functions/session-get-cookie-params.xml
index 8818267802..05bc50f818 100644
--- a/reference/session/functions/session-get-cookie-params.xml
+++ b/reference/session/functions/session-get-cookie-params.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-is-registered.xml b/reference/session/functions/session-is-registered.xml
deleted file mode 100644
index 20c7d95e58..0000000000
--- a/reference/session/functions/session-is-registered.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.session-is-registered">
- <refnamediv>
-  <refname>session_is_registered</refname>
-  <refpurpose>Find out whether a global variable is registered in a session</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>session_is_registered</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Finds out whether a global variable is registered in a session.
-  </para>
-  &warn.deprecated.function-5-3-0.removed-5-4-0;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The variable name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <function>session_is_registered</function> returns &true; if there is a
-   global variable with the name <parameter>name</parameter> registered in
-   the current session, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    If <varname>$_SESSION</varname> is used, use <function>isset</function> to check a
-    variable is registered in <varname>$_SESSION</varname>.
-   </para>
-  </note>
-  <caution>
-   <para>
-    If you are using <varname>$_SESSION</varname>
-    (or <varname>$HTTP_SESSION_VARS</varname>), do not use
-    <function>session_register</function>,
-    <function>session_is_registered</function> and
-    <function>session_unregister</function>.
-   </para>
-  </caution>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/session/functions/session-regenerate-id.xml b/reference/session/functions/session-regenerate-id.xml
index 0889e465cc..75cacecc13 100644
--- a/reference/session/functions/session-regenerate-id.xml
+++ b/reference/session/functions/session-regenerate-id.xml
@@ -91,7 +91,7 @@ if (isset($_SESSION['destroyed'])
 $old_sessionid = session_id();
 
 // Set destroyed timestamp
-$_SESSION['destroyed'] = time(); // Since PHP 7.0.0 and up, session_regenerate_id() saves old session data
+$_SESSION['destroyed'] = time(); // session_regenerate_id() saves old session data
 
 // Simply calling session_regenerate_id() may result in lost session, etc.
 // See next example.
diff --git a/reference/session/functions/session-reset.xml b/reference/session/functions/session-reset.xml
index b66ea05196..8a947ef882 100644
--- a/reference/session/functions/session-reset.xml
+++ b/reference/session/functions/session-reset.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-set-save-handler.xml b/reference/session/functions/session-set-save-handler.xml
index 897be804aa..df23668708 100644
--- a/reference/session/functions/session-set-save-handler.xml
+++ b/reference/session/functions/session-set-save-handler.xml
@@ -20,7 +20,7 @@
    <methodparam choice="opt"><type>callable</type><parameter>update_timestamp</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Since PHP 5.4 it is possible to register the following prototype:
+   It is possible to register the following prototype:
   </para>
   <methodsynopsis>
    <type>bool</type><methodname>session_set_save_handler</methodname>
@@ -50,7 +50,7 @@
        <interfacename>SessionIdInterface</interfacename> and/or
        <interfacename>SessionUpdateTimestampHandlerInterface</interfacename>, such as
        <classname>SessionHandler</classname>, to register as the session
-       handler. Since PHP 5.4 only.
+       handler.
       </para>
      </listitem>
     </varlistentry>
@@ -279,7 +279,7 @@
      Custom session handler: see full code in <classname>SessionHandlerInterface</classname> synopsis.
     </title>
     <para>
-     The following code is for PHP version 5.4.0 and above.  We just show the invocation here, the full example can be
+     We just show the invocation here, the full example can be
      seen in the <classname>SessionHandlerInterface</classname> synopsis linked above.
     </para>
     <para>
@@ -299,95 +299,6 @@ $handler = new MySessionHandler();
 session_set_save_handler($handler, true);
 session_start();
 
-// proceed to set and retrieve values by key from $_SESSION
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Custom session save handler using objects</title>
-    <para>
-     The following code is for PHP versions less than 5.4.0.
-    </para>
-    <para>
-     The following example provides file based session storage similar to the
-     PHP sessions default save handler <parameter>files</parameter>.  This
-     example could easily be extended to cover database storage using your
-     favorite PHP supported database engine.
-    </para>
-    <para>
-     Note we additionally register the shutdown function <function>session_write_close</function>
-     using <function>register_shutdown_function</function> under PHP less than 5.4.0.
-     This is generally advised when registering objects as session save handlers under PHP less
-     than 5.4.0.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class FileSessionHandler
-{
-    private $savePath;
-
-    function open($savePath, $sessionName)
-    {
-        $this->savePath = $savePath;
-        if (!is_dir($this->savePath)) {
-            mkdir($this->savePath, 0777);
-        }
-
-        return true;
-    }
-
-    function close()
-    {
-        return true;
-    }
-
-    function read($id)
-    {
-        return (string)@file_get_contents("$this->savePath/sess_$id");
-    }
-
-    function write($id, $data)
-    {
-        return file_put_contents("$this->savePath/sess_$id", $data) === false ? false : true;
-    }
-
-    function destroy($id)
-    {
-        $file = "$this->savePath/sess_$id";
-        if (file_exists($file)) {
-            unlink($file);
-        }
-
-        return true;
-    }
-
-    function gc($maxlifetime)
-    {
-        foreach (glob("$this->savePath/sess_*") as $file) {
-            if (filemtime($file) + $maxlifetime < time() && file_exists($file)) {
-                unlink($file);
-            }
-        }
-
-        return true;
-    }
-}
-
-$handler = new FileSessionHandler();
-session_set_save_handler(
-    array($handler, 'open'),
-    array($handler, 'close'),
-    array($handler, 'read'),
-    array($handler, 'write'),
-    array($handler, 'destroy'),
-    array($handler, 'gc')
-    );
-
-// the following prevents unexpected effects when using objects as save handlers
-register_shutdown_function('session_write_close');
-
-session_start();
 // proceed to set and retrieve values by key from $_SESSION
 ]]>
     </programlisting>
@@ -399,23 +310,7 @@ session_start();
   &reftitle.notes;
   <warning>
    <para>
-    When using objects as session save handlers, it is important to register the
-    shutdown function with PHP to avoid unexpected side-effects from the way
-    PHP internally destroys objects on shutdown and may prevent the
-    <parameter>write</parameter> and <parameter>close</parameter> from being called.
-    Typically you should register <parameter>'session_write_close'</parameter> using the
-    <function>register_shutdown_function</function> function.
-   </para>
-   <para>
-    As of PHP 5.4.0 you can use <function>session_register_shutdown</function> or
-    simply use the 'register shutdown' flag when invoking
-    <function>session_set_save_handler</function> using the OOP method and passing an
-    instance that implements <classname>SessionHandlerInterface</classname>.
-   </para>
-  </warning>
-  <warning>
-   <para>
-    As of PHP 5.0.5 the <parameter>write</parameter> and
+    The <parameter>write</parameter> and
     <parameter>close</parameter> handlers are called after object
     destruction and therefore cannot use objects or throw exceptions.
     Exceptions are not able to be caught since will not be caught nor will
@@ -450,7 +345,7 @@ session_start();
      configuration directive.
     </member>
     <member>The <function>register_shutdown_function</function></member>
-    <member>The <function>session_register_shutdown</function> for PHP 5.4.0+</member>
+    <member>The <function>session_register_shutdown</function></member>
     <member>
      Refer to <link xlink:href="&url.session-save-handler;">save_handler.inc</link>
      for a full procedural reference implementation
diff --git a/reference/session/functions/session-status.xml b/reference/session/functions/session-status.xml
index f2d62aa152..1e070b04ad 100644
--- a/reference/session/functions/session-status.xml
+++ b/reference/session/functions/session-status.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1><!-- }}} -->
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-unregister.xml b/reference/session/functions/session-unregister.xml
deleted file mode 100644
index 9da6d45e86..0000000000
--- a/reference/session/functions/session-unregister.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.session-unregister">
- <refnamediv>
-  <refname>session_unregister</refname>
-  <refpurpose>Unregister a global variable from the current session</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>session_unregister</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>session_unregister</function> unregisters the global variable
-   named <parameter>name</parameter> from the current session.
-  </para>
-  &warn.deprecated.function-5-3-0.removed-5-4-0;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The variable name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    If <varname>$_SESSION</varname> is used, use <function>unset</function> to
-    unregister a session variable. Do not <function>unset</function>
-    <varname>$_SESSION</varname> itself as this will disable the special
-    function of the <varname>$_SESSION</varname> superglobal.
-   </para>
-  </note>
-  <caution>
-   <para>
-    This function does not unset the corresponding global variable for
-    <parameter>name</parameter>, it only prevents the variable from being
-    saved as part of the session. You must call <function>unset</function>
-    to remove the corresponding global variable.
-   </para>
-  </caution>
-  <caution>
-   <para>
-    If you are using <varname>$_SESSION</varname> (or
-    <varname>$HTTP_SESSION_VARS</varname>), do not use
-    <function>session_register</function>,
-    <function>session_is_registered</function> and
-    <function>session_unregister</function>.
-   </para>
-  </caution>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/session/functions/session-unset.xml b/reference/session/functions/session-unset.xml
index 21164ecdb6..87b0831876 100644
--- a/reference/session/functions/session-unset.xml
+++ b/reference/session/functions/session-unset.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/functions/session-write-close.xml b/reference/session/functions/session-write-close.xml
index 9ec02a6d9c..af1fa22ec4 100644
--- a/reference/session/functions/session-write-close.xml
+++ b/reference/session/functions/session-write-close.xml
@@ -26,6 +26,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/ini.xml b/reference/session/ini.xml
index bece5cddd2..0641e72e85 100644
--- a/reference/session/ini.xml
+++ b/reference/session/ini.xml
@@ -367,8 +367,7 @@
      <literal>php_binary</literal>) and WDDX are supported (name
      <literal>wddx</literal>). WDDX is only available, if PHP is
      compiled with <link linkend="ref.wddx">WDDX
-     support</link>. <literal>php_serialize</literal> is available
-     from PHP 5.5.4. <literal>php_serialize</literal> uses plain
+     support</link>. <literal>php_serialize</literal> uses plain
      serialize/unserialize function internally and does not have
      limitations that <literal>php</literal>
      and <literal>php_binary</literal> have. Older serialize handlers
@@ -472,7 +471,7 @@
      which are available on many Unix systems.
     </simpara>
     <simpara>
-     This feature is supported on Windows since PHP 5.3.3. Setting 
+     This feature is supported on Windows. Setting 
      <literal>session.entropy_length</literal> to a non zero value
      will make PHP use the Windows Random API as entropy source.
     </simpara>
@@ -481,9 +480,9 @@
       Removed in PHP 7.1.0.
      </simpara>
      <simpara>
-      As of PHP 5.4.0 <literal>session.entropy_file</literal> defaults
+      <literal>session.entropy_file</literal> defaults
       to <literal>/dev/urandom</literal> or <literal>/dev/arandom</literal>
-      if it is available. In PHP 5.3.0 this directive is left empty by default.
+      if it is available.
      </simpara>
     </note>
    </listitem>
@@ -567,7 +566,7 @@
      cookies to store the session id on the client side.
      Enabling this setting prevents attacks involved passing session
      ids in URLs.
-     Defaults to <literal>1</literal> (enabled) since PHP 5.3.0.
+     Defaults to <literal>1</literal> (enabled).
     </simpara>
    </listitem>
   </varlistentry>
@@ -865,7 +864,7 @@
      '1' means SHA-1 (160 bits).
     </simpara>
     <para>
-     Since PHP 5.3.0 it is also possible to specify any of the algorithms
+     It is also possible to specify any of the algorithms
      provided by the <link linkend="ref.hash">hash extension</link> (if it is
      available), like <literal>sha512</literal> or
      <literal>whirlpool</literal>. A complete list of supported algorithms can
@@ -873,7 +872,7 @@
     </para>
     <note>
      <simpara>
-      This setting was introduced in PHP 5. Removed in PHP 7.1.0.
+      Removed in PHP 7.1.0.
      </simpara>
     </note>
    </listitem>
diff --git a/reference/session/security.xml b/reference/session/security.xml
index a818b734e6..4c8671d11f 100644
--- a/reference/session/security.xml
+++ b/reference/session/security.xml
@@ -72,9 +72,8 @@
    </para>
 
    <para>
-    As of PHP 5.5.2,
-    <link linkend="ini.session.use-strict-mode">session.use_strict_mode</link>
-    is available. When it is enabled, and the session save handler supports it,
+    When <link linkend="ini.session.use-strict-mode">session.use_strict_mode</link> is enabled, 
+    and the session save handler supports it,
     an uninitialized session ID is rejected and a new one is created.
     This prevents an attack that forces users to use a known session ID.
     An attacker may paste links or send emails that contains the session ID.
@@ -190,8 +189,8 @@
     Session IDs <emphasis>must</emphasis> be regenerated when user privileges
     are elevated, such as after authenticating.
     <function>session_regenerate_id</function> must be called prior to
-    setting the authentication information to $_SESSION. (As of PHP 7.0.0,
-    <function>session_regenerate_id</function> saves the current session data
+    setting the authentication information to $_SESSION. 
+    (<function>session_regenerate_id</function> saves the current session data
     automatically in order to save timestamp/etc. to the current session.)
     Ensure only the new session contains the authenticated flag.
    </para>
diff --git a/reference/session/sessionhandler.xml b/reference/session/sessionhandler.xml
index 24c323182f..88fa9ac78b 100644
--- a/reference/session/sessionhandler.xml
+++ b/reference/session/sessionhandler.xml
@@ -93,30 +93,6 @@
    </warning>
   </section>
 
-  <section role="changelog" xml:id="sessionhandler.changelog"><!-- {{{ -->
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.5.1</entry>
-        <entry>
-         Added <function>SessionHandler::create_sid</function>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section><!-- }}} -->
-
   <section xml:id="sessionhandler.examples">
    <example>
     <title>
diff --git a/reference/session/sessionhandler/create-sid.xml b/reference/session/sessionhandler/create-sid.xml
index ebb933d55a..f5309e8381 100644
--- a/reference/session/sessionhandler/create-sid.xml
+++ b/reference/session/sessionhandler/create-sid.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/session/sessionhandler/read.xml b/reference/session/sessionhandler/read.xml
index c23895b286..3ef5642c80 100644
--- a/reference/session/sessionhandler/read.xml
+++ b/reference/session/sessionhandler/read.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SessionHandler::read</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>SessionHandler::read</methodname>
    <methodparam><type>string</type><parameter>id</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -52,7 +52,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an encoded string of the read data. If nothing was read, it must return an empty string. Note this value is returned internally to PHP for processing.
+   Returns an encoded string of the read data. If nothing was read, it must return &false;. Note this value is returned internally to PHP for processing.
   </para>
  </refsect1>
 
diff --git a/reference/session/sessionhandlerinterface.xml b/reference/session/sessionhandlerinterface.xml
index 4dcf5ef12c..45c45bd1a5 100644
--- a/reference/session/sessionhandlerinterface.xml
+++ b/reference/session/sessionhandlerinterface.xml
@@ -25,7 +25,7 @@
 <!-- }}} -->
 
   <section xml:id="sessionhandlerinterface.synopsis">
-   &reftitle.classsynopsis;
+   &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
    <classsynopsis>
@@ -33,9 +33,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>SessionHandlerInterface</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>SessionHandlerInterface</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
 
diff --git a/reference/session/sessionhandlerinterface/gc.xml b/reference/session/sessionhandlerinterface/gc.xml
index 12bca46c74..a260d38cd5 100644
--- a/reference/session/sessionhandlerinterface/gc.xml
+++ b/reference/session/sessionhandlerinterface/gc.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>bool</type></type><methodname>SessionHandlerInterface::gc</methodname>
+   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>SessionHandlerInterface::gc</methodname>
    <methodparam><type>int</type><parameter>max_lifetime</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/session/sessionhandlerinterface/read.xml b/reference/session/sessionhandlerinterface/read.xml
index 868d94df87..29aaab046e 100644
--- a/reference/session/sessionhandlerinterface/read.xml
+++ b/reference/session/sessionhandlerinterface/read.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>SessionHandlerInterface::read</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>SessionHandlerInterface::read</methodname>
    <methodparam><type>string</type><parameter>id</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -22,7 +22,7 @@
    This method should retrieve the session data from storage by the
    session ID provided. The string returned by this method must be in the same
    serialized format as when originally passed to the <function>SessionHandlerInterface::write</function>
-   If the record was not found, return an empty string.
+   If the record was not found, return &false;.
   </para>
   <para>
    The data returned by this method will be decoded internally by PHP using the
@@ -52,7 +52,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an encoded string of the read data. If nothing was read, it must return an empty string. Note this value is returned internally to PHP for processing.
+   Returns an encoded string of the read data. If nothing was read, it must return &false;. Note this value is returned internally to PHP for processing.
   </para>
  </refsect1>
 
diff --git a/reference/session/sessionidinterface.xml b/reference/session/sessionidinterface.xml
index 38c0601458..a11c459485 100644
--- a/reference/session/sessionidinterface.xml
+++ b/reference/session/sessionidinterface.xml
@@ -25,7 +25,7 @@
 <!-- }}} -->
 
   <section xml:id="sessionidinterface.synopsis">
-   &reftitle.classsynopsis;
+   &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
    <classsynopsis>
@@ -33,9 +33,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>SessionIdInterface</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>SessionIdInterface</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/reference/session/upload-progress.xml b/reference/session/upload-progress.xml
index f57ac4990f..085fe53c68 100644
--- a/reference/session/upload-progress.xml
+++ b/reference/session/upload-progress.xml
@@ -4,12 +4,6 @@
 <chapter xml:id="session.upload-progress" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Session Upload Progress</title>
 
- <note>
-  <simpara>
-   This feature is available as of PHP 5.4.0.
-  </simpara>
- </note>
-
  <para>
   When the
   <link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link>
diff --git a/reference/simplexml/configure.xml b/reference/simplexml/configure.xml
index 7dfc32be0f..1220e19142 100644
--- a/reference/simplexml/configure.xml
+++ b/reference/simplexml/configure.xml
@@ -6,10 +6,6 @@
   &installation.enabled.disable;
   <option role="configure">--disable-simplexml</option>
  </para>
- <para>
-  Note: Before PHP 5.1.2, <option role="configure">--enable-simplexml</option> is
-  required to enable this extension.
- </para>
 </section>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/simplexml/examples.xml b/reference/simplexml/examples.xml
index 6cc9f75b6f..7e7339a938 100644
--- a/reference/simplexml/examples.xml
+++ b/reference/simplexml/examples.xml
@@ -217,7 +217,7 @@ My favorite movie.PHP: Behind the Parser
     <title>Comparing Two Elements</title>
     <simpara>
      Two SimpleXMLElements are considered different even if they point to the
-     same element since PHP 5.2.0.
+     same element.
     </simpara>
     <programlisting role="php">
 <![CDATA[
@@ -226,7 +226,7 @@ include 'example.php';
 
 $movies1 = new SimpleXMLElement($xmlstr);
 $movies2 = new SimpleXMLElement($xmlstr);
-var_dump($movies1 == $movies2); // false since PHP 5.2.0
+var_dump($movies1 == $movies2);
 ?>
 ]]>
     </programlisting>
@@ -327,7 +327,7 @@ echo $movies->asXML();
    <example>
     <title>Adding elements and attributes</title>
     <simpara>
-     Since PHP 5.1.3, SimpleXML has had the ability to easily add children and
+     SimpleXML has had the ability to easily add children and
      attributes.
     </simpara>
     <programlisting role="php">
diff --git a/reference/simplexml/functions/simplexml-import-dom.xml b/reference/simplexml/functions/simplexml-import-dom.xml
index ba451efa7a..8c036acead 100644
--- a/reference/simplexml/functions/simplexml-import-dom.xml
+++ b/reference/simplexml/functions/simplexml-import-dom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.simplexml-import-dom' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.simplexml-import-dom" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>simplexml_import_dom</refname>
   <refpurpose>Get a <literal>SimpleXMLElement</literal> object from a DOM node</refpurpose>
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>SimpleXMLElement</type><type>null</type></type><methodname>simplexml_import_dom</methodname>
-   <methodparam><type>DOMNode</type><parameter>node</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"SimpleXMLElement"</initializer></methodparam>
+   <methodparam><type class="union"><type>SimpleXMLElement</type><type>DOMNode</type></type><parameter>node</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>class_name</parameter><initializer>SimpleXMLElement::class</initializer></methodparam>
   </methodsynopsis>
   <para>
    This function takes a node of a <link linkend="book.dom">DOM</link>
@@ -95,7 +95,6 @@ blah
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/functions/simplexml-load-file.xml b/reference/simplexml/functions/simplexml-load-file.xml
index e97f4dee44..b2bcfc78cf 100644
--- a/reference/simplexml/functions/simplexml-load-file.xml
+++ b/reference/simplexml/functions/simplexml-load-file.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.simplexml-load-file' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.simplexml-load-file" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>simplexml_load_file</refname>
   <refpurpose>
@@ -12,9 +12,9 @@
   <methodsynopsis>
    <type class="union"><type>SimpleXMLElement</type><type>false</type></type><methodname>simplexml_load_file</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"SimpleXMLElement"</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>class_name</parameter><initializer>SimpleXMLElement::class</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>namespace_or_prefix</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -32,16 +32,6 @@
       <para>
        Path to the XML file
       </para>
-      <note>
-       <para>
-        Libxml 2 unescapes the URI, so if you want to pass e.g.
-        <literal>b&amp;c</literal> as the URI parameter <literal>a</literal>,
-        you have to call
-        <literal>simplexml_load_file(rawurlencode('http://example.com/?a=' .
-        urlencode('b&amp;c')))</literal>. Since PHP 5.1.0 you don't need to do
-        this because PHP will do it for you.
-       </para>
-      </note>
      </listitem>
     </varlistentry>
     <varlistentry>
@@ -59,14 +49,13 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       Since PHP 5.1.0 and Libxml 2.6.0, you may also use the
-       <parameter>options</parameter> parameter to specify <link
-       linkend="libxml.constants">additional Libxml parameters</link>.
+       Since Libxml 2.6.0, you may also use the
+       <parameter>options</parameter> parameter to specify <link linkend="libxml.constants">additional Libxml parameters</link>.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ns</parameter></term>
+     <term><parameter>namespace_or_prefix</parameter></term>
      <listitem>
       <para>
        Namespace prefix or URI.
@@ -77,7 +66,7 @@
      <term><parameter>is_prefix</parameter></term>
      <listitem>
       <para>
-       &true; if <parameter>ns</parameter> is a prefix, &false; if it's a URI;
+       &true; if <parameter>namespace_or_prefix</parameter> is a prefix, &false; if it's a URI;
        defaults to &false;.
       </para>
      </listitem>
@@ -109,30 +98,6 @@
    </para>
   </tip>
  </refsect1><!-- }}} -->
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.2.0</entry>
-       <entry>
-        The optional parameter <parameter>is_prefix</parameter> was added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
@@ -168,7 +133,7 @@ SimpleXMLElement Object
 ]]>
     </screen>
     <simpara>
-     At this point, you can go about using <literal>$xml->title</literal>
+     At this point, you can go about using <literal>$xml-&gt;title</literal>
      and any other elements.
     </simpara>
    </example>
@@ -181,14 +146,13 @@ SimpleXMLElement Object
    <simplelist>
     <member><function>simplexml_load_string</function></member>
     <member><methodname>SimpleXMLElement::__construct</methodname></member>
-    <member><xref linkend="simplexml.examples-errors" /></member>
+    <member><xref linkend="simplexml.examples-errors"/></member>
     <member><function>libxml_use_internal_errors</function></member>
     <member><xref linkend="simplexml.examples-basic"/></member>
    </simplelist>
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/functions/simplexml-load-string.xml b/reference/simplexml/functions/simplexml-load-string.xml
index a7913c01b1..fb810542ab 100644
--- a/reference/simplexml/functions/simplexml-load-string.xml
+++ b/reference/simplexml/functions/simplexml-load-string.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.simplexml-load-string' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.simplexml-load-string" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>simplexml_load_string</refname>
   <refpurpose>
@@ -12,9 +12,9 @@
   <methodsynopsis>
    <type class="union"><type>SimpleXMLElement</type><type>false</type></type><methodname>simplexml_load_string</methodname>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"SimpleXMLElement"</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>class_name</parameter><initializer>SimpleXMLElement::class</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>namespace_or_prefix</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -49,14 +49,13 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       Since PHP 5.1.0 and Libxml 2.6.0, you may also use the
-       <parameter>options</parameter> parameter to specify <link
-       linkend="libxml.constants">additional Libxml parameters</link>.
+       Since Libxml 2.6.0, you may also use the
+       <parameter>options</parameter> parameter to specify <link linkend="libxml.constants">additional Libxml parameters</link>.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ns</parameter></term>
+     <term><parameter>namespace_or_prefix</parameter></term>
      <listitem>
       <para>
        Namespace prefix or URI.
@@ -67,7 +66,7 @@
      <term><parameter>is_prefix</parameter></term>
      <listitem>
       <para>
-       &true; if <parameter>ns</parameter> is a prefix, &false; if it's a URI;
+       &true; if <parameter>namespace_or_prefix</parameter> is a prefix, &false; if it's a URI;
        defaults to &false;.
       </para>
      </listitem>
@@ -100,30 +99,6 @@
   </tip>
  </refsect1><!-- }}} -->
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.2.0</entry>
-       <entry>
-        The optional parameter <parameter>is_prefix</parameter> was added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -164,7 +139,7 @@ SimpleXMLElement Object
 ]]>
     </screen>
     <simpara>
-     At this point, you can go about using <literal>$xml->body</literal>
+     At this point, you can go about using <literal>$xml-&gt;body</literal>
      and such.
     </simpara>
    </example>
@@ -177,14 +152,13 @@ SimpleXMLElement Object
    <simplelist>
     <member><function>simplexml_load_file</function></member>
     <member><methodname>SimpleXMLElement::__construct</methodname></member>
-    <member><xref linkend="simplexml.examples-errors" /></member>
+    <member><xref linkend="simplexml.examples-errors"/></member>
     <member><function>libxml_use_internal_errors</function></member>
     <member><xref linkend="simplexml.examples-basic"/></member>
    </simplelist>
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/setup.xml b/reference/simplexml/setup.xml
index 509a5e19c4..0b0320fccf 100644
--- a/reference/simplexml/setup.xml
+++ b/reference/simplexml/setup.xml
@@ -8,9 +8,6 @@
  <section xml:id="simplexml.requirements">
   &reftitle.required;
   &libxml.required;
-  <para>
-   The SimpleXML extension requires PHP 5.
-  </para>
  </section>
  <!-- }}} -->
 
diff --git a/reference/simplexml/simplexmlelement/addAttribute.xml b/reference/simplexml/simplexmlelement/addAttribute.xml
index 8ad912c5c9..fff4da9e66 100644
--- a/reference/simplexml/simplexmlelement/addAttribute.xml
+++ b/reference/simplexml/simplexmlelement/addAttribute.xml
@@ -11,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>void</type><methodname>SimpleXMLElement::addAttribute</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>namespace</parameter></methodparam>
+   <methodparam><type>string</type><parameter>qualifiedName</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>namespace</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Adds an attribute to the SimpleXML element.
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>name</parameter></term>
+     <term><parameter>qualifiedName</parameter></term>
      <listitem>
       <para>
        The name of the attribute to add.
@@ -153,7 +153,6 @@ echo $sxe->asXML();
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/addChild.xml b/reference/simplexml/simplexmlelement/addChild.xml
index 624bb655ef..79d569b020 100644
--- a/reference/simplexml/simplexmlelement/addChild.xml
+++ b/reference/simplexml/simplexmlelement/addChild.xml
@@ -10,10 +10,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>SimpleXMLElement</type><methodname>SimpleXMLElement::addChild</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>namespace</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>SimpleXMLElement</type><type>null</type></type><methodname>SimpleXMLElement::addChild</methodname>
+   <methodparam><type>string</type><parameter>qualifiedName</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>value</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>namespace</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Adds a child element to the node and returns a SimpleXMLElement of the child.
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>name</parameter></term>
+     <term><parameter>qualifiedName</parameter></term>
      <listitem>
       <para>
        The name of the child element to add.
@@ -56,7 +56,7 @@
   &reftitle.returnvalues;
   <para>
    The <literal>addChild</literal> method returns a <type>SimpleXMLElement</type>
-   object representing the child added to the XML node.
+   object representing the child added to the XML node on success; &null; on failure.
   </para>
  </refsect1>
 
@@ -154,7 +154,6 @@ echo $sxe->asXML();
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/asXML.xml b/reference/simplexml/simplexmlelement/asXML.xml
index d910dd5a63..6d389ecb55 100644
--- a/reference/simplexml/simplexmlelement/asXML.xml
+++ b/reference/simplexml/simplexmlelement/asXML.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>SimpleXMLElement::asXML</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>bool</type></type><methodname>SimpleXMLElement::asXML</methodname>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>filename</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    The <literal>asXML</literal> method formats the parent object's data
@@ -27,7 +27,7 @@
      <term><parameter>filename</parameter></term>
      <listitem>
       <para>
-       If specified, the function writes the data to the file rather than
+       If a &string; value is provided, the function writes the data to the file rather than
        returning it.
       </para>
      </listitem>
@@ -46,6 +46,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>filename</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -129,7 +151,6 @@ foreach ($result as $node) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/attributes.xml b/reference/simplexml/simplexmlelement/attributes.xml
index 5b4de9b56a..a31b9154e8 100644
--- a/reference/simplexml/simplexmlelement/attributes.xml
+++ b/reference/simplexml/simplexmlelement/attributes.xml
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>SimpleXMLElement</type><type>null</type></type><methodname>SimpleXMLElement::attributes</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>namespaceOrPrefix</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>isPrefix</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
    This function provides the attributes and values defined within an xml tag.
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ns</parameter></term>
+     <term><parameter>namespaceOrPrefix</parameter></term>
      <listitem>
       <para>
        An optional namespace for the retrieved attributes
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>is_prefix</parameter></term>
+     <term><parameter>isPrefix</parameter></term>
      <listitem>
       <para>
        Default to &false;
@@ -55,30 +55,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.2.0</entry>
-       <entry>
-        The optional parameter <parameter>is_prefix</parameter> was added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -121,7 +97,6 @@ game="lonely"
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/children.xml b/reference/simplexml/simplexmlelement/children.xml
index cc7f2bccd6..90e6194fd6 100644
--- a/reference/simplexml/simplexmlelement/children.xml
+++ b/reference/simplexml/simplexmlelement/children.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>SimpleXMLElement</type><methodname>SimpleXMLElement::children</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>ns</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam>
+   <modifier>public</modifier> <type class="union"><type>SimpleXMLElement</type><type>null</type></type><methodname>SimpleXMLElement::children</methodname>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>namespaceOrPrefix</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>isPrefix</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
    This method finds the children of an element. The result follows normal
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ns</parameter></term>
+     <term><parameter>namespaceOrPrefix</parameter></term>
      <listitem>
       <para>
        An <acronym>XML</acronym> namespace.
@@ -33,12 +33,12 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>is_prefix</parameter></term>
+     <term><parameter>isPrefix</parameter></term>
      <listitem>
       <para>
-       If <parameter>is_prefix</parameter> is &true;,
-       <parameter>ns</parameter> will be regarded as a prefix. If &false;,
-       <parameter>ns</parameter> will be regarded as a namespace
+       If <parameter>isPrefix</parameter> is &true;,
+       <parameter>namespaceOrPrefix</parameter> will be regarded as a prefix. If &false;,
+       <parameter>namespaceOrPrefix</parameter> will be regarded as a namespace
        <acronym>URL</acronym>.
       </para>
      </listitem>
@@ -140,18 +140,6 @@ int(1)
    </example>
   </para>
  </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-
-  <simpara>
-   <methodname>SimpleXMLElement::children</methodname> returns a node 
-   object no matter if the current node has children or not. Use
-   <function>count</function> on the return value to see if there are any
-   children. As of PHP 5.3.0, <methodname>SimpleXMLElement::count</methodname>
-   may be used instead.
-  </simpara>
- </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
@@ -164,7 +152,6 @@ int(1)
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/construct.xml b/reference/simplexml/simplexmlelement/construct.xml
index e336dceb6b..03bfceaf3b 100644
--- a/reference/simplexml/simplexmlelement/construct.xml
+++ b/reference/simplexml/simplexmlelement/construct.xml
@@ -10,12 +10,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <constructorsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>SimpleXMLElement::__construct</methodname>
+   <modifier>public</modifier> <methodname>SimpleXMLElement::__construct</methodname>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>data_is_url</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>dataIsURL</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>namespaceOrPrefix</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>isPrefix</parameter><initializer>&false;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Creates a new <classname>SimpleXMLElement</classname> object.
@@ -31,7 +31,7 @@
      <listitem>
       <para>
        A well-formed XML string or the path or URL to an XML document if 
-       <parameter>data_is_url</parameter> is &true;.
+       <parameter>dataIsURL</parameter> is &true;.
       </para>
      </listitem>
     </varlistentry>
@@ -45,25 +45,24 @@
       </para>
       <note>
        <para>
-        It may be necessary to pass <constant><link
-        linkend="constant.libxml-parsehuge">LIBXML_PARSEHUGE</link></constant>
+        It may be necessary to pass <constant><link linkend="constant.libxml-parsehuge">LIBXML_PARSEHUGE</link></constant>
         to be able to process deeply nested XML or very large text nodes.
        </para>
       </note>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>data_is_url</parameter></term>
+     <term><parameter>dataIsURL</parameter></term>
      <listitem>
       <para>
-       By default, <parameter>data_is_url</parameter> is &false;. Use &true; to
+       By default, <parameter>dataIsURL</parameter> is &false;. Use &true; to
        specify that <parameter>data</parameter> is a path or URL to an XML 
        document instead of <type>string</type> data.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ns</parameter></term>
+     <term><parameter>namespaceOrPrefix</parameter></term>
      <listitem>
       <para>
        Namespace prefix or URI.
@@ -71,10 +70,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>is_prefix</parameter></term>
+     <term><parameter>isPrefix</parameter></term>
      <listitem>
       <para>
-       &true; if <parameter>ns</parameter> is a prefix, &false; if it's a URI;
+       &true; if <parameter>namespaceOrPrefix</parameter> is a prefix, &false; if it's a URI;
        defaults to &false;.
       </para>
      </listitem>
@@ -107,32 +106,6 @@
   </tip>
  </refsect1>
  
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.2.0</entry>
-       <entry>Added the <parameter>ns</parameter> and <parameter>is_prefix</parameter> parameters.</entry>
-      </row>
-      <row>
-       <entry>5.1.2</entry>
-       <entry>Added the <parameter>options</parameter> and <parameter>data_is_url</parameter> parameters.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -189,13 +162,12 @@ echo $sxe->asXML();
     <member><xref linkend="simplexml.examples-basic"/></member>
     <member><function>simplexml_load_string</function></member>
     <member><function>simplexml_load_file</function></member>
-    <member><xref linkend="simplexml.examples-errors" /></member>
+    <member><xref linkend="simplexml.examples-errors"/></member>
     <member><function>libxml_use_internal_errors</function></member>
    </simplelist>
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/count.xml b/reference/simplexml/simplexmlelement/count.xml
index ba871a043a..6db89aa0e8 100644
--- a/reference/simplexml/simplexmlelement/count.xml
+++ b/reference/simplexml/simplexmlelement/count.xml
@@ -17,6 +17,11 @@
    This method counts the number of children of an element.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/simplexml/simplexmlelement/getDocNamespaces.xml b/reference/simplexml/simplexmlelement/getDocNamespaces.xml
index 3e964eedf3..2257f635b6 100644
--- a/reference/simplexml/simplexmlelement/getDocNamespaces.xml
+++ b/reference/simplexml/simplexmlelement/getDocNamespaces.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SimpleXMLElement::getDocNamespaces</methodname>
+   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>SimpleXMLElement::getDocNamespaces</methodname>
    <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>from_root</parameter><initializer>&true;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>fromRoot</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns namespaces declared in document
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>from_root</parameter></term>
+     <term><parameter>fromRoot</parameter></term>
      <listitem>
       <para>
        Allows you to recursively check namespaces under a child node instead of
@@ -141,7 +141,6 @@ array(3) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/getName.xml b/reference/simplexml/simplexmlelement/getName.xml
index e86f82ab87..12eb9a3acd 100644
--- a/reference/simplexml/simplexmlelement/getName.xml
+++ b/reference/simplexml/simplexmlelement/getName.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/simplexml/simplexmlelement/registerXPathNamespace.xml b/reference/simplexml/simplexmlelement/registerXPathNamespace.xml
index e7a85deed0..359a8fdd3e 100644
--- a/reference/simplexml/simplexmlelement/registerXPathNamespace.xml
+++ b/reference/simplexml/simplexmlelement/registerXPathNamespace.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>SimpleXMLElement::registerXPathNamespace</methodname>
    <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ns</parameter></methodparam>
+   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
   </methodsynopsis>
   <para>
    Creates a prefix/ns context for the next XPath query. In particular, this is
@@ -33,12 +33,12 @@
      <listitem>
       <para>
        The namespace prefix to use in the XPath query for the namespace given in 
-       <parameter>ns</parameter>.
+       <parameter>namespace</parameter>.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>ns</parameter></term>
+     <term><parameter>namespace</parameter></term>
      <listitem>
       <para>
        The namespace to use for the XPath query. This must match a namespace in
@@ -130,7 +130,6 @@ Chapter 2
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/simplexml/simplexmlelement/xpath.xml b/reference/simplexml/simplexmlelement/xpath.xml
index 26f79babe3..5772d15d87 100644
--- a/reference/simplexml/simplexmlelement/xpath.xml
+++ b/reference/simplexml/simplexmlelement/xpath.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SimpleXMLElement::xpath</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>array</type><type>null</type><type>false</type></type><methodname>SimpleXMLElement::xpath</methodname>
+   <methodparam><type>string</type><parameter>expression</parameter></methodparam>
   </methodsynopsis>
   <para>
    The <literal>xpath</literal> method searches the SimpleXML node for
-   children matching the <acronym>XPath</acronym> <parameter>path</parameter>.
+   children matching the <acronym>XPath</acronym> <parameter>expression</parameter>.
   </para>
  </refsect1>
 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>path</parameter></term>
+     <term><parameter>expression</parameter></term>
      <listitem>
       <para>
        An XPath path
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an <type>array</type> of SimpleXMLElement objects or &false; in
+   Returns an <type>array</type> of SimpleXMLElement objects on success; or &null; or &false; in
    case of an error.
   </para>
  </refsect1>
@@ -109,7 +109,6 @@ b/c: stuff
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/snmp/functions/snmp-get-quick-print.xml b/reference/snmp/functions/snmp-get-quick-print.xml
index f654a101e6..d945e422af 100644
--- a/reference/snmp/functions/snmp-get-quick-print.xml
+++ b/reference/snmp/functions/snmp-get-quick-print.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/snmp/functions/snmp-get-valueretrieval.xml b/reference/snmp/functions/snmp-get-valueretrieval.xml
index e01c416a8e..920edeab49 100644
--- a/reference/snmp/functions/snmp-get-valueretrieval.xml
+++ b/reference/snmp/functions/snmp-get-valueretrieval.xml
@@ -16,6 +16,11 @@
    <void/>
   </methodsynopsis>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
@@ -30,7 +35,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>Using snmp_get_valueretrieval</title>
+    <title>Using <function>snmp_get_valueretrieval</function></title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/functions/snmp-read-mib.xml b/reference/snmp/functions/snmp-read-mib.xml
index c56c594a99..2c0ee85020 100644
--- a/reference/snmp/functions/snmp-read-mib.xml
+++ b/reference/snmp/functions/snmp-read-mib.xml
@@ -16,12 +16,12 @@
   
   <para>
    This function is used to load additional, e.g. vendor specific, MIBs so that
-   human readable OIDs like VENDOR-MIB::foo.1 instead of error prone numeric OIDs
+   human readable OIDs like <literal>VENDOR-MIB::foo.1</literal> instead of error prone numeric OIDs
    can be used.
   </para>
   <para>
    The order in which the MIBs are loaded does matter as the underlying Net-SNMP
-   libary will print warnings if referenced objects cannot be resolved.
+   library will print warnings if referenced objects cannot be resolved.
   </para>
   
  </refsect1>
@@ -37,6 +37,13 @@
    </variablelist>
   </para>
  </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/snmp/functions/snmp-set-oid-output-format.xml b/reference/snmp/functions/snmp-set-oid-output-format.xml
index de59fa3bed..7edafdc42c 100644
--- a/reference/snmp/functions/snmp-set-oid-output-format.xml
+++ b/reference/snmp/functions/snmp-set-oid-output-format.xml
@@ -32,22 +32,13 @@
          <tbody>
           <row><entry><constant>SNMP_OID_OUTPUT_FULL</constant></entry><entry>.iso.org.dod.internet.mgmt.mib-2.system.sysUpTime.sysUpTimeInstance</entry></row>
           <row><entry><constant>SNMP_OID_OUTPUT_NUMERIC</constant></entry><entry>.1.3.6.1.2.1.1.3.0</entry> </row>
+          <row><entry><constant>SNMP_OID_OUTPUT_MODULE</constant></entry><entry>DISMAN-EVENT-MIB::sysUpTimeInstance</entry></row>
+          <row><entry><constant>SNMP_OID_OUTPUT_SUFFIX</constant></entry><entry>sysUpTimeInstance</entry></row>
+          <row><entry><constant>SNMP_OID_OUTPUT_UCD</constant></entry><entry>system.sysUpTime.sysUpTimeInstance</entry></row>
+          <row><entry><constant>SNMP_OID_OUTPUT_NONE</constant></entry><entry>Undefined</entry></row>
          </tbody>
         </tgroup>
-       </table>
-       <para>Begining from PHP 5.4.0 four additional constants available:
-        <table>
-         <title/>
-         <tgroup cols="2">
-          <tbody>
-           <row><entry><constant>SNMP_OID_OUTPUT_MODULE</constant></entry><entry>DISMAN-EVENT-MIB::sysUpTimeInstance</entry></row>
-           <row><entry><constant>SNMP_OID_OUTPUT_SUFFIX</constant></entry><entry>sysUpTimeInstance</entry></row>
-           <row><entry><constant>SNMP_OID_OUTPUT_UCD</constant></entry><entry>system.sysUpTime.sysUpTimeInstance</entry></row>
-           <row><entry><constant>SNMP_OID_OUTPUT_NONE</constant></entry><entry>Undefined</entry></row>
-          </tbody>
-         </tgroup>
-        </table> 
-       </para>
+       </table> 
      </listitem>
     </varlistentry>
    </variablelist>
@@ -72,7 +63,7 @@
 
  snmp_read_mib("/usr/share/mibs/netsnmp/NET-SNMP-TC");
 
- // default or SNMP_OID_OUTPUT_MODULE in PHP >= 5.3.6
+ // default or SNMP_OID_OUTPUT_MODULE
  print_r( snmprealwalk('localhost', 'public', 'RFC1213-MIB::sysObjectID') );
 
  snmp_set_oid_output_format(SNMP_OID_OUTPUT_NUMERIC);
diff --git a/reference/snmp/functions/snmp-set-valueretrieval.xml b/reference/snmp/functions/snmp-set-valueretrieval.xml
index f4b230b89a..9cc05bd785 100644
--- a/reference/snmp/functions/snmp-set-valueretrieval.xml
+++ b/reference/snmp/functions/snmp-set-valueretrieval.xml
@@ -40,9 +40,9 @@
          <row>
           <entry>SNMP_VALUE_OBJECT</entry>
           <entry>
-           The return values will be objects with the properties "value" and "type", where the latter
-           is one of the SNMP_OCTET_STR, SNMP_COUNTER etc. constants. The
-           way "value" is returned is based on which one of constants
+           The return values will be objects with the properties <literal>value</literal> and <literal>type</literal>, where the latter
+           is one of the <constant>SNMP_OCTET_STR</constant>, <constant>SNMP_COUNTER</constant> etc. constants. The
+           way <literal>value</literal> is returned is based on which one of constants
            <constant>SNMP_VALUE_LIBRARY</constant>, <constant>SNMP_VALUE_PLAIN</constant> is set.
           </entry>
          </row>
@@ -82,7 +82,6 @@
  //   [value] => lo
  // )
 
- // PHP 5.4+ examples
  snmp_set_valueretrieval(SNMP_VALUE_OBJECT | SNMP_VALUE_PLAIN);
  $ret = snmpget('localhost', 'public', 'IF-MIB::ifName.1');
  // stdClass Object
diff --git a/reference/snmp/snmp/close.xml b/reference/snmp/snmp/close.xml
index d2b378ef41..3f59b7a7bc 100644
--- a/reference/snmp/snmp/close.xml
+++ b/reference/snmp/snmp/close.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/snmp/snmp/geterrno.xml b/reference/snmp/snmp/geterrno.xml
index a35964cdd8..1cccc8dd20 100644
--- a/reference/snmp/snmp/geterrno.xml
+++ b/reference/snmp/snmp/geterrno.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/snmp/snmp/geterror.xml b/reference/snmp/snmp/geterror.xml
index c70146e9bc..3effbc3118 100644
--- a/reference/snmp/snmp/geterror.xml
+++ b/reference/snmp/snmp/geterror.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/soap/constants.xml b/reference/soap/constants.xml
index 6b664c6ddc..36060d2721 100644
--- a/reference/soap/constants.xml
+++ b/reference/soap/constants.xml
@@ -157,7 +157,7 @@
       (<type>int</type>)
      </entry>
      <entry>0</entry>
-     <entry>Since PHP 5.5.0.</entry>
+     <entry></entry>
     </row>
     <row xml:id="constant.soap-ssl-method-sslv2">
      <entry>
@@ -165,7 +165,7 @@
       (<type>int</type>)
      </entry>
      <entry>1</entry>
-     <entry>Since PHP 5.5.0.</entry>
+     <entry></entry>
     </row>
     <row xml:id="constant.soap-ssl-method-sslv3">
      <entry>
@@ -173,7 +173,7 @@
       (<type>int</type>)
      </entry>
      <entry>2</entry>
-     <entry>Since PHP 5.5.0.</entry>
+     <entry></entry>
     </row>
     <row xml:id="constant.soap-ssl-method-sslv23">
      <entry>
@@ -181,7 +181,7 @@
       (<type>int</type>)
      </entry>
      <entry>3</entry>
-     <entry>Since PHP 5.5.0.</entry>
+     <entry></entry>
     </row>
     <row xml:id="constant.unknown-type">
      <entry>
diff --git a/reference/soap/soapclient/setlocation.xml b/reference/soap/soapclient/setlocation.xml
index 2a3c032c5c..d1a94bada5 100644
--- a/reference/soap/soapclient/setlocation.xml
+++ b/reference/soap/soapclient/setlocation.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__setLocation</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>location</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>location</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Sets the endpoint URL that will be touched by following SOAP requests. This is equivalent to
@@ -47,6 +47,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>location</parameter> is nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/soap/soapvar/construct.xml b/reference/soap/soapvar/construct.xml
index d30b02e2fb..c15c9e155f 100644
--- a/reference/soap/soapvar/construct.xml
+++ b/reference/soap/soapvar/construct.xml
@@ -12,10 +12,10 @@
    <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>
-   <methodparam choice="opt"><type>string</type><parameter>typeName</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>typeNamespace</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>nodeName</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>nodeNamespace</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>typeName</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>typeNamespace</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>nodeName</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>nodeNamespace</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <para>
    Constructs a new <classname>SoapVar</classname> object.
@@ -78,6 +78,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.3</entry>
+      <entry>
+       <parameter>typeName</parameter>, <parameter>typeNamespace</parameter>, <parameter>nodeName</parameter>,and
+       <parameter>nodeNamespace</parameter> are nullable now.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -117,7 +140,6 @@ $client->echoStruct(new SoapParam($soapstruct, "inputStruct"));
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/sockets/constants.xml b/reference/sockets/constants.xml
index b686fde1ea..a9eefc3826 100644
--- a/reference/sockets/constants.xml
+++ b/reference/sockets/constants.xml
@@ -187,7 +187,7 @@
    </term>
    <listitem>
     <simpara>
-     This constant is only available in PHP 5.4.10 or later on platforms that
+     This constant is only available on platforms that
      support the <constant>SO_REUSEPORT</constant> socket option: this
      includes macOS and FreeBSD, but does not include Linux or Windows.
     </simpara>
@@ -344,7 +344,6 @@
    <listitem>
     <simpara>
      Used to disable Nagle TCP algorithm.
-     Added in PHP 5.2.7. 
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/sockets/functions/socket-create-listen.xml b/reference/sockets/functions/socket-create-listen.xml
index 6f36539491..1e798c13fd 100644
--- a/reference/sockets/functions/socket-create-listen.xml
+++ b/reference/sockets/functions/socket-create-listen.xml
@@ -63,17 +63,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    If you want to create a socket which only listens on a certain
-    interface you need to use <function>socket_create</function>,
-    <function>socket_bind</function> and <function>socket_listen</function>.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -97,6 +86,17 @@
   </informaltable>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    If you want to create a socket which only listens on a certain
+    interface you need to use <function>socket_create</function>,
+    <function>socket_bind</function> and <function>socket_listen</function>.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/sockets/functions/socket-create.xml b/reference/sockets/functions/socket-create.xml
index 908d138630..709dc6c90e 100644
--- a/reference/sockets/functions/socket-create.xml
+++ b/reference/sockets/functions/socket-create.xml
@@ -200,6 +200,17 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   If an invalid <parameter>domain</parameter> or
+   <parameter>type</parameter> is given, <function>socket_create</function>
+   defaults to <constant>AF_INET</constant> and
+   <constant>SOCK_STREAM</constant> respectively and additionally emits an
+   <constant>E_WARNING</constant> message.
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -223,17 +234,6 @@
   </informaltable>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-   <para>
-    If an invalid <parameter>domain</parameter> or
-    <parameter>type</parameter> is given, <function>socket_create</function>
-    defaults to <constant>AF_INET</constant> and
-    <constant>SOCK_STREAM</constant> respectively and additionally emits an
-    <constant>E_WARNING</constant> message.
-   </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/sockets/functions/socket-get-option.xml b/reference/sockets/functions/socket-get-option.xml
index 8b0108cdba..eca330b24c 100644
--- a/reference/sockets/functions/socket-get-option.xml
+++ b/reference/sockets/functions/socket-get-option.xml
@@ -253,7 +253,7 @@
          <row>
           <entry><constant>MCAST_JOIN_GROUP</constant></entry>
           <entry>
-           Joins a multicast group. (added in PHP 5.4)
+           Joins a multicast group.
           </entry>
           <entry>
            <type>array</type> with keys <literal>"group"</literal>, specifying
@@ -269,7 +269,7 @@
          <row>
           <entry><constant>MCAST_LEAVE_GROUP</constant></entry>
           <entry>
-           Leaves a multicast group. (added in PHP 5.4)
+           Leaves a multicast group.
           </entry>
           <entry>
            <type>array</type>. See <constant>MCAST_JOIN_GROUP</constant> for
@@ -282,7 +282,6 @@
           <entry>
            Blocks packets arriving from a specific source to a specific
            multicast group, which must have been previously joined.
-           (added in PHP 5.4)
           </entry>
           <entry>
            <type>array</type> with the same keys as
@@ -297,7 +296,7 @@
           <entry>
            Unblocks (start receiving again) packets arriving from a specific
            source address to a specific multicast group, which must have been
-           previously joined. (added in PHP 5.4)
+           previously joined.
           </entry>
           <entry>
            <type>array</type> with the same format as
@@ -309,7 +308,7 @@
           <entry><constant>MCAST_JOIN_SOURCE_GROUP</constant></entry>
           <entry>
            Receive packets destined to a specific multicast group whose source
-           address matches a specific value. (added in PHP 5.4)
+           address matches a specific value.
           </entry>
           <entry>
            <type>array</type> with the same format as
@@ -321,7 +320,7 @@
           <entry><constant>MCAST_LEAVE_SOURCE_GROUP</constant></entry>
           <entry>
            Stop receiving packets destined to a specific multicast group whose
-           source address matches a specific value. (added in PHP 5.4)
+           source address matches a specific value.
           </entry>
           <entry>
            <type>array</type> with the same format as
@@ -333,7 +332,6 @@
           <entry><constant>IP_MULTICAST_IF</constant></entry>
           <entry>
            The outgoing interface for IPv4 multicast packets.
-           (added in PHP 5.4)
           </entry>
           <entry>
            Either <type>int</type> specifying the interface number or a
@@ -352,7 +350,6 @@
           <entry><constant>IPV6_MULTICAST_IF</constant></entry>
           <entry>
            The outgoing interface for IPv6 multicast packets.
-           (added in PHP 5.4)
           </entry>
           <entry>
            The same as <constant>IP_MULTICAST_IF</constant>.
@@ -366,7 +363,6 @@
            receivers in the same host that have joined the same multicast group
            on the outgoing interface used by this socket. This is the case by
            default.
-           (added in PHP 5.4)
           </entry>
           <entry>
            <type>int</type> (either <literal>0</literal> or
@@ -379,7 +375,6 @@
           <entry><constant>IPV6_MULTICAST_LOOP</constant></entry>
           <entry>
            Analogous to <constant>IP_MULTICAST_LOOP</constant>, but for IPv6.
-           (added in PHP 5.4)
           </entry>
           <entry>
            <type>int</type>. See <constant>IP_MULTICAST_LOOP</constant>.
@@ -391,7 +386,6 @@
            The time-to-live of outgoing IPv4 multicast packets. This should be
            a value between 0 (don't leave the interface) and 255. The default
            value is 1 (only the local network is reached).
-           (added in PHP 5.4)
           </entry>
           <entry>
            <type>int</type> between 0 and 255.
@@ -403,7 +397,6 @@
            Analogous to <constant>IP_MULTICAST_TTL</constant>, but for IPv6
            packets. The value -1 is also accepted, meaning the route default
            should be used.
-           (added in PHP 5.4)
           </entry>
           <entry>
            <type>int</type> between -1 and 255.
diff --git a/reference/sodium/book.xml b/reference/sodium/book.xml
index 86b2984356..165f267b46 100644
--- a/reference/sodium/book.xml
+++ b/reference/sodium/book.xml
@@ -9,7 +9,8 @@
  <preface xml:id="intro.sodium">
   &reftitle.intro;
   <para>
-
+   Sodium is a modern, easy-to-use software library for encryption, decryption, signatures, password hashing and more.
+   Its goal is to provide all of the core operations needed to build higher-level cryptographic tools.
   </para>
  </preface>
 
diff --git a/reference/sodium/functions/sodium-add.xml b/reference/sodium/functions/sodium-add.xml
index 149819b3d9..f717563d6e 100644
--- a/reference/sodium/functions/sodium-add.xml
+++ b/reference/sodium/functions/sodium-add.xml
@@ -14,11 +14,10 @@
    <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   This adds the parameter <parameter>string2</parameter> to <parameter>string1</parameter>, overwriting
+   the value stored in <parameter>string1</parameter>. This function assumes both parameters are binary
+   strings that represent unsigned integers in little-endian byte order.
   </para>
-
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +27,8 @@
     <term><parameter>string1</parameter></term>
     <listitem>
      <para>
-      
+      String representing an arbitrary-length unsigned integer in little-endian byte order.
+      This parameter is passed by reference and will hold the sum of the two parameters.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
     <term><parameter>string2</parameter></term>
     <listitem>
      <para>
-      
+      String representing an arbitrary-length unsigned integer in little-endian byte order.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/sodium/functions/sodium-base642bin.xml b/reference/sodium/functions/sodium-base642bin.xml
index 058a0fe3db..47bf0f80ad 100644
--- a/reference/sodium/functions/sodium-base642bin.xml
+++ b/reference/sodium/functions/sodium-base642bin.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-base642bin">
  <refnamediv>
   <refname>sodium_base642bin</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Decodes a base64-encoded string into raw binary.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,11 @@
    <methodparam choice="opt"><type>string</type><parameter>ignore</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   Converts a base64 encoded string into raw binary. Unlike <function>base64_decode</function>,
+   <function>sodium_base642bin</function> is constant-time (a property that is important for any code that
+   touches cryptographic inputs, such as plaintexts or keys) and supports multiple character sets.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +29,7 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      <type>string</type>; Encoded string.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +37,23 @@
     <term><parameter>id</parameter></term>
     <listitem>
      <para>
-      
+      <simplelist>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+        Base64 encoding.
+       </member>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+        Base64 encoding, without <literal>=</literal> padding characters.
+       </member>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>) Base64 encoding.
+       </member>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>)
+        Base64 encoding, without <literal>=</literal> padding characters.
+       </member>
+      </simplelist>
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +61,7 @@
     <term><parameter>ignore</parameter></term>
     <listitem>
      <para>
-      
+      Characters to ignore when decoding (e.g. whitespace characters).
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +71,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Decoded string.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-bin2base64.xml b/reference/sodium/functions/sodium-bin2base64.xml
index 7d4e7adcc9..f29c29a59b 100644
--- a/reference/sodium/functions/sodium-bin2base64.xml
+++ b/reference/sodium/functions/sodium-bin2base64.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-bin2base64">
  <refnamediv>
   <refname>sodium_bin2base64</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Encodes a raw binary string with base64.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,11 @@
    <methodparam><type>int</type><parameter>id</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Converts a raw binary string into a base64-encoded string. Unlike <function>base64_encode</function>,
+   <function>sodium_bin2base64</function> is constant-time (a property that is important for any code that
+   touches cryptographic inputs, such as plaintexts or keys) and supports multiple character sets.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +28,7 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      Raw binary string.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,23 @@
     <term><parameter>id</parameter></term>
     <listitem>
      <para>
-      
+      <simplelist>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+        Base64 encoding.
+       </member>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+        Base64 encoding, without <literal>=</literal> padding characters.
+       </member>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>) Base64 encoding.
+       </member>
+       <member>
+        <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>)
+        Base64 encoding, without <literal>=</literal> padding characters.
+       </member>
+      </simplelist>
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +62,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Base64-encoded string.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-bin2hex.xml b/reference/sodium/functions/sodium-bin2hex.xml
index 007055821b..7fbbd66228 100644
--- a/reference/sodium/functions/sodium-bin2hex.xml
+++ b/reference/sodium/functions/sodium-bin2hex.xml
@@ -13,11 +13,11 @@
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Converts a raw binary string into a hex-encoded string. Unlike the standard hex-encoding function,
+   <function>sodium_bin2hex</function> is constant-time (a property that is important for any code that
+   touches cryptographic inputs, such as plaintexts or keys).
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +27,7 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      Raw binary string.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Hex encoded string.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-compare.xml b/reference/sodium/functions/sodium-compare.xml
index 112393d38c..0a5dd56fe4 100644
--- a/reference/sodium/functions/sodium-compare.xml
+++ b/reference/sodium/functions/sodium-compare.xml
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Compare two strings as if they were arbitrary-length, unsigned little-endian integers, without side-channel leakage.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>string1</parameter></term>
     <listitem>
      <para>
-      
+      Left operand
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>string2</parameter></term>
     <listitem>
      <para>
-      
+      Right operand
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,13 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns <literal>-1</literal> if <parameter>string1</parameter> is less than <parameter>string2</parameter>.
+  </para>
+  <para>
+   Returns <literal>1</literal> if <parameter>string1</parameter> is greater than <parameter>string2</parameter>.
+  </para>
+  <para>
+   Returns <literal>0</literal> if both strings are equal.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-decrypt.xml b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-decrypt.xml
index 17f65c62d8..d6c7660aad 100644
--- a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-decrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-decrypt.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-aead-aes256gcm-decrypt">
  <refnamediv>
   <refname>sodium_crypto_aead_aes256gcm_decrypt</refname>
-  <refpurpose>Decrypt in combined mode with precalculation</refpurpose>
+  <refpurpose>Verify then decrypt a message with AES-256-GCM</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,11 +16,10 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Verify then decrypt with AES-256-GCM.
+   Only available if <function>sodium_crypto_aead_aes256gcm_is_available</function> returns &true;.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +29,8 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      Must be in the format provided by <function>sodium_crypto_aead_aes256gcm_encrypt</function>
+      (ciphertext and tag, concatenated).
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +38,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +47,7 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 12 bytes long.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +55,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +65,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the plaintext on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-encrypt.xml b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-encrypt.xml
index bcbd5e6d6f..bf12152dca 100644
--- a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-encrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-encrypt.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-aead-aes256gcm-encrypt">
  <refnamediv>
   <refname>sodium_crypto_aead_aes256gcm_encrypt</refname>
-  <refpurpose>Encrypt in combined mode with precalculation</refpurpose>
+  <refpurpose>Encrypt then authenticate with AES-256-GCM</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,11 +16,10 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt then authenticate with AES-256-GCM.
+   Only available if <function>sodium_crypto_aead_aes256gcm_is_available</function> returns &true;.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +29,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The plaintext message to encrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +37,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +46,7 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 12 bytes long.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +54,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +64,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the ciphertext and authentication tag as a string of raw binary bytes. (Format: ciphertext, then tag.)
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-is-available.xml b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-is-available.xml
index 154a1e951d..e76dbe8091 100644
--- a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-is-available.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-is-available.xml
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   The return value of this function depends on whether or not the hardware supports hardware-accelerated AES.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns &true; if it is safe to encrypt with AES-256-GCM, and &false; otherwise.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-keygen.xml b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-keygen.xml
index 7e652c7d78..6376c336ad 100644
--- a/reference/sodium/functions/sodium-crypto-aead-aes256gcm-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-aes256gcm-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-aead-aes256gcm-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_aead_aes256gcm_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random AES-256-GCM key</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,10 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random key for use with <function>sodium_crypto_aead_aes256gcm_encrypt</function> and
+   <function>sodium_crypto_aead_aes256gcm_decrypt</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a 256-bit random key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-decrypt.xml b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-decrypt.xml
index 281373119d..9d97c38bdf 100644
--- a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-decrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-decrypt.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-aead-chacha20poly1305-decrypt">
  <refnamediv>
   <refname>sodium_crypto_aead_chacha20poly1305_decrypt</refname>
-  <refpurpose>Verify that the ciphertext includes a valid tag</refpurpose>
+  <refpurpose>Verify then decrypt with ChaCha20-Poly1305</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,11 +16,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Verify then decrypt with ChaCha20-Poly1305.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +28,8 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      Must be in the format provided by <function>sodium_crypto_aead_chacha20poly1305_encrypt</function>
+      (ciphertext and tag, concatenated).
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +37,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +46,7 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 8 bytes long.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +54,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +64,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the plaintext on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-encrypt.xml b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-encrypt.xml
index 0eb292bc1b..6f6fdc7657 100644
--- a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-encrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-encrypt.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-aead-chacha20poly1305-encrypt">
  <refnamediv>
   <refname>sodium_crypto_aead_chacha20poly1305_encrypt</refname>
-  <refpurpose>Encrypt a message</refpurpose>
+  <refpurpose>Encrypt then authenticate with ChaCha20-Poly1305</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,11 +16,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt then authenticate with ChaCha20-Poly1305.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +28,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The plaintext message to encrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +36,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +45,7 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 8 bytes long.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +53,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +63,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the ciphertext and tag on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-decrypt.xml b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-decrypt.xml
index 1384f3b737..722bcb923b 100644
--- a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-decrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-decrypt.xml
@@ -16,10 +16,11 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Verify then decrypt with ChaCha20-Poly1305 (IETF variant).
+  </para>
+  <para>
+   The IETF variant uses 96-bit nonces and 32-bit internal counters, instead of 64-bit for both.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -30,7 +31,8 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      Must be in the format provided by <function>sodium_crypto_aead_chacha20poly1305_ietf_encrypt</function>
+      (ciphertext and tag, concatenated).
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +40,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +49,7 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 12 bytes long.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +57,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +67,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the plaintext on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-encrypt.xml b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-encrypt.xml
index 4f06110e7f..0475e668c0 100644
--- a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-encrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-encrypt.xml
@@ -16,10 +16,11 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt then authenticate with ChaCha20-Poly1305 (IETF variant).
+  </para>
+  <para>
+   The IETF variant uses 96-bit nonces and 32-bit internal counters, instead of 64-bit for both.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -30,7 +31,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The plaintext message to encrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +39,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +48,7 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 12 bytes long.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +56,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +66,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the ciphertext and tag on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-keygen.xml b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-keygen.xml
index 28bfd95873..17fb8a9708 100644
--- a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-ietf-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-aead-chacha20poly1305-ietf-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_aead_chacha20poly1305_ietf_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random ChaCha20-Poly1305 (IETF) key.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,10 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random key for use with <function>sodium_crypto_aead_chacha20poly1305_ietf_encrypt</function> and
+   <function>sodium_crypto_aead_chacha20poly1305_ietf_decrypt</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a 256-bit random key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-keygen.xml b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-keygen.xml
index bcce534b5b..3f88c50bc2 100644
--- a/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-chacha20poly1305-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-aead-chacha20poly1305-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_aead_chacha20poly1305_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random ChaCha20-Poly1305 key.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,10 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random key for use with <function>sodium_crypto_aead_chacha20poly1305_encrypt</function> and
+   <function>sodium_crypto_aead_chacha20poly1305_decrypt</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a 256-bit random key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-decrypt.xml b/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-decrypt.xml
index 32f61344ac..b5a12967b2 100644
--- a/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-decrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-decrypt.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-aead-xchacha20poly1305-ietf-decrypt">
  <refnamediv>
   <refname>sodium_crypto_aead_xchacha20poly1305_ietf_decrypt</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>(Preferred) Verify then decrypt with XChaCha20-Poly1305</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -17,9 +17,11 @@
   </methodsynopsis>
   <para>
 
+   Verify then decrypt with ChaCha20-Poly1305 (eXtended-nonce variant).
+  </para>
+  <para>
+   Generally, XChaCha20-Poly1305 is the best of the provided AEAD modes to use.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -30,7 +32,8 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      Must be in the format provided by <function>sodium_crypto_aead_chacha20poly1305_ietf_encrypt</function>
+      (ciphertext and tag, concatenated).
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +41,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +50,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +59,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +69,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the plaintext on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-encrypt.xml b/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-encrypt.xml
index 7bbccf2f1d..b1ea0854ea 100644
--- a/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-encrypt.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-encrypt.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-aead-xchacha20poly1305-ietf-encrypt">
  <refnamediv>
   <refname>sodium_crypto_aead_xchacha20poly1305_ietf_encrypt</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>(Preferred) Encrypt then authenticate with XChaCha20-Poly1305</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,10 +16,11 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt then authenticate with XChaCha20-Poly1305 (eXtended-nonce variant).
+  </para>
+  <para>
+   Generally, XChaCha20-Poly1305 is the best of the provided AEAD modes to use.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -30,7 +31,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The plaintext message to encrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +39,8 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Additional, authenticated data. This is used in the verification of the authentication tag
+      appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +48,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +57,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +67,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the ciphertext and tag on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-keygen.xml b/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-keygen.xml
index a2739c9a67..e40347e4c5 100644
--- a/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-aead-xchacha20poly1305-ietf-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-aead-xchacha20poly1305-ietf-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_aead_xchacha20poly1305_ietf_keygen</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Generate a random XChaCha20-Poly1305 key.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,10 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random key for use with <function>sodium_crypto_aead_xchacha20poly1305_ietf_encrypt</function> and
+   <function>sodium_crypto_aead_xchacha20poly1305_ietf_decrypt</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a 256-bit random key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-auth-keygen.xml b/reference/sodium/functions/sodium-crypto-auth-keygen.xml
index 602a11febe..02106eb290 100644
--- a/reference/sodium/functions/sodium-crypto-auth-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-auth-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-auth-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_auth_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random key for sodium_crypto_auth</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a key for use with <function>sodium_crypto_auth</function> and <function>sodium_crypto_auth_verify</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a 256-bit random key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-auth-verify.xml b/reference/sodium/functions/sodium-crypto-auth-verify.xml
index 4872b4cad1..460e112acf 100644
--- a/reference/sodium/functions/sodium-crypto-auth-verify.xml
+++ b/reference/sodium/functions/sodium-crypto-auth-verify.xml
@@ -15,10 +15,13 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Verify the authentication tag is valid for a given message and key.
+  </para>
+  <para>
+   Unlike with digital signatures (e.g. <function>sodium_crypto_sign_verify_detached</function>),
+   any party capable of verifying a message is also capable of authenticating
+   their own messages. (Hence, symmetric authentication.)
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -29,7 +32,7 @@
     <term><parameter>mac</parameter></term>
     <listitem>
      <para>
-      
+      Authentication tag produced by <function>sodium_crypto_auth</function>
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +40,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      Message
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +48,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Authentication key
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-auth.xml b/reference/sodium/functions/sodium-crypto-auth.xml
index 93572f8739..dbd4fb168f 100644
--- a/reference/sodium/functions/sodium-crypto-auth.xml
+++ b/reference/sodium/functions/sodium-crypto-auth.xml
@@ -14,10 +14,14 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Symmetric message authentication via <function>sodium_crypto_auth</function> provides
+   integrity, but not confidentiality.
+  </para>
+  <para>
+   Unlike with digital signatures (e.g. <function>sodium_crypto_sign_detached</function>),
+   any party capable of verifying a message is also capable of authenticating
+   their own messages. (Hence, symmetric authentication.)
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -28,7 +32,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message you intend to authenticate
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +40,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Authentication key
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Authentication tag
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-keypair-from-secretkey-and-publickey.xml b/reference/sodium/functions/sodium-crypto-box-keypair-from-secretkey-and-publickey.xml
index eeb5cfb306..a7a4251327 100644
--- a/reference/sodium/functions/sodium-crypto-box-keypair-from-secretkey-and-publickey.xml
+++ b/reference/sodium/functions/sodium-crypto-box-keypair-from-secretkey-and-publickey.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-box-keypair-from-secretkey-and-publickey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_keypair_from_secretkey_and_publickey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Create a unified keypair string from a secret key and public key</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,11 @@
    <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   This function exists to satisfy the API requirements of e.g. <function>crypto_box</function>.
+   Pass in one party's secret key and the other's public key, and you will obtain a "keypair" for
+   your conversation.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +29,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      Secret key.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +37,7 @@
     <term><parameter>public_key</parameter></term>
     <listitem>
      <para>
-      
+      Public key.
      </para>
     </listitem>
    </varlistentry>
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 Keypair.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-keypair.xml b/reference/sodium/functions/sodium-crypto-box-keypair.xml
index 4219c08777..c99418ca97 100644
--- a/reference/sodium/functions/sodium-crypto-box-keypair.xml
+++ b/reference/sodium/functions/sodium-crypto-box-keypair.xml
@@ -14,10 +14,12 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generates a secret key and a public key as one string.
+  </para>
+  <para>
+   To get the secret key out of this unified keypair string, see <function>sodium_crypto_box_secretkey</function>.
+   To get the public key out of this unified keypair string, see <function>sodium_crypto_box_publickey</function>.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -29,7 +31,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   One string containing both the X25519 secret key and corresponding X25519 public key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-open.xml b/reference/sodium/functions/sodium-crypto-box-open.xml
index 7c7c2cf094..2a39986cc9 100644
--- a/reference/sodium/functions/sodium-crypto-box-open.xml
+++ b/reference/sodium/functions/sodium-crypto-box-open.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box-open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_open</refname>
-  <refpurpose>Verify and decrypt a ciphertext</refpurpose>
+  <refpurpose>Authenticated public-key decryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Decrypt a message using asymmetric (public key) cryptography.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      The encrypted message to attempt to decrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +44,8 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      See <function>sodium_crypto_box_keypair_from_secretkey_and_publickey</function>.
+      This should include the sender's public key and the recipient's secret key.
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +55,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the plaintext message on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-publickey-from-secretkey.xml b/reference/sodium/functions/sodium-crypto-box-publickey-from-secretkey.xml
index 5bb431ef5f..dc95b742d1 100644
--- a/reference/sodium/functions/sodium-crypto-box-publickey-from-secretkey.xml
+++ b/reference/sodium/functions/sodium-crypto-box-publickey-from-secretkey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box-publickey-from-secretkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_publickey_from_secretkey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Calculate the public key from a secret key</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,10 +13,14 @@
    <methodparam><type>string</type><parameter>secret_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Given a secret key, calculate the corresponding public key.
+  </para>
+  <para>
+   This only works with the type of keys intended for use with <function>crypto_box</function>
+   (which uses Elliptic Curve Diffie-Hellman over the Montgomery curve, Curve25519; abbreviated as X25519),
+   not <function>crypto_sign</function> (which uses Edwards Digital Signature Algorithm over the Edwards
+   Curve with the corresponding paramaters; abbreviated Ed25519).
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -27,7 +31,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      X25519 secret key
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 public key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-publickey.xml b/reference/sodium/functions/sodium-crypto-box-publickey.xml
index 29eb7e0a0b..f7a0c3f857 100644
--- a/reference/sodium/functions/sodium-crypto-box-publickey.xml
+++ b/reference/sodium/functions/sodium-crypto-box-publickey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box-publickey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_publickey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Extract the public key from a crypto_box keypair</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Given a keypair, fetch only the public key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,8 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      A keypair, such as one generated by <function>sodium_crypto_box_keypair</function> or
+      <function>sodium_crypto_box_seed_keypair</function>
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 public key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-seal-open.xml b/reference/sodium/functions/sodium-crypto-box-seal-open.xml
index 98fd5a7f03..4de9703e43 100644
--- a/reference/sodium/functions/sodium-crypto-box-seal-open.xml
+++ b/reference/sodium/functions/sodium-crypto-box-seal-open.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box-seal-open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_seal_open</refname>
-  <refpurpose>Decrypt the ciphertext</refpurpose>
+  <refpurpose>Anonymous public-key decryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Decrypt a message that was encrypted with <function>sodium_crypto_box_seal</function>
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      The encrypted message
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      The keypair of the recipient. Must include the secret key.
      </para>
     </listitem>
    </varlistentry>
@@ -46,11 +44,40 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   The plaintext on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-box-seal-open.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_box_seal_open</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+// Ciphertext is not sensitive; base64_decode is fine
+$sealed_b64 = "oRBXXAV4iQBrxlV4A21Bord8Yo/D8ZlrIIGNyaRCcGBfpz0map52I3xq6l+CST+1NSgQkbV+HiYyFjXWiWiaCGupGf+zl4bgWj/A9Adtem7Jt3h3emrMsLw=";
+$sealed = base64_decode($sealed_b64);
+
+// Keypair contains a cryptographic secret; use a timing-safe decoder
+$keypair_b64 = "KZkF8wnB7bnC2aXB3lFOqCTc0Z6MllvaQb9ASVG8o2/MsewkuE4u1uaEgTzSakeiYyIW8DGj+02/L3cWIbs9bQ==";
+$keypair = sodium_base642bin($keypair_b64, SODIUM_BASE64_VARIANT_ORIGINAL);
+
+$opened = sodium_crypto_box_seal_open($sealed, $keypair);
+var_dump($opened);
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(41) "Writing software in PHP can be a delight!"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/sodium/functions/sodium-crypto-box-seal.xml b/reference/sodium/functions/sodium-crypto-box-seal.xml
index ee7ff5cb31..0a8f915960 100644
--- a/reference/sodium/functions/sodium-crypto-box-seal.xml
+++ b/reference/sodium/functions/sodium-crypto-box-seal.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box-seal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_seal</refname>
-  <refpurpose>Encrypt a message</refpurpose>
+  <refpurpose>Anonymous public-key encryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -11,13 +11,25 @@
   <methodsynopsis>
    <type>string</type><methodname>sodium_crypto_box_seal</methodname>
    <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
+   <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt a message such that only the recipient can decrypt it.
+  </para>
+  <para>
+   Unlike with <function>sodium_crypto_box</function>, you only need to know the recipient's
+   public key to use <function>sodium_crypto_box_seal</function>. One consequence of this
+   convenience, however, is that the ciphertext isn't bound to a static public key,
+   and is therefore not authenticated. Hence, anonymous public-key encryption.
+  </para>
+  <para>
+   <function>sodium_crypto_box_seal</function> still provides ciphertext integrity. Just not
+   sender identity authentication.
+  </para>
+  <para>
+   If you also need sender authentication, the <function>sodium_crypto_sign</function> functions
+   are likely the best place to start.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -28,15 +40,15 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message to encrypt.
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>key_pair</parameter></term>
+    <term><parameter>public_key</parameter></term>
     <listitem>
      <para>
-      
+      The public key that corresponds to the only key that can decrypt the message.
      </para>
     </listitem>
    </varlistentry>
@@ -46,10 +58,41 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   A ciphertext string in the format of (one-time public key, encrypted message, authentication tag).
   </para>
  </refsect1>
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-box-seal.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_box_seal</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+$keypair = sodium_crypto_box_keypair();
+$public_key = sodium_crypto_box_publickey($keypair);
+
+// Obfuscated plaintext to make the example more fun
+$plaintext_b64 = "V3JpdGluZyBzb2Z0d2FyZSBpbiBQSFAgY2FuIGJlIGEgZGVsaWdodCE=";
+$decoded_plaintext = sodium_base642bin($plaintext_b64, SODIUM_BASE64_VARIANT_ORIGINAL);
+
+$sealed = sodium_crypto_box_seal($decoded_plaintext, $public_key);
+var_dump(base64_encode($sealed));
+
+$opened = sodium_crypto_box_seal_open($sealed, $keypair);
+var_dump($opened);
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(120) "oRBXXAV4iQBrxlV4A21Bord8Yo/D8ZlrIIGNyaRCcGBfpz0map52I3xq6l+CST+1NSgQkbV+HiYyFjXWiWiaCGupGf+zl4bgWj/A9Adtem7Jt3h3emrMsLw="
+string(41) "Writing software in PHP can be a delight!"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
 
 </refentry>
 <!-- Keep this comment at the end of the file
diff --git a/reference/sodium/functions/sodium-crypto-box-secretkey.xml b/reference/sodium/functions/sodium-crypto-box-secretkey.xml
index dca50d8271..1afb2f0808 100644
--- a/reference/sodium/functions/sodium-crypto-box-secretkey.xml
+++ b/reference/sodium/functions/sodium-crypto-box-secretkey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box-secretkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box_secretkey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Extracts the secret key from a crypto_box keypair</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Given a keypair, fetch only the secret key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,8 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      A keypair, such as one generated by <function>sodium_crypto_box_keypair</function> or
+      <function>sodium_crypto_box_seed_keypair</function>
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 secret key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box-seed-keypair.xml b/reference/sodium/functions/sodium-crypto-box-seed-keypair.xml
index c10de8c5ab..a1f1cc6808 100644
--- a/reference/sodium/functions/sodium-crypto-box-seed-keypair.xml
+++ b/reference/sodium/functions/sodium-crypto-box-seed-keypair.xml
@@ -13,10 +13,12 @@
    <methodparam><type>string</type><parameter>seed</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Clamps the seed to form a secret key, derives the public key, and returns the two as a keypair.
+  </para>
+  <para>
+   The <literal>*_seed_keypair</literal> functions are ideal for generating a keypair from a
+   password and salt. Use the result as a <parameter>seed</parameter> to generate the desired keys.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -27,7 +29,7 @@
     <term><parameter>seed</parameter></term>
     <listitem>
      <para>
-      
+      Some cryptographic input. Must be 32 bytes.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 Keypair (secret key and public key).
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-box.xml b/reference/sodium/functions/sodium-crypto-box.xml
index 9f4ecc9116..c533b6bee7 100644
--- a/reference/sodium/functions/sodium-crypto-box.xml
+++ b/reference/sodium/functions/sodium-crypto-box.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-box" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_box</refname>
-  <refpurpose>Encrypt a message</refpurpose>
+  <refpurpose>Authenticated public-key encryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,10 +15,13 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt a message using asymmetric (public key) cryptography.
+  </para>
+  <para>
+   The algorithm used by functions prefixed with <function>sodium_crypto_box</function> are
+   Elliptic Curve Diffie-Hellman over the Montgomery curve, Curve25519; usually abbreviated as
+   X25519.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -29,7 +32,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message to be encrypted.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +40,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +49,8 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      See <function>sodium_crypto_box_keypair_from_secretkey_and_publickey</function>.
+      This should include the sender's X25519 secret key and the recipient's X25519 public key.
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +60,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the encrypted message (ciphertext plus authentication tag). The ciphertext will be
+   16 bytes longer than the plaintext, and a raw binary string. See <function>sodium_bin2base64</function>
+   for safe encoding for storage.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-generichash-final.xml b/reference/sodium/functions/sodium-crypto-generichash-final.xml
index 3dafd597b3..5969d9b390 100644
--- a/reference/sodium/functions/sodium-crypto-generichash-final.xml
+++ b/reference/sodium/functions/sodium-crypto-generichash-final.xml
@@ -14,11 +14,9 @@
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer><constant>SODIUM_CRYPTO_GENERICHASH_BYTES</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   The finalization method for the streaming generichash API.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>state</parameter></term>
     <listitem>
      <para>
-      
+      Hash state returned from <function>sodium_crypto_generichash_init</function>
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>length</parameter></term>
     <listitem>
      <para>
-      
+      Output length.
      </para>
     </listitem>
    </varlistentry>
@@ -46,10 +44,40 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Cryptographic hash.
   </para>
  </refsect1>
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-generichash-final.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_generichash_final</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+$messages = [random_bytes(32), random_bytes(32), random_bytes(16)];
+$state = sodium_crypto_generichash_init('', 32);
+foreach ($messages as $message) {
+    sodium_crypto_generichash_update($state, $message);
+}
+
+$final = sodium_crypto_generichash_final($state, 32);
+var_dump(sodium_bin2hex($final));
+
+$allAtOnce = sodium_crypto_generichash(implode('', $messages));
+var_dump(sodium_bin2hex($allAtOnce));
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(64) "a2939a9163cb7c796ec28e01028489e72475c136b2697ea59e3e760ab4a8ab20"
+string(64) "a2939a9163cb7c796ec28e01028489e72475c136b2697ea59e3e760ab4a8ab20"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
 
 </refentry>
 <!-- Keep this comment at the end of the file
diff --git a/reference/sodium/functions/sodium-crypto-generichash-init.xml b/reference/sodium/functions/sodium-crypto-generichash-init.xml
index bb24e60e19..3305bcd4f0 100644
--- a/reference/sodium/functions/sodium-crypto-generichash-init.xml
+++ b/reference/sodium/functions/sodium-crypto-generichash-init.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-generichash-init" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_generichash_init</refname>
-  <refpurpose>Initialize a hash</refpurpose>
+  <refpurpose>Initialize a hash for streaming</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer><constant>SODIUM_CRYPTO_GENERICHASH_BYTES</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   The initialization method for the streaming generichash API.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      The generichash key.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>length</parameter></term>
     <listitem>
      <para>
-      
+      The expected output length of the hash function.
      </para>
     </listitem>
    </varlistentry>
@@ -46,10 +44,38 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a hash state, serialized as a raw binary string.
   </para>
  </refsect1>
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-generichash-init.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_generichash_init</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+$messages = [random_bytes(32), random_bytes(32), random_bytes(16)];
+$state = sodium_crypto_generichash_init('', 32);
+foreach ($messages as $message) {
+    sodium_crypto_generichash_update($state, $message);
+}
+$final = sodium_crypto_generichash_final($state, 32);
+var_dump(sodium_bin2hex($final));
+$allAtOnce = sodium_crypto_generichash(implode('', $messages));
+var_dump(sodium_bin2hex($allAtOnce));
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(64) "a2939a9163cb7c796ec28e01028489e72475c136b2697ea59e3e760ab4a8ab20"
+string(64) "a2939a9163cb7c796ec28e01028489e72475c136b2697ea59e3e760ab4a8ab20"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
 
 </refentry>
 <!-- Keep this comment at the end of the file
diff --git a/reference/sodium/functions/sodium-crypto-generichash-keygen.xml b/reference/sodium/functions/sodium-crypto-generichash-keygen.xml
index 90cd8faa62..6e4b3f40bd 100644
--- a/reference/sodium/functions/sodium-crypto-generichash-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-generichash-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-generichash-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_generichash_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random generichash key</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random key for use with the generichash API.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   A random 256-bit key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-generichash-update.xml b/reference/sodium/functions/sodium-crypto-generichash-update.xml
index 18ce45a95b..0c71d61f04 100644
--- a/reference/sodium/functions/sodium-crypto-generichash-update.xml
+++ b/reference/sodium/functions/sodium-crypto-generichash-update.xml
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>message</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Appends a message to the internal hash state.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>state</parameter></term>
     <listitem>
      <para>
-      
+      The return value of <function>sodium_crypto_generichash_init</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      Data to append to the hashing state.
      </para>
     </listitem>
    </varlistentry>
@@ -46,10 +44,39 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.success;
   </para>
  </refsect1>
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-generichash-update.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_generichash_update</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+$messages = [random_bytes(32), random_bytes(32), random_bytes(16)];
+$state = sodium_crypto_generichash_init();
+foreach ($messages as $message) {
+    sodium_crypto_generichash_update($state, $message);
+}
+$final = sodium_crypto_generichash_final($state);
+var_dump(sodium_bin2hex($final));
+
+$allAtOnce = sodium_crypto_generichash(implode('', $messages));
+var_dump(sodium_bin2hex($allAtOnce));
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(64) "e16e28bbbbcc39d9f5b1cbc33c41f1d217808640103e57a41f24870f79831e04"
+string(64) "e16e28bbbbcc39d9f5b1cbc33c41f1d217808640103e57a41f24870f79831e04"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
 
 </refentry>
 <!-- Keep this comment at the end of the file
diff --git a/reference/sodium/functions/sodium-crypto-generichash.xml b/reference/sodium/functions/sodium-crypto-generichash.xml
index 652e2b1092..f30c86be53 100644
--- a/reference/sodium/functions/sodium-crypto-generichash.xml
+++ b/reference/sodium/functions/sodium-crypto-generichash.xml
@@ -15,11 +15,9 @@
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer><constant>SODIUM_CRYPTO_GENERICHASH_BYTES</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   Hash a message with BLAKE2b.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message being hashed.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,8 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      (Optional) cryptographic key. This serves the same function as a HMAC key, but it's
+      utilized as a reserved section of the internal BLAKE2 state.
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +44,7 @@
     <term><parameter>length</parameter></term>
     <listitem>
      <para>
-      
+      Output size.
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +54,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   The cryptographic hash as raw bytes. If a hex-encoded output is desired,
+   the result can be passed to <function>sodium_bin2hex</function>.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-kdf-derive-from-key.xml b/reference/sodium/functions/sodium-crypto-kdf-derive-from-key.xml
index d11a2312ed..953fe5aaa6 100644
--- a/reference/sodium/functions/sodium-crypto-kdf-derive-from-key.xml
+++ b/reference/sodium/functions/sodium-crypto-kdf-derive-from-key.xml
@@ -16,10 +16,11 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Derive a subkey from a root key and additional context.
+  </para>
+  <para>
+   Similar to <function>hash_hkdf</function>.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -30,7 +31,7 @@
     <term><parameter>subkey_length</parameter></term>
     <listitem>
      <para>
-      
+      Length of the key to return (in bytes)
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +39,7 @@
     <term><parameter>subkey_id</parameter></term>
     <listitem>
      <para>
-      
+      Return the Nth subkey from a given root key. Useful for seeking.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +47,7 @@
     <term><parameter>context</parameter></term>
     <listitem>
      <para>
-      
+      Application-specific context.
      </para>
     </listitem>
    </varlistentry>
@@ -54,7 +55,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      The root key from which the subkey is derived.
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +65,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   A string of pseudorandom (raw binary) bytes.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-kdf-keygen.xml b/reference/sodium/functions/sodium-crypto-kdf-keygen.xml
index a33b762e2b..501227b608 100644
--- a/reference/sodium/functions/sodium-crypto-kdf-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-kdf-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-kdf-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_kdf_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random root key for the KDF interface</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generates a random key suitable for serving as the root key for <function>sodium_crypto_kdf_derive_from_key</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   A random 256-bit key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-kx-client-session-keys.xml b/reference/sodium/functions/sodium-crypto-kx-client-session-keys.xml
index 99dc4fac87..e23a4bfb71 100644
--- a/reference/sodium/functions/sodium-crypto-kx-client-session-keys.xml
+++ b/reference/sodium/functions/sodium-crypto-kx-client-session-keys.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-kx-client-session-keys" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_kx_client_session_keys</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Calculate the client-side session keys.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Calculate the client-side session keys, using the X25519 + BLAKE2b key-exchange method.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>client_key_pair</parameter></term>
     <listitem>
      <para>
-      
+      A crypto_kx keypair, such as one generated by <function>sodium_crypto_kx_keypair</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>server_key</parameter></term>
     <listitem>
      <para>
-      
+      A crypto_kx public key.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   An array consisting of two strings. The first should be used for receiving data
+   from the server. The second should be used for sending data to the server.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-kx-publickey.xml b/reference/sodium/functions/sodium-crypto-kx-publickey.xml
index 8538455ac8..60aeda40b5 100644
--- a/reference/sodium/functions/sodium-crypto-kx-publickey.xml
+++ b/reference/sodium/functions/sodium-crypto-kx-publickey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-kx-publickey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_kx_publickey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Extract the public key from a crypto_kx keypair</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Extract the public key from a crypto_kx keypair.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,8 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      X25519 keypair, such as one generated by
+      <function>sodium_crypto_kx_keypair</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 public key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-kx-secretkey.xml b/reference/sodium/functions/sodium-crypto-kx-secretkey.xml
index f4f7dd80ca..6eaba4d378 100644
--- a/reference/sodium/functions/sodium-crypto-kx-secretkey.xml
+++ b/reference/sodium/functions/sodium-crypto-kx-secretkey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-kx-secretkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_kx_secretkey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Extract the secret key from a crypto_kx keypair.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Extract the secret key from a crypto_kx keypair.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,8 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      X25519 keypair, such as one generated by
+      <function>sodium_crypto_kx_keypair</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   X25519 secret key.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-kx-server-session-keys.xml b/reference/sodium/functions/sodium-crypto-kx-server-session-keys.xml
index 3e9982108c..9459222085 100644
--- a/reference/sodium/functions/sodium-crypto-kx-server-session-keys.xml
+++ b/reference/sodium/functions/sodium-crypto-kx-server-session-keys.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-kx-server-session-keys" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_kx_server_session_keys</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Calculate the server-side session keys.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>client_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Calculate the server-side session keys, using the X25519 + BLAKE2b key-exchange method.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>server_key_pair</parameter></term>
     <listitem>
      <para>
-      
+      A crypto_kx keypair, such as one generated by <function>sodium_crypto_kx_keypair</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>client_key</parameter></term>
     <listitem>
      <para>
-      
+      A crypto_kx public key.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   An array consisting of two strings. The first should be used for receiving data
+   from the client. The second should be used for sending data to the client.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-scryptsalsa208sha256.xml b/reference/sodium/functions/sodium-crypto-pwhash-scryptsalsa208sha256.xml
index 010d667db5..3536476f50 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-scryptsalsa208sha256.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-scryptsalsa208sha256.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-pwhash-scryptsalsa208sha256" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_pwhash_scryptsalsa208sha256</refname>
-  <refpurpose>Derives a key from a password</refpurpose>
+  <refpurpose>Derives a key from a password, using scrypt</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -18,10 +18,12 @@
    <methodparam><type>int</type><parameter>memlimit</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   This is the scrypt counterpart to <function>sodium_crypto_pwhash</function>.
+  </para>
+  <para>
+   A common reason to use this particular function is to derive the seeds for cryptographic keys from a password and salt,
+   and then use these seeds to generate the actual keys needed for some purpose (e.g. <function>sodium_crypto_sign_detached</function>).
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -32,7 +34,7 @@
     <term><parameter>length</parameter></term>
     <listitem>
      <para>
-      
+      The length of the password hash to generate, in bytes.
      </para>
     </listitem>
    </varlistentry>
@@ -40,7 +42,7 @@
     <term><parameter>password</parameter></term>
     <listitem>
      <para>
-      
+      The password to generate a hash for.
      </para>
     </listitem>
    </varlistentry>
@@ -48,7 +50,7 @@
     <term><parameter>salt</parameter></term>
     <listitem>
      <para>
-      
+      A salt to add to the password before hashing. The salt should be unpredictable, ideally generated from a good random number source such as <function>random_bytes</function>, and have a length of at least <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES</constant> bytes.
      </para>
     </listitem>
    </varlistentry>
@@ -56,7 +58,7 @@
     <term><parameter>opslimit</parameter></term>
     <listitem>
      <para>
-      
+      Represents a maximum amount of computations to perform. Raising this number will make the function require more CPU cycles to compute a key. There are some constants available to set the operations limit to appropriate values depending on intended use, in order of strength: <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE</constant> and <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE</constant>.
      </para>
     </listitem>
    </varlistentry>
@@ -64,7 +66,7 @@
     <term><parameter>memlimit</parameter></term>
     <listitem>
      <para>
-      
+      The maximum amount of RAM that the function will use, in bytes. There are constants to help you choose an appropriate value, in order of size: <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE</constant> and <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE</constant>. Typically these should be paired with the matching <parameter>opslimit</parameter> values.
      </para>
     </listitem>
    </varlistentry>
@@ -74,7 +76,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   A string of bytes of the desired length.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-str-needs-rehash.xml b/reference/sodium/functions/sodium-crypto-pwhash-str-needs-rehash.xml
index 29431688e1..fce6ca6935 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-str-needs-rehash.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-str-needs-rehash.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-pwhash-str-needs-rehash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_pwhash_str_needs_rehash</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Determine whether or not to rehash a password</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,11 +16,9 @@
    <methodparam><type>int</type><parameter>memlimit</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Determine whether or not to rehash a password, based on the current hash <parameter>opslimit</parameter> and <parameter>memlimit</parameter>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +28,7 @@
     <term><parameter>password</parameter></term>
     <listitem>
      <para>
-      
+      Password hash
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +36,7 @@
     <term><parameter>opslimit</parameter></term>
     <listitem>
      <para>
-      
+      Configured opslimit; see <function>sodium_crypto_pwhash_str</function>
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,7 @@
     <term><parameter>memlimit</parameter></term>
     <listitem>
      <para>
-      
+      Configured memlimit; see <function>sodium_crypto_pwhash_str</function>
      </para>
     </listitem>
    </varlistentry>
@@ -56,7 +54,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns &true; if the provided memlimit/opslimit do not match what's stored in the hash.
+   Returns &false; if they match.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml b/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
index 3cbc21e6f0..66b2773954 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
@@ -15,7 +15,7 @@
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Checks that a password hash created using <function>sodium_crypto_pwhash_str</function> matches a given plain-text password. Note that the parameters are in the opposite order to the same parameters in the similar <function>password_hash</function> function.
+   Checks that a password hash created using <function>sodium_crypto_pwhash_str</function> matches a given plain-text password. Note that the parameters are in the opposite order to the same parameters in the similar <function>password_verify</function> function.
   </para>
 
 
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-str.xml b/reference/sodium/functions/sodium-crypto-pwhash-str.xml
index 13d29e037d..d3642d20fa 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-str.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-str.xml
@@ -62,20 +62,11 @@ Uses a CPU- and memory-hard hash algorithm along with a randomly-generated salt,
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Hashes are calculated using the Argon2ID algorithm, providing resistance to both GPU and side-channel attacks. In contrast to the <function>password_hash</function> function, there is no salt parameter (a salt is generated automatically), and the <parameter>opslimit</parameter> and <parameter>memlimit</parameter> parameters are not optional.
-   </para>
-  </note>
- </refsect1>
-
   <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
-    <title><function>password_hash</function> example</title>
+    <title><function>sodium_crypto_pwhash_str</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -96,6 +87,20 @@ $argon2id$v=19$m=65536,t=2,p=1$oWIfdaXwWwhVmovOBc2NAQ$EbsZ+JnZyyavkafS0hoc4HdaOB
    </example>
   </para> 
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Hashes are calculated using the Argon2ID algorithm,
+    providing resistance to both GPU and side-channel attacks.
+    In contrast to the <function>password_hash</function> function,
+    there is no salt parameter (a salt is generated automatically),
+    and the <parameter>opslimit</parameter> and
+    <parameter>memlimit</parameter> parameters are not optional.
+   </para>
+  </note>
+ </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/sodium/functions/sodium-crypto-pwhash.xml b/reference/sodium/functions/sodium-crypto-pwhash.xml
index b7ce17e963..1d7f832ea9 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-pwhash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_pwhash</refname>
-  <refpurpose>Derive a key from a password</refpurpose>
+  <refpurpose>Derive a key from a password, using Argon2</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -20,6 +20,10 @@
   <para>
    This function provides low-level access to libsodium's crypto_pwhash key derivation function. Unless you have specific reason to use this function, you should use <function>sodium_crypto_pwhash_str</function> or <function>password_hash</function> functions instead.
   </para>
+  <para>
+   A common reason to use this particular function is to derive the seeds for cryptographic keys from a password and salt,
+   and then use these seeds to generate the actual keys needed for some purpose (e.g. <function>sodium_crypto_sign_detached</function>).
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -45,7 +49,7 @@
     <term><parameter>salt</parameter></term>
     <listitem>
      <para>
-      <type>string</type> A salt to add to the password before hashing. The salt should be unpredictable, ideally generated from a good random mumber source such as <function>random_bytes</function>, and have a length of at least <constant>SODIUM_CRYPTO_PWHASH_SALTBYTES</constant> bytes.
+      A salt to add to the password before hashing. The salt should be unpredictable, ideally generated from a good random number source such as <function>random_bytes</function>, and have a length of at least <constant>SODIUM_CRYPTO_PWHASH_SALTBYTES</constant> bytes.
      </para>
     </listitem>
    </varlistentry>
@@ -86,7 +90,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title><function>password_hash</function> example</title>
+    <title><function>sodium_crypto_pwhash</function> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/sodium/functions/sodium-crypto-scalarmult.xml b/reference/sodium/functions/sodium-crypto-scalarmult.xml
index 8ad80d4a2e..067803cb1b 100644
--- a/reference/sodium/functions/sodium-crypto-scalarmult.xml
+++ b/reference/sodium/functions/sodium-crypto-scalarmult.xml
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>p</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Elliptic Curve Diffie-Hellman. Calculates scalar n times point p, on an elliptic curve.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
     <term><parameter>n</parameter></term>
     <listitem>
      <para>
-      
+      scalar, which is typically a secret key
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
     <term><parameter>p</parameter></term>
     <listitem>
      <para>
-      
+      point (x-coordinate), which is typically a public key
      </para>
     </listitem>
    </varlistentry>
@@ -47,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   A 32-byte random string.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml b/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
index f2c12dc42e..180d47e753 100644
--- a/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-secretbox-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretbox_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate random key for sodium_crypto_secretbox</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a key for use with <function>sodium_crypto_secretbox</function> and <function>sodium_crypto_secretbox_open</function>.
   </para>
 
   &warn.undocumented.func;
diff --git a/reference/sodium/functions/sodium-crypto-secretbox-open.xml b/reference/sodium/functions/sodium-crypto-secretbox-open.xml
index e9dd8e62af..17af92fdd2 100644
--- a/reference/sodium/functions/sodium-crypto-secretbox-open.xml
+++ b/reference/sodium/functions/sodium-crypto-secretbox-open.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-secretbox-open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretbox_open</refname>
-  <refpurpose>Verify and decrypt a ciphertext</refpurpose>
+  <refpurpose>Authenticated shared-key decryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Decrypt an encrypted message with a symmetric (shared) key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,8 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      Must be in the format provided by <function>sodium_crypto_secretbox</function>
+      (ciphertext and tag, concatenated).
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +45,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/sodium/functions/sodium-crypto-secretbox.xml b/reference/sodium/functions/sodium-crypto-secretbox.xml
index 25f05e6d65..6d26c41b3a 100644
--- a/reference/sodium/functions/sodium-crypto-secretbox.xml
+++ b/reference/sodium/functions/sodium-crypto-secretbox.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-secretbox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretbox</refname>
-  <refpurpose>Encrypt a message</refpurpose>
+  <refpurpose>Authenticated shared-key encryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt a message with a symmetric (shared) key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The plaintext message to encrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +44,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-pull.xml b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-pull.xml
index 2c691a4268..d50719941e 100644
--- a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-pull.xml
+++ b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-pull.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-secretstream-xchacha20poly1305-init-pull" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretstream_xchacha20poly1305_init_pull</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Initialize a secretstream context for decryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Initialize a secretstream context for decryption.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,8 @@
     <term><parameter>header</parameter></term>
     <listitem>
      <para>
-      
+      The header of the secretstream. This should be one of the values produced by
+      <function>sodium_crypto_secretstream_xchacha20poly1305_init_push</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -47,11 +46,60 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Secretstream state.
   </para>
  </refsect1>
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-secretstream-xchacha20poly1305-init-pull.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_secretstream_xchacha20poly1305_init_pull</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+function decrypt_file(string $inputFilePath, string $outputFilePath, string $key): void
+{
+    $inputFile = fopen($inputFilePath, 'rb');
+    $outputFile = fopen($outputFilePath, 'wb');
+    $header = fread($inputFile, 24);
 
+    $state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($header, $key);
+    $inputFileSize = fstat($inputFile)['size'];
+
+    // Decrypt the file and write its contents to the output file:
+    for ($i = 24; $i < $inputFileSize; $i += 8192) {
+        $ctxt_chunk = fread($inputFile, 8192);
+
+        // We're not using $tag, but in real protocols you can use this on encrypt to e.g.
+        // trigger a re-key or indicate the end of file. Then, on decrypt, you can assert
+        // this behavior.
+        [$ptxt_chunk, $tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($state, $ctxt_chunk);
+        fwrite($outputFile, $ptxt_chunk);
+    }
+
+    sodium_memzero($state);
+    fclose($inputFile);
+    fclose($outputFile);
+}
+
+// sodium_crypto_secretstream_xchacha20poly1305_keygen()
+$key = sodium_base642bin('MS0lzb7HC+thY6jY01pkTE/cwsQxnRq0/2L1eL4Hxn8=', SODIUM_BASE64_VARIANT_ORIGINAL);
+
+$example = sodium_hex2bin('971e33b255f0990ef3931caf761c59136efa77b434832f28ec719e3ff73f5aec38b3bba1574ab5b70a8844d8da36a668e802cfea2c');
+file_put_contents('hello.enc', $example);
+decrypt_file('hello.enc', 'hello.txt.decrypted', $key);
+var_dump(file_get_contents('hello.txt.decrypted'));
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(12) "Hello world!"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-push.xml b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-push.xml
index 2c76d53966..9f9c426b04 100644
--- a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-push.xml
+++ b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-init-push.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-secretstream-xchacha20poly1305-init-push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretstream_xchacha20poly1305_init_push</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Initialize a secretstream context for encryption</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Initialize a secretstream context for encryption.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Cryptography key. See <function>sodium_crypto_secretstream_xchacha20poly1305_keygen</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -38,10 +36,60 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   An array with two string values:
   </para>
+  <simplelist>
+   <member>The secretstream state, needed for further pushes</member>
+   <member>The secretstream header, which needs to be provided to the recipient so they can pull data</member>
+  </simplelist>
  </refsect1>
 
+ <refsect1 role="examples"><!-- {{{ -->
+  &reftitle.examples;
+  <example xml:id="sodium-crypto-secretstream-xchacha20poly1305-init-push.example.basic"><!-- {{{ -->
+   <title><function>sodium_crypto_secretstream_xchacha20poly1305_init_push</function> example</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+function encrypt_file(string $inputFilePath, string $outputFilePath, string $key): void
+{
+    [$state, $header] = sodium_crypto_secretstream_xchacha20poly1305_init_push($key);
+
+    $inputFile = fopen($inputFilePath, 'rb');
+    $outputFile = fopen($outputFilePath, 'wb');
+    // Write the header:
+    fwrite($outputFile, $header);
+    $inputFileSize = fstat($inputFile)['size'];
+
+    // Encrypt the file and write its contents to the output file:
+    for ($i = 0; $i < $inputFileSize; $i += 8175) {
+        $ptxt_chunk = fread($inputFile, 8175);
+        $ctxt_chunk = sodium_crypto_secretstream_xchacha20poly1305_push($state, $ptxt_chunk);
+        fwrite($outputFile, $ctxt_chunk);
+    }
+
+    sodium_memzero($state);
+    fclose($inputFile);
+    fclose($outputFile);
+}
+
+// sodium_crypto_secretstream_xchacha20poly1305_keygen()
+$key = sodium_base642bin('MS0lzb7HC+thY6jY01pkTE/cwsQxnRq0/2L1eL4Hxn8=', SODIUM_BASE64_VARIANT_ORIGINAL);
+
+file_put_contents('hello.txt', 'Hello world!');
+encrypt_file('hello.txt', 'hello.txt.encrypted', $key);
+var_dump(sodium_bin2hex(file_get_contents('hello.txt.encrypted')));
+?>
+]]>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+string(106) "971e33b255f0990ef3931caf761c59136efa77b434832f28ec719e3ff73f5aec38b3bba1574ab5b70a8844d8da36a668e802cfea2c"
+]]>
+   </screen>
+  </example><!-- }}} -->
+ </refsect1><!-- }}} -->
 
 </refentry>
 
diff --git a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-keygen.xml b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-keygen.xml
index b79c03442f..37c7ae3839 100644
--- a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-secretstream-xchacha20poly1305-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretstream_xchacha20poly1305_keygen</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Generate a random secretstream key.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random secretstream key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns a string of random bytes.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-pull.xml b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-pull.xml
index d8d66e5b5f..bd9a2dd448 100644
--- a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-pull.xml
+++ b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-pull.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-secretstream-xchacha20poly1305-pull">
  <refnamediv>
   <refname>sodium_crypto_secretstream_xchacha20poly1305_pull</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Decrypt a chunk of data from an encrypted stream</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,9 @@
    <methodparam choice="opt"><type>string</type><parameter>additional_data</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   Decrypt a chunk of data from an encrypted stream.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,8 @@
     <term><parameter>state</parameter></term>
     <listitem>
      <para>
-      
+      See <function>sodium_crypto_secretstream_xchacha20poly1305_init_pull</function>
+      and <function>sodium_crypto_secretstream_xchacha20poly1305_init_push</function>
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
     <term><parameter>ciphertext</parameter></term>
     <listitem>
      <para>
-      
+      The ciphertext chunk to decrypt.
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +44,7 @@
     <term><parameter>additional_data</parameter></term>
     <listitem>
      <para>
-      
+      Optional additional data to include in the authentication tag.
      </para>
     </listitem>
    </varlistentry>
@@ -55,11 +54,42 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   An array with two values:
+   <itemizedlist>
+    <listitem>
+     <para>
+      <type>string</type>; The decrypted chunk
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <type>int</type>; An optional tag (if provided during push). Possible values:
+      <simplelist>
+       <member>
+        <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE</constant>:
+        the most common tag, that doesn't add any information about the nature of the message.
+       </member>
+       <member>
+        <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL</constant>:
+        indicates that the message marks the end of the stream, and erases the secret key used to encrypt the previous sequence.
+       </member>
+       <member>
+        <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_PUSH</constant>:
+        indicates that the message marks the end of a set of messages, but not the end of the stream.
+        For example, a huge JSON string sent as multiple chunks can use this tag to indicate to the application that the
+        string is complete and that it can be decoded. But the stream itself is not closed, and more data may follow.
+       </member>
+       <member>
+        <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY</constant>:
+        "forget" the key used to encrypt this message and the previous ones, and derive a new secret key.
+       </member>
+      </simplelist>
+     </para>
+    </listitem>
+   </itemizedlist>
   </para>
  </refsect1>
 
-
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-push.xml b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-push.xml
index dbf209e82e..16103633e2 100644
--- a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-push.xml
+++ b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-push.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sodium-crypto-secretstream-xchacha20poly1305-push">
  <refnamediv>
   <refname>sodium_crypto_secretstream_xchacha20poly1305_push</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Encrypt a chunk of data so that it can safely be decrypted in a streaming API</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -16,11 +16,9 @@
    <methodparam choice="opt"><type>int</type><parameter>tag</parameter><initializer><constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-
+   Encrypt a chunk of data so that it can safely be decrypted in a streaming API.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +28,8 @@
     <term><parameter>state</parameter></term>
     <listitem>
      <para>
-      
+      See <function>sodium_crypto_secretstream_xchacha20poly1305_init_pull</function>
+      and <function>sodium_crypto_secretstream_xchacha20poly1305_init_push</function>
      </para>
     </listitem>
    </varlistentry>
@@ -54,8 +53,29 @@
     <term><parameter>tag</parameter></term>
     <listitem>
      <para>
-      
+      Optional. Can be used to assert decryption behavior
+      (i.e. re-keying or indicating the final chunk in a stream).
      </para>
+     <simplelist>
+      <member>
+       <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE</constant>:
+       the most common tag, that doesn't add any information about the nature of the message.
+      </member>
+      <member>
+       <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL</constant>:
+       indicates that the message marks the end of the stream, and erases the secret key used to encrypt the previous sequence.
+      </member>
+      <member>
+       <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_PUSH</constant>:
+       indicates that the message marks the end of a set of messages, but not the end of the stream.
+       For example, a huge JSON string sent as multiple chunks can use this tag to indicate to the application that the
+       string is complete and that it can be decoded. But the stream itself is not closed, and more data may follow.
+      </member>
+      <member>
+       <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY</constant>:
+       "forget" the key used to encrypt this message and the previous ones, and derive a new secret key.
+      </member>
+     </simplelist>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -64,7 +84,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the encrypted ciphertext.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-rekey.xml b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-rekey.xml
index a98fc08d8f..40950e40c8 100644
--- a/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-rekey.xml
+++ b/reference/sodium/functions/sodium-crypto-secretstream-xchacha20poly1305-rekey.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-secretstream-xchacha20poly1305-rekey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_secretstream_xchacha20poly1305_rekey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Explicitly rotate the key in the secretstream state</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <methodparam><type>string</type><parameter role="reference">state</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Explicitly rotate the key in the secretstream state. Overwrites the value passed in.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>state</parameter></term>
     <listitem>
      <para>
-      
+      Secretstream state.
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-shorthash-keygen.xml b/reference/sodium/functions/sodium-crypto-shorthash-keygen.xml
index 8e03f71457..1f89c69455 100644
--- a/reference/sodium/functions/sodium-crypto-shorthash-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-shorthash-keygen.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a key for use with <function>sodium_crypto_shorthash</function>.
   </para>
 
   &warn.undocumented.func;
diff --git a/reference/sodium/functions/sodium-crypto-shorthash.xml b/reference/sodium/functions/sodium-crypto-shorthash.xml
index eb96e43ff0..1a060fcfe4 100644
--- a/reference/sodium/functions/sodium-crypto-shorthash.xml
+++ b/reference/sodium/functions/sodium-crypto-shorthash.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-shorthash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_shorthash</refname>
-  <refpurpose>Compute a fixed-size fingerprint for the message</refpurpose>
+  <refpurpose>Compute a short hash of a message and key</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,10 +14,13 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   <function>sodium_crypto_shorthash</function> wraps a hash function called
+   SipHash-2-4, which is ideal for implementing hash tables that are not susceptible
+   to hash collision denial of service attacks (Hash-DoS).
+  </para>
+  <para>
+   SipHash-2-4 isn't a general purpose cryptographic hash function.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -28,7 +31,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message to hash.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +39,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      The hash key.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/sodium/functions/sodium-crypto-sign-detached.xml b/reference/sodium/functions/sodium-crypto-sign-detached.xml
index d943d6f375..4c68f19948 100644
--- a/reference/sodium/functions/sodium-crypto-sign-detached.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-detached.xml
@@ -14,11 +14,10 @@
    <methodparam><type>string</type><parameter>secret_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Sign a message with a secret key, that can be verified by the corresponding public key.
+   This function returns a detached signature.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +27,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      Message to sign.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +35,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      Secret key. See <function>sodium_crypto_sign_secretkey</function>
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Cryptographic signature.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-ed25519-pk-to-curve25519.xml b/reference/sodium/functions/sodium-crypto-sign-ed25519-pk-to-curve25519.xml
index ccb0c61646..3fc786bedb 100644
--- a/reference/sodium/functions/sodium-crypto-sign-ed25519-pk-to-curve25519.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-ed25519-pk-to-curve25519.xml
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Given an Ed25519 public key, calculate the birationally equivalent X25519 public key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,7 @@
     <term><parameter>public_key</parameter></term>
     <listitem>
      <para>
-      
+      Public key suitable for the crypto_sign functions.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Public key suitable for the crypto_box functions.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-ed25519-sk-to-curve25519.xml b/reference/sodium/functions/sodium-crypto-sign-ed25519-sk-to-curve25519.xml
index 77308e0451..dff3499a59 100644
--- a/reference/sodium/functions/sodium-crypto-sign-ed25519-sk-to-curve25519.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-ed25519-sk-to-curve25519.xml
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>secret_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Given an Ed25519 secret key, calculate the birationally equivalent X25519 secret key.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      Secret key suitable for the crypto_sign functions.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Secret key suitable for the crypto_box functions.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-keypair-from-secretkey-and-publickey.xml b/reference/sodium/functions/sodium-crypto-sign-keypair-from-secretkey-and-publickey.xml
index db8f384cbd..b7316fff0d 100644
--- a/reference/sodium/functions/sodium-crypto-sign-keypair-from-secretkey-and-publickey.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-keypair-from-secretkey-and-publickey.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-sign-keypair-from-secretkey-and-publickey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_sign_keypair_from_secretkey_and_publickey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Join a secret key and public key together</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Join a secret key and public key together.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      Ed25519 secret key
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
     <term><parameter>public_key</parameter></term>
     <listitem>
      <para>
-      
+      Ed25519 public key
      </para>
     </listitem>
    </varlistentry>
@@ -47,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Keypair
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-keypair.xml b/reference/sodium/functions/sodium-crypto-sign-keypair.xml
index 0e19f08e52..36405164ef 100644
--- a/reference/sodium/functions/sodium-crypto-sign-keypair.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-keypair.xml
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a random Ed25519 keypair as one string.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Ed25519 keypair.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-open.xml b/reference/sodium/functions/sodium-crypto-sign-open.xml
index ee41ae41a3..c84b2bf06f 100644
--- a/reference/sodium/functions/sodium-crypto-sign-open.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-open.xml
@@ -10,25 +10,23 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>sodium_crypto_sign_open</methodname>
-   <methodparam><type>string</type><parameter>ciphertext</parameter></methodparam>
+   <methodparam><type>string</type><parameter>signed_message</parameter></methodparam>
    <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Verify the signature attached to a message and return the message
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>ciphertext</parameter></term>
+    <term><parameter>signed_message</parameter></term>
     <listitem>
      <para>
-      
+      A message signed with <function>sodium_crypto_sign</function>
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>public_key</parameter></term>
     <listitem>
      <para>
-      
+      An Ed25519 public key
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns the original signed message on success, &return.falseforfailure;.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-publickey-from-secretkey.xml b/reference/sodium/functions/sodium-crypto-sign-publickey-from-secretkey.xml
index 51673f53fd..c10e688ecc 100644
--- a/reference/sodium/functions/sodium-crypto-sign-publickey-from-secretkey.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-publickey-from-secretkey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-sign-publickey-from-secretkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_sign_publickey_from_secretkey</refname>
-  <refpurpose>Extract the public key from the secret key</refpurpose>
+  <refpurpose>Extract the Ed25519 public key from the secret key</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>secret_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Extract the Ed25519 public key from the secret key
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      Ed25519 secret key
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Ed25519 public key
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-publickey.xml b/reference/sodium/functions/sodium-crypto-sign-publickey.xml
index ee33af2d32..15b78385d7 100644
--- a/reference/sodium/functions/sodium-crypto-sign-publickey.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-publickey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-sign-publickey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_sign_publickey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Extract the Ed25519 public key from a keypair</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Extract the Ed25519 public key from a keypair
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,7 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      Ed25519 keypair (see: <function>sodium_crypto_sign_keypair</function>)
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Ed25519 public key
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-secretkey.xml b/reference/sodium/functions/sodium-crypto-sign-secretkey.xml
index cca9d0f85b..dd19d9bcdc 100644
--- a/reference/sodium/functions/sodium-crypto-sign-secretkey.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-secretkey.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-sign-secretkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_sign_secretkey</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Extract the Ed25519 secret key from a keypair</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter>key_pair</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Extract the Ed25519 secret key from a keypair
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,7 @@
     <term><parameter>key_pair</parameter></term>
     <listitem>
      <para>
-      
+      Ed25519 keypair (see: <function>sodium_crypto_sign_keypair</function>)
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Ed25519 secret key
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-seed-keypair.xml b/reference/sodium/functions/sodium-crypto-sign-seed-keypair.xml
index 59bea64e3f..5bb9c8c842 100644
--- a/reference/sodium/functions/sodium-crypto-sign-seed-keypair.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-seed-keypair.xml
@@ -13,10 +13,12 @@
    <methodparam><type>string</type><parameter>seed</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Clamps the seed to form a secret key, derives the public key, and returns the two as a keypair.
+  </para>
+  <para>
+   The <literal>*_seed_keypair</literal> functions are ideal for generating a keypair from a
+   password and salt. Use the result as a <parameter>seed</parameter> to generate the desired keys.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -27,7 +29,7 @@
     <term><parameter>seed</parameter></term>
     <listitem>
      <para>
-      
+      Some cryptographic input. Must be 32 bytes.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Keypair (secret key and public key)
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign-verify-detached.xml b/reference/sodium/functions/sodium-crypto-sign-verify-detached.xml
index 991518ef1b..253d1fdb20 100644
--- a/reference/sodium/functions/sodium-crypto-sign-verify-detached.xml
+++ b/reference/sodium/functions/sodium-crypto-sign-verify-detached.xml
@@ -15,11 +15,9 @@
    <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Verify signature for the message
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
     <term><parameter>signature</parameter></term>
     <listitem>
      <para>
-      
+      The cryptographic signature obtained from <function>sodium_crypto_sign_detached</function>
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message being verified
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +43,7 @@
     <term><parameter>public_key</parameter></term>
     <listitem>
      <para>
-      
+      Ed25519 public key
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +53,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-sign.xml b/reference/sodium/functions/sodium-crypto-sign.xml
index fd6ca4019c..099125059a 100644
--- a/reference/sodium/functions/sodium-crypto-sign.xml
+++ b/reference/sodium/functions/sodium-crypto-sign.xml
@@ -14,11 +14,11 @@
    <methodparam><type>string</type><parameter>secret_key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Sign a message with a secret key, that can be verified by the corresponding public key.
+   This function attaches the signature to the message. See <function>sodium_crypto_sign_detached</function>
+   for detached signatures.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +28,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      Message to sign.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
     <term><parameter>secret_key</parameter></term>
     <listitem>
      <para>
-      
+      Secret key. See <function>sodium_crypto_sign_secretkey</function>
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Signed message (not encrypted).
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-stream-keygen.xml b/reference/sodium/functions/sodium-crypto-stream-keygen.xml
index 69f6eaa2be..01eb3a51b2 100644
--- a/reference/sodium/functions/sodium-crypto-stream-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-stream-keygen.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="function.sodium-crypto-stream-keygen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_stream_keygen</refname>
-  <refpurpose>Get random bytes for key</refpurpose>
+  <refpurpose>Generate a random sodium_crypto_stream key.</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,11 +14,9 @@
    <void />
   </methodsynopsis>
   <para>
-
+   Generate a key for use with <function>sodium_crypto_stream</function> and <function>sodium_crypto_stream_xor</function>.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Encryption key (256-bit).
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-stream-xor.xml b/reference/sodium/functions/sodium-crypto-stream-xor.xml
index 0f919269a1..f42ac2cc68 100644
--- a/reference/sodium/functions/sodium-crypto-stream-xor.xml
+++ b/reference/sodium/functions/sodium-crypto-stream-xor.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-crypto-stream-xor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_crypto_stream_xor</refname>
-  <refpurpose>Encrypt a message</refpurpose>
+  <refpurpose>Encrypt a message without authentication</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,11 +15,10 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   This function encrypts a message with XSalsa20, but does not provide any ciphertext
+   guarantees about the plaintext.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
     <term><parameter>message</parameter></term>
     <listitem>
      <para>
-      
+      The message to encrypt
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +45,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +55,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Encrypted message.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-crypto-stream.xml b/reference/sodium/functions/sodium-crypto-stream.xml
index 45a3752f36..ced8bac7ce 100644
--- a/reference/sodium/functions/sodium-crypto-stream.xml
+++ b/reference/sodium/functions/sodium-crypto-stream.xml
@@ -16,11 +16,9 @@
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Generate a deterministic sequence of bytes from a seed, using the XSalsa20 stream cipher.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,7 +28,7 @@
     <term><parameter>length</parameter></term>
     <listitem>
      <para>
-      
+      The number of bytes to return.
      </para>
     </listitem>
    </varlistentry>
@@ -38,7 +36,8 @@
     <term><parameter>nonce</parameter></term>
     <listitem>
      <para>
-      
+      A number that must be only used once, per message. 24 bytes long.
+      This is a large enough bound to generate randomly (i.e. <function>random_bytes</function>).
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +45,7 @@
     <term><parameter>key</parameter></term>
     <listitem>
      <para>
-      
+      Encryption key (256-bit).
      </para>
     </listitem>
    </varlistentry>
@@ -56,7 +55,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   String of pseudorandom bytes.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-increment.xml b/reference/sodium/functions/sodium-increment.xml
index ce3aaaf3d0..11a507c8a3 100644
--- a/reference/sodium/functions/sodium-increment.xml
+++ b/reference/sodium/functions/sodium-increment.xml
@@ -13,11 +13,10 @@
    <methodparam><type>string</type><parameter role="reference">string</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Treat the string as a little-endian unsigned integer, then increase it by 1.
+   Constant-time.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +26,7 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      String to increment.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-memcmp.xml b/reference/sodium/functions/sodium-memcmp.xml
index bbe1b3852d..94ba39e8b4 100644
--- a/reference/sodium/functions/sodium-memcmp.xml
+++ b/reference/sodium/functions/sodium-memcmp.xml
@@ -14,10 +14,15 @@
    <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Compare two strings in constant-time.
+  </para>
+  <para>
+   In practice, you almost always want to use <function>hash_equals</function> instead,
+   since it provides the same logic but returns a <type>bool</type> instead of an
+   <type>int</type>. However, if you're using the return value of a comparison in a
+   calculation that's timing-sensitive, and worried about timing leaks with bool-to-int
+   conversions, <function>sodium_memcmp</function> is an ideal replacement.
   </para>
-
-  &warn.undocumented.func;
 
  </refsect1>
 
@@ -28,7 +33,7 @@
     <term><parameter>string1</parameter></term>
     <listitem>
      <para>
-      
+      String to compare
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +41,7 @@
     <term><parameter>string2</parameter></term>
     <listitem>
      <para>
-      
+      Other string to compare
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +51,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns <literal>0</literal> if both strings are equal; <literal>-1</literal> otherwise.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-memzero.xml b/reference/sodium/functions/sodium-memzero.xml
index 2bb8f4a72e..e75c6fa9ef 100644
--- a/reference/sodium/functions/sodium-memzero.xml
+++ b/reference/sodium/functions/sodium-memzero.xml
@@ -3,7 +3,7 @@
 <refentry xml:id="function.sodium-memzero" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sodium_memzero</refname>
-  <refpurpose>Overwrite buf with zeros</refpurpose>
+  <refpurpose>Overwrite a string with NUL characters</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,11 +13,9 @@
    <methodparam><type>string</type><parameter role="reference">string</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   <function>sodium_memzero</function> zeroes out the string that is passed by reference.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,7 +25,7 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      String.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.void;
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-pad.xml b/reference/sodium/functions/sodium-pad.xml
index 1d8ecfb6c0..eb46faa6f5 100644
--- a/reference/sodium/functions/sodium-pad.xml
+++ b/reference/sodium/functions/sodium-pad.xml
@@ -11,14 +11,12 @@
   <methodsynopsis>
    <type>string</type><methodname>sodium_pad</methodname>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
+   <methodparam><type>int</type><parameter>block_size</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Right-pad a string to a desired length. Timing-safe.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,15 +26,15 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      Unpadded string.
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>length</parameter></term>
+    <term><parameter>block_size</parameter></term>
     <listitem>
      <para>
-      
+      The string will be padded until it is an even multiple of the block size.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Padded string.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/functions/sodium-unpad.xml b/reference/sodium/functions/sodium-unpad.xml
index 6083995adf..7c2cad677f 100644
--- a/reference/sodium/functions/sodium-unpad.xml
+++ b/reference/sodium/functions/sodium-unpad.xml
@@ -14,11 +14,9 @@
    <methodparam><type>int</type><parameter>block_size</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Unpad a padded string. Timing-safe.
   </para>
 
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,7 +26,7 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
-      
+      Padded string.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +34,7 @@
     <term><parameter>block_size</parameter></term>
     <listitem>
      <para>
-      
+      The block size for padding.
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Unpadded string.
   </para>
  </refsect1>
 
diff --git a/reference/sodium/setup.xml b/reference/sodium/setup.xml
index ccb9f89117..2abcb7524f 100644
--- a/reference/sodium/setup.xml
+++ b/reference/sodium/setup.xml
@@ -53,9 +53,7 @@
 
  <section xml:id="sodium.resources">
   &reftitle.resources;
-  <para>
-
-  </para>
+  &no.resource;
  </section>
 
 </chapter>
diff --git a/reference/solr/book.xml b/reference/solr/book.xml
index 1dab8ebb05..27ff135b18 100644
--- a/reference/solr/book.xml
+++ b/reference/solr/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.solr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Apache Solr</title>
  <titleabbrev>Solr</titleabbrev>
 
diff --git a/reference/solr/setup.xml b/reference/solr/setup.xml
index 5a4ca3ee8e..bb724b4f63 100644
--- a/reference/solr/setup.xml
+++ b/reference/solr/setup.xml
@@ -7,7 +7,6 @@
  <section xml:id="solr.requirements">
   &reftitle.required;
   <!-- Use &no.requirement; if there no requirement -->
-  <para>PHP version 5.2.11 or later is required.</para>
   <para>The libxml and curl extensions must also be enabled for the Apache Solr extension to be available.</para>
   <para>libxml2 2.6.31 or later is required.</para>
   <para>libcurl 7.18.0 or later is also required.</para>
diff --git a/reference/solr/solrinputdocument/addchilddocument.xml b/reference/solr/solrinputdocument/addchilddocument.xml
index 5b77261a99..325314f5d5 100644
--- a/reference/solr/solrinputdocument/addchilddocument.xml
+++ b/reference/solr/solrinputdocument/addchilddocument.xml
@@ -31,7 +31,14 @@
    </varlistentry>
   </variablelist>
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
@@ -42,13 +49,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/solr/solrinputdocument/addchilddocuments.xml b/reference/solr/solrinputdocument/addchilddocuments.xml
index d442522043..a2c56ae4cf 100644
--- a/reference/solr/solrinputdocument/addchilddocuments.xml
+++ b/reference/solr/solrinputdocument/addchilddocuments.xml
@@ -32,7 +32,14 @@
    </varlistentry>
   </variablelist>
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
@@ -43,13 +50,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
   <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/solr/solrinputdocument/setfieldboost.xml b/reference/solr/solrinputdocument/setfieldboost.xml
index 42cfeab40c..c6cd0e4a22 100644
--- a/reference/solr/solrinputdocument/setfieldboost.xml
+++ b/reference/solr/solrinputdocument/setfieldboost.xml
@@ -44,6 +44,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrobject/construct.xml b/reference/solr/solrobject/construct.xml
index 8cff8046e8..6b6b46681a 100644
--- a/reference/solr/solrobject/construct.xml
+++ b/reference/solr/solrobject/construct.xml
@@ -53,15 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Classname::Method</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrobject/offsetunset.xml b/reference/solr/solrobject/offsetunset.xml
index eba61ff68e..7c842b8673 100644
--- a/reference/solr/solrobject/offsetunset.xml
+++ b/reference/solr/solrobject/offsetunset.xml
@@ -64,15 +64,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Classname::Method</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/addgroupfield.xml b/reference/solr/solrquery/addgroupfield.xml
index 617ab94ff8..f8f3269adb 100644
--- a/reference/solr/solrquery/addgroupfield.xml
+++ b/reference/solr/solrquery/addgroupfield.xml
@@ -29,12 +29,20 @@
     <term><parameter>value</parameter></term>
     <listitem>
      <para>
-      
+      The name of the field.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
  </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an instance of <classname>SolrQuery</classname>.
+  </para>
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/solr/solrquery/getexpand.xml b/reference/solr/solrquery/getexpand.xml
index e93737224e..483e4c3596 100644
--- a/reference/solr/solrquery/getexpand.xml
+++ b/reference/solr/solrquery/getexpand.xml
@@ -18,6 +18,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns whether group expanding is enabled.
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/getexpandfilterqueries.xml b/reference/solr/solrquery/getexpandfilterqueries.xml
index da7ffb487d..26f404db99 100644
--- a/reference/solr/solrquery/getexpandfilterqueries.xml
+++ b/reference/solr/solrquery/getexpandfilterqueries.xml
@@ -14,11 +14,23 @@
    <void />
   </methodsynopsis>
   <para>
-Returns the expand filter queries
+   Returns the expand filter queries
   </para>
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the expand filter queries.
+  </para>
+ </refsect1>
+ 
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/getexpandquery.xml b/reference/solr/solrquery/getexpandquery.xml
index b5072f2086..8860ee7801 100644
--- a/reference/solr/solrquery/getexpandquery.xml
+++ b/reference/solr/solrquery/getexpandquery.xml
@@ -18,6 +18,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the expand query.
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/getexpandrows.xml b/reference/solr/solrquery/getexpandrows.xml
index 5274668a1d..9980b6ad21 100644
--- a/reference/solr/solrquery/getexpandrows.xml
+++ b/reference/solr/solrquery/getexpandrows.xml
@@ -19,6 +19,18 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the number of rows.
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/getexpandsortfields.xml b/reference/solr/solrquery/getexpandsortfields.xml
index 0a20e6599a..1d339bb995 100644
--- a/reference/solr/solrquery/getexpandsortfields.xml
+++ b/reference/solr/solrquery/getexpandsortfields.xml
@@ -18,6 +18,18 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an array of fields.
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/gethighlightregexslop.xml b/reference/solr/solrquery/gethighlightregexslop.xml
index 99c1f9d95b..99ed42a514 100644
--- a/reference/solr/solrquery/gethighlightregexslop.xml
+++ b/reference/solr/solrquery/gethighlightregexslop.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
-   Returns the factor by which the regex fragmenter can deviate from the ideal fragment size to accomodate the regular expression
+   Returns the factor by which the regex fragmenter can deviate from the ideal fragment size to accommodate the regular expression
   </para>
 
  </refsect1>
diff --git a/reference/solr/solrquery/setgroupmain.xml b/reference/solr/solrquery/setgroupmain.xml
index 3bcf332aa7..481cd28b12 100644
--- a/reference/solr/solrquery/setgroupmain.xml
+++ b/reference/solr/solrquery/setgroupmain.xml
@@ -14,7 +14,7 @@
    <methodparam><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
-    If true, the result of the first field grouping command is used as the main result list in the response, using group.format=simple.
+    If &true;, the result of the first field grouping command is used as the main result list in the response, using <literal>group.format=simple</literal>.
   </para>
 
  </refsect1>
@@ -26,7 +26,7 @@
     <term><parameter>value</parameter></term>
     <listitem>
      <para>
-      
+      If &true;, the result of the first field grouping command is used as the main result list in the response.
      </para>
     </listitem>
    </varlistentry>
@@ -36,16 +36,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns an instance of <classname>SolrQuery</classname>.
   </para>
  </refsect1>
 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/solr/solrquery/sethighlightformatter.xml b/reference/solr/solrquery/sethighlightformatter.xml
index 234ad40c33..5b4c297ff1 100644
--- a/reference/solr/solrquery/sethighlightformatter.xml
+++ b/reference/solr/solrquery/sethighlightformatter.xml
@@ -42,6 +42,13 @@
    </variablelist>
   </para>
  </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an instance of <classname>SolrQuery</classname>.
+  </para>
+ </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/solr/solrquery/sethighlightsimplepost.xml b/reference/solr/solrquery/sethighlightsimplepost.xml
index bde2b6007d..48f316366d 100644
--- a/reference/solr/solrquery/sethighlightsimplepost.xml
+++ b/reference/solr/solrquery/sethighlightsimplepost.xml
@@ -45,6 +45,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an instance of <classname>SolrQuery</classname>.
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/sphinx/book.xml b/reference/sphinx/book.xml
deleted file mode 100644
index e59f572b07..0000000000
--- a/reference/sphinx/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.sphinx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Sphinx Client</title>
- <titleabbrev>Sphinx</titleabbrev>
-
- <preface xml:id="intro.sphinx">
-  &reftitle.intro;
-  <para>
-   This extension provides bindings for Sphinx search client library.
-   Sphinx is a standalone search engine meant to provide fast,
-   size-efficient and relevant fulltext search functions to other 
-   applications. Sphinx was specially designed to integrate well with 
-   SQL databases and scripting languages.
-   Both Sphinx and its client library can be obtained from the
-   <link xlink:href="&url.sphinx;">official site</link>
-  </para>
- </preface>
-
- &reference.sphinx.setup;
- &reference.sphinx.constants;
- &reference.sphinx.examples;
- &reference.sphinx.sphinxclient;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/sphinx/configure.xml b/reference/sphinx/configure.xml
deleted file mode 100644
index 244a7524ef..0000000000
--- a/reference/sphinx/configure.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="sphinx.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;sphinx"/>.
- </para>
- <para>
-  If the <filename>./configure</filename> script generated by
-  <literal>phpize</literal> is having trouble finding the libsphinxclient
-  files (for example, it was installed into a custom prefix directory), use
-  <userinput>./configure --with-sphinx=$PREFIX</userinput>, where $PREFIX is
-  installation prefix of libsphinxclient.
- </para>
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/constants.xml b/reference/sphinx/constants.xml
deleted file mode 100644
index 178091fda9..0000000000
--- a/reference/sphinx/constants.xml
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="sphinx.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.searchd-ok">
-    <term>
-     <constant>SEARCHD_OK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.searchd-error">
-    <term>
-     <constant>SEARCHD_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.searchd-retry">
-    <term>
-     <constant>SEARCHD_RETRY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.searchd-warning">
-    <term>
-     <constant>SEARCHD_WARNING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-all">
-    <term>
-     <constant>SPH_MATCH_ALL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-any">
-    <term>
-     <constant>SPH_MATCH_ANY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-phrase">
-    <term>
-     <constant>SPH_MATCH_PHRASE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-boolean">
-    <term>
-     <constant>SPH_MATCH_BOOLEAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-extended">
-    <term>
-     <constant>SPH_MATCH_EXTENDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-fullscan">
-    <term>
-     <constant>SPH_MATCH_FULLSCAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-match-extended2">
-    <term>
-     <constant>SPH_MATCH_EXTENDED2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-rank-proximity-bm25">
-    <term>
-     <constant>SPH_RANK_PROXIMITY_BM25</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-rank-bm25">
-    <term>
-     <constant>SPH_RANK_BM25</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-rank-none">
-    <term>
-     <constant>SPH_RANK_NONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-rank-wordcount">
-    <term>
-     <constant>SPH_RANK_WORDCOUNT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-sort-relevance">
-    <term>
-     <constant>SPH_SORT_RELEVANCE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-sort-attr-desc">
-    <term>
-     <constant>SPH_SORT_ATTR_DESC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-sort-attr-asc">
-    <term>
-     <constant>SPH_SORT_ATTR_ASC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-sort-time-segments">
-    <term>
-     <constant>SPH_SORT_TIME_SEGMENTS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-sort-extended">
-    <term>
-     <constant>SPH_SORT_EXTENDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-sort-expr">
-    <term>
-     <constant>SPH_SORT_EXPR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-filter-values">
-    <term>
-     <constant>SPH_FILTER_VALUES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-filter-range">
-    <term>
-     <constant>SPH_FILTER_RANGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-filter-floatrange">
-    <term>
-     <constant>SPH_FILTER_FLOATRANGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-attr-integer">
-    <term>
-     <constant>SPH_ATTR_INTEGER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-attr-timestamp">
-    <term>
-     <constant>SPH_ATTR_TIMESTAMP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-attr-ordinal">
-    <term>
-     <constant>SPH_ATTR_ORDINAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-attr-bool">
-    <term>
-     <constant>SPH_ATTR_BOOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-attr-float">
-    <term>
-     <constant>SPH_ATTR_FLOAT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-attr-multi">
-    <term>
-     <constant>SPH_ATTR_MULTI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-groupby-day">
-    <term>
-     <constant>SPH_GROUPBY_DAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-groupby-week">
-    <term>
-     <constant>SPH_GROUPBY_WEEK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-groupby-month">
-    <term>
-     <constant>SPH_GROUPBY_MONTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-groupby-year">
-    <term>
-     <constant>SPH_GROUPBY_YEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-groupby-attr">
-    <term>
-     <constant>SPH_GROUPBY_ATTR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sph-groupby-attrpair">
-    <term>
-     <constant>SPH_GROUPBY_ATTRPAIR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/sphinx/examples.xml b/reference/sphinx/examples.xml
deleted file mode 100644
index 62460eed05..0000000000
--- a/reference/sphinx/examples.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="sphinx.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Basic usage example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$s = new SphinxClient;
-$s->setServer("localhost", 6712);
-$s->setMatchMode(SPH_MATCH_ANY);
-$s->setMaxQueryTime(3);
-
-$result = $s->query("test");
-
-var_dump($result);
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-array(10) {
-  ["error"]=>
-  string(0) ""
-  ["warning"]=>
-  string(0) ""
-  ["status"]=>
-  int(0)
-  ["fields"]=>
-  array(3) {
-    [0]=>
-    string(7) "subject"
-    [1]=>
-    string(4) "body"
-    [2]=>
-    string(6) "author"
-  }
-  ["attrs"]=>
-  array(0) {
-  }
-  ["matches"]=>
-  array(1) {
-    [3]=>
-    array(2) {
-      ["weight"]=>
-      int(1)
-      ["attrs"]=>
-      array(0) {
-      }
-    }
-  }
-  ["total"]=>
-  int(1)
-  ["total_found"]=>
-  int(1)
-  ["time"]=>
-  float(0)
-  ["words"]=>
-  array(1) {
-    ["to"]=>
-    array(2) {
-      ["docs"]=>
-      int(1)
-      ["hits"]=>
-      int(1)
-    }
-  }
-}
-]]>
-  </screen>
- </example>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/sphinx/reference.xml b/reference/sphinx/reference.xml
deleted file mode 100644
index 44cf131e0c..0000000000
--- a/reference/sphinx/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.sphinx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Sphinx &Functions;</title>
-
- &reference.sphinx.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/sphinx/setup.xml b/reference/sphinx/setup.xml
deleted file mode 100644
index 33e576f80b..0000000000
--- a/reference/sphinx/setup.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="sphinx.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="sphinx.requirements">
-  &reftitle.required;
-  <para>
-   PECL/sphinx requires PHP 5.2.2 or newer.
-  </para>
- </section>
-
- <!-- {{{ Installation -->
- &reference.sphinx.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="sphinx.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
- <!-- }}} -->
-
- <section xml:id="sphinx.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/sphinx/sphinxclient.xml b/reference/sphinx/sphinxclient.xml
deleted file mode 100644
index 4c08ee765e..0000000000
--- a/reference/sphinx/sphinxclient.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.sphinxclient" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The SphinxClient class</title>
- <titleabbrev>SphinxClient</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SphinxClient intro -->
-  <section xml:id="sphinxclient.intro">
-   &reftitle.intro;
-   <para>
-    The SphinxClient class provides object-oriented interface to Sphinx.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="sphinxclient.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SphinxClient</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SphinxClient</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.sphinxclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.sphinx.entities.sphinxclient;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/addquery.xml b/reference/sphinx/sphinxclient/addquery.xml
deleted file mode 100644
index 0851b6ee9e..0000000000
--- a/reference/sphinx/sphinxclient/addquery.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.addquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::addQuery</refname>
-  <refpurpose>Add query to multi-query batch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SphinxClient::addQuery</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>index</parameter><initializer>"*"</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>comment</parameter><initializer>""</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds query with the current settings to multi-query batch. This method
-   doesn't affect current settings (sorting, filtering, grouping etc.) in any way.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-      Query string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       An index name (or names).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>comment</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an index in an array of results that will be returned
-   by <xref linkend="sphinxclient.runqueries" /> call or false on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.runqueries" /></member>
-    <member><xref linkend="sphinxclient.query" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/buildexcerpts.xml b/reference/sphinx/sphinxclient/buildexcerpts.xml
deleted file mode 100644
index dbe0404fe2..0000000000
--- a/reference/sphinx/sphinxclient/buildexcerpts.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.buildexcerpts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::buildExcerpts</refname>
-  <refpurpose>Build text snippets</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>SphinxClient::buildExcerpts</methodname>
-   <methodparam><type>array</type><parameter>docs</parameter></methodparam>
-   <methodparam><type>string</type><parameter>index</parameter></methodparam>
-   <methodparam><type>string</type><parameter>words</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>opts</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects to searchd, requests it to generate excerpts (snippets) from the
-   given documents, and returns the results.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>docs</parameter></term>
-     <listitem>
-      <para>
-       Array of strings with documents' contents.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       Index name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>words</parameter></term>
-     <listitem>
-      <para>
-       Keywords to highlight.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>opts</parameter></term>
-     <listitem>
-      <para>
-       Associative array of additional highlighting options (see below).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-
-   <table>
-    <title>Highlighting options</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Option</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>"before_match"</entry>
-       <entry>A string to insert before a keyword match. Default is "&lt;b&gt;".</entry>
-      </row>
-      <row>
-       <entry>"after_match"</entry>
-       <entry>A string to insert after a keyword match. Default is "&lt;/b&gt;".</entry>
-      </row>
-      <row>
-       <entry>"chunk_separator"</entry>
-       <entry>A string to insert between snippet chunks (passages). Default is " ... ".</entry>
-      </row>
-      <row>
-       <entry>"limit"</entry>
-       <entry>Maximum snippet size, in symbols (codepoints). Integer, default is 256.</entry>
-      </row>
-      <row>
-       <entry>"around"</entry>
-       <entry>How much words to pick around each matching keywords block. Integer, default is 5.</entry>
-      </row>
-      <row>
-       <entry>"exact_phrase"</entry>
-       <entry>Whether to highlight exact query phrase matches only instead of
-        individual keywords. Boolean, default is &false;.</entry>
-      </row>
-      <row>
-       <entry>"single_passage"</entry>
-       <entry>Whether to extract single best passage only. Boolean, default is &false;.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns array of snippets on success&return.falseforfailure;.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/buildkeywords.xml b/reference/sphinx/sphinxclient/buildkeywords.xml
deleted file mode 100644
index aade712903..0000000000
--- a/reference/sphinx/sphinxclient/buildkeywords.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.buildkeywords" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::buildKeywords</refname>
-  <refpurpose>Extract keywords from query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SphinxClient::buildKeywords</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam><type>string</type><parameter>index</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>hits</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Extracts keywords from <parameter>query</parameter> using tokenizer 
-   settings for the given <parameter>index</parameter>, optionally with
-   per-keyword occurrence statistics.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       A query to extract keywords from.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       An index to get tokenizing settings and keyword occurrence statistics
-       from.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>hits</parameter></term>
-     <listitem>
-      <para>
-       A boolean flag to enable/disable keyword statistics generation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of associative arrays with per-keyword information.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/close.xml b/reference/sphinx/sphinxclient/close.xml
deleted file mode 100644
index 013602e5aa..0000000000
--- a/reference/sphinx/sphinxclient/close.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::close</refname>
-  <refpurpose>Closes previously opened persistent connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Closes previously opened persistent connection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>PECL/sphinx &Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL sphinx 1.0.3</entry>
-       <entry>
-        Added SphinxClient::close(), available only if compiled with
-        libsphinxclient >= 0.9.9.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.open" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/escapestring.xml b/reference/sphinx/sphinxclient/escapestring.xml
deleted file mode 100644
index 2b52a9edd7..0000000000
--- a/reference/sphinx/sphinxclient/escapestring.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.escapestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::escapeString</refname>
-  <refpurpose>Escape special characters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SphinxClient::escapeString</methodname>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Escapes characters that are treated as special operators by the query
-   language parser.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>string</parameter></term>
-     <listitem>
-      <para>
-       String to escape.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns escaped string.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/getlasterror.xml b/reference/sphinx/sphinxclient/getlasterror.xml
deleted file mode 100644
index 5d38e8f5af..0000000000
--- a/reference/sphinx/sphinxclient/getlasterror.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.getlasterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::getLastError</refname>
-  <refpurpose>Get the last error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SphinxClient::getLastError</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns string with the last error message. If there were no errors during
-   the previous API call, empty string is returned. This method doesn't reset
-   the error message, so you can safely call it several times.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the last error message or an empty string if there were no errors.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.getlastwarning" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/getlastwarning.xml b/reference/sphinx/sphinxclient/getlastwarning.xml
deleted file mode 100644
index b5d064b522..0000000000
--- a/reference/sphinx/sphinxclient/getlastwarning.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.getlastwarning" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::getLastWarning</refname>
-  <refpurpose>Get the last warning</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SphinxClient::getLastWarning</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns last warning message. If there were no warnings during 
-   the previous API call, empty string is returned. This method doesn't reset
-   the warning, so you can safely call it several times.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the last warning message or an empty string if there were no warnings.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.getlasterror" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/open.xml b/reference/sphinx/sphinxclient/open.xml
deleted file mode 100644
index 07651a6f47..0000000000
--- a/reference/sphinx/sphinxclient/open.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::open</refname>
-  <refpurpose>Opens persistent connection to the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::open</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Opens persistent connection to the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>PECL/sphinx &Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL sphinx 1.0.3</entry>
-       <entry>
-        Added SphinxClient::open(), available only if compiled with
-        libsphinxclient >= 0.9.9.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.close" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/query.xml b/reference/sphinx/sphinxclient/query.xml
deleted file mode 100644
index 93ffe53ca0..0000000000
--- a/reference/sphinx/sphinxclient/query.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::query</refname>
-  <refpurpose>Execute search query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SphinxClient::query</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>index</parameter><initializer>"*"</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>comment</parameter><initializer>""</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects to searchd server, runs the given search query with the current settings,
-   obtains and returns the result set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-      Query string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       An index name (or names).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>comment</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success, <function>SphinxClient::query</function> returns a list of 
-   found matches and additional per-query statistics. The result set is a 
-   hash utilize other structures instead of hash) with the following keys and
-   values:
-   <table>
-    <title>Result set structure</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Key</entry>
-       <entry>Value description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>"matches"</entry>
-       <entry>An array with found document IDs as keys and their weight and
-        attributes values as values</entry>
-      </row>
-      <row>
-       <entry>"total"</entry>
-       <entry>Total number of matches found and retrieved (depends on your
-        settings)</entry>
-      </row>
-      <row>
-       <entry>"total_found"</entry>
-       <entry>Total number of found documents matching the query</entry>
-      </row>
-      <row>
-       <entry>"words"</entry>
-       <entry>An array with words (case-folded and stemmed) as keys and
-        per-word statistics as values</entry>
-      </row>
-      <row>
-       <entry>"error"</entry>
-       <entry>Query error message reported by searchd</entry>
-      </row>
-      <row>
-       <entry>"warning"</entry>
-       <entry>Query warning reported by searchd</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.runqueries" /></member>
-    <member><xref linkend="sphinxclient.addquery" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/resetfilters.xml b/reference/sphinx/sphinxclient/resetfilters.xml
deleted file mode 100644
index 2620c21a04..0000000000
--- a/reference/sphinx/sphinxclient/resetfilters.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.resetfilters" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::resetFilters</refname>
-  <refpurpose>Clear all filters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SphinxClient::resetFilters</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Clears all currently set filters. This call is normally required when
-   using multi-queries. You might want to set different filters for different
-   queries in the batch. To do that, you should call
-   <function>SphinxClient::resetFilters</function> and add new filters using 
-   the respective calls.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.resetgroupby" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/resetgroupby.xml b/reference/sphinx/sphinxclient/resetgroupby.xml
deleted file mode 100644
index f1d196fb20..0000000000
--- a/reference/sphinx/sphinxclient/resetgroupby.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.resetgroupby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::resetGroupBy</refname>
-  <refpurpose>Clear all group-by settings</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SphinxClient::resetGroupBy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Clears all currently group-by settings, and disables group-by. 
-   This call is normally required only when using multi-queries.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.resetgroupby" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/runqueries.xml b/reference/sphinx/sphinxclient/runqueries.xml
deleted file mode 100644
index f702f99950..0000000000
--- a/reference/sphinx/sphinxclient/runqueries.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.runqueries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::runQueries</refname>
-  <refpurpose>Run a batch of search queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SphinxClient::runQueries</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Connects to searchd, runs a batch of all queries added using <xref
-    linkend="sphinxclient.addquery" />, obtains and returns the result sets. 
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; on failure and array of result sets on success.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.addquery" /></member>
-    <member><xref linkend="sphinxclient.query" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setarrayresult.xml b/reference/sphinx/sphinxclient/setarrayresult.xml
deleted file mode 100644
index 6d01f52c94..0000000000
--- a/reference/sphinx/sphinxclient/setarrayresult.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setarrayresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setArrayResult</refname>
-  <refpurpose>Change the format of result set array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setArrayResult</methodname>
-   <methodparam><type>bool</type><parameter>array_result</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Controls the format of search results set arrays (whether matches should
-   be returned as an array or a hash).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>array_result</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>array_result</parameter> is &false;, matches
-       are returned as a hash with document IDs as keys, and other information (weight,
-       attributes) as values. If <parameter>array_result</parameter> is &true;, matches 
-       are returned as a plain array with complete per-match information including
-       document IDs.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Always returns &true;.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setfieldweights.xml b/reference/sphinx/sphinxclient/setfieldweights.xml
deleted file mode 100644
index 1264cd4ac3..0000000000
--- a/reference/sphinx/sphinxclient/setfieldweights.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setfieldweights" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setFieldWeights</refname>
-  <refpurpose>Set field weights</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setFieldWeights</methodname>
-   <methodparam><type>array</type><parameter>weights</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Binds per-field weights by name.
-  </para>
-  <para>
-   Match ranking can be affected by per-field weights. See <link
-   xlink:href="&url.sphinx;">Sphinx documentation</link> for an explanation
-   on how phrase proximity ranking is affected. This call lets you specify 
-   non-default weights for full-text fields. 
-  </para>
-  <para>
-   The weights must be positive 32-bit integers, so be careful not to hit
-   32-bit integer maximum. The final weight is a 32-bit integer too. 
-   Default weight value is 1. Unknown field names are silently ignored.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>weights</parameter></term>
-     <listitem>
-      <para>
-       Associative array of field names and field weights.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setindexweights" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setfilter.xml b/reference/sphinx/sphinxclient/setfilter.xml
deleted file mode 100644
index bcbe9b3862..0000000000
--- a/reference/sphinx/sphinxclient/setfilter.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setfilter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setFilter</refname>
-  <refpurpose>Add new integer values set filter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setFilter</methodname>
-   <methodparam><type>string</type><parameter>attribute</parameter></methodparam>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>exclude</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds new integer values set filter to the existing list of filters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attribute</parameter></term>
-     <listitem>
-      <para>
-       An attribute name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>values</parameter></term>
-     <listitem>
-      <para>
-       Plain array of integer values. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>exclude</parameter></term>
-     <listitem>
-      <para>
-       If set to &true;, matching documents are excluded from the result set.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setfilterfloatrange" /></member>
-    <member><xref linkend="sphinxclient.setfilterrange" /></member>
-    <member><xref linkend="sphinxclient.resetfilters" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setfilterfloatrange.xml b/reference/sphinx/sphinxclient/setfilterfloatrange.xml
deleted file mode 100644
index 9b0b38b7ce..0000000000
--- a/reference/sphinx/sphinxclient/setfilterfloatrange.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setfilterfloatrange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setFilterFloatRange</refname>
-  <refpurpose>Add new float range filter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setFilterFloatRange</methodname>
-   <methodparam><type>string</type><parameter>attribute</parameter></methodparam>
-   <methodparam><type>float</type><parameter>min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>max</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>exclude</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds new float range filter to the existing list of filters.
-   Only those documents which have <parameter>attribute</parameter> 
-   value stored in the index between <parameter>min</parameter> and
-   <parameter>max</parameter> (including values that are exactly equal 
-   to <parameter>min</parameter> or <parameter>max</parameter>) will 
-   be matched (or rejected, if <parameter>exclude</parameter> is &true;).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attribute</parameter></term>
-     <listitem>
-      <para>
-       An attribute name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>min</parameter></term>
-     <listitem>
-      <para>
-       Minimum value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>max</parameter></term>
-     <listitem>
-      <para>
-       Maximum value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>exclude</parameter></term>
-     <listitem>
-      <para>
-       If set to &true;, matching documents are excluded from the result set.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setfilterrange" /></member>
-    <member><xref linkend="sphinxclient.setfilter" /></member>
-    <member><xref linkend="sphinxclient.resetfilters" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setfilterrange.xml b/reference/sphinx/sphinxclient/setfilterrange.xml
deleted file mode 100644
index 5793311105..0000000000
--- a/reference/sphinx/sphinxclient/setfilterrange.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setfilterrange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setFilterRange</refname>
-  <refpurpose>Add new integer range filter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setFilterRange</methodname>
-   <methodparam><type>string</type><parameter>attribute</parameter></methodparam>
-   <methodparam><type>int</type><parameter>min</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>exclude</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds new integer range filter to the existing list of filters.
-   Only those documents which have <parameter>attribute</parameter> 
-   value stored in the index between <parameter>min</parameter> and
-   <parameter>max</parameter> (including values that are exactly equal 
-   to <parameter>min</parameter> or <parameter>max</parameter>) will 
-   be matched (or rejected, if <parameter>exclude</parameter> is &true;).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attribute</parameter></term>
-     <listitem>
-      <para>
-       An attribute name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>min</parameter></term>
-     <listitem>
-      <para>
-       Minimum value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>max</parameter></term>
-     <listitem>
-      <para>
-       Maximum value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>exclude</parameter></term>
-     <listitem>
-      <para>
-       If set to &true;, matching documents are excluded from the result set.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setfilterfloatrange" /></member>
-    <member><xref linkend="sphinxclient.setfilter" /></member>
-    <member><xref linkend="sphinxclient.resetfilters" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setgeoanchor.xml b/reference/sphinx/sphinxclient/setgeoanchor.xml
deleted file mode 100644
index faefc12ec5..0000000000
--- a/reference/sphinx/sphinxclient/setgeoanchor.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setgeoanchor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setGeoAnchor</refname>
-  <refpurpose>Set anchor point for a geosphere distance calculations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setGeoAnchor</methodname>
-   <methodparam><type>string</type><parameter>attrlat</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attrlong</parameter></methodparam>
-   <methodparam><type>float</type><parameter>latitude</parameter></methodparam>
-   <methodparam><type>float</type><parameter>longitude</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets anchor point for a geosphere distance (geodistance) calculations
-   and enables them.
-  </para>
-  <para>
-   Once an anchor point is set, you can use magic "@geodist" attribute name in
-   your filters and/or sorting expressions. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attrlat</parameter></term>
-     <listitem>
-      <para>
-       Name of a latitude attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attrlong</parameter></term>
-     <listitem>
-      <para>
-       Name of a longitude attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>latitude</parameter></term>
-     <listitem>
-      <para>
-       Anchor latitude in radians.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>longitude</parameter></term>
-     <listitem>
-      <para>
-       Anchor longitude in radians.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setfilterfloatrange" /></member>
-    <member><xref linkend="sphinxclient.setfilterrange" /></member>
-    <member><xref linkend="sphinxclient.setfilter" /></member>
-    <member><xref linkend="sphinxclient.resetfilters" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setgroupby.xml b/reference/sphinx/sphinxclient/setgroupby.xml
deleted file mode 100644
index 7f7d90344e..0000000000
--- a/reference/sphinx/sphinxclient/setgroupby.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setgroupby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setGroupBy</refname>
-  <refpurpose>Set grouping attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setGroupBy</methodname>
-   <methodparam><type>string</type><parameter>attribute</parameter></methodparam>
-   <methodparam><type>int</type><parameter>func</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>groupsort</parameter><initializer>"@group desc"</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets grouping attribute, function, and group sorting mode, and enables
-   grouping.
-  </para>
-  <para>
-   Grouping feature is very similar to GROUP BY clause in SQL.
-   Results produced by this function call are going to be the same as produced
-   by the following pseudo code:
-   <command>SELECT ... GROUP BY $func($attribute) ORDER BY $groupsort</command>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attribute</parameter></term>
-     <listitem>
-      <para>
-       A string containing group-by attribute name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>func</parameter></term>
-     <listitem>
-      <para>
-       Constant, which sets a function applied to the attribute value in order
-       to compute group-by key.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>groupsort</parameter></term>
-     <listitem>
-      <para>
-       An optional clause controlling how the groups are sorted.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.resetgroupby" /></member>
-    <member><xref linkend="sphinxclient.setsortmode" /></member>
-    <member><xref linkend="sphinxclient.setgroupdistinct" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setgroupdistinct.xml b/reference/sphinx/sphinxclient/setgroupdistinct.xml
deleted file mode 100644
index 84acbab399..0000000000
--- a/reference/sphinx/sphinxclient/setgroupdistinct.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setgroupdistinct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setGroupDistinct</refname>
-  <refpurpose>Set attribute name for per-group distinct values count calculations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setGroupDistinct</methodname>
-   <methodparam><type>string</type><parameter>attribute</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets attribute name for per-group distinct values count calculations. Only
-   available for grouping queries.  For each group, all values of
-   <parameter>attribute</parameter> will be stored, then the amount of
-   distinct values will be calculated and returned to the client. This feature
-   is similar to COUNT(DISTINCT) clause in SQL.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attribute</parameter></term>
-     <listitem>
-      <para>
-       A string containing group-by attribute name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setsortmode" /></member>
-    <member><xref linkend="sphinxclient.setgroupby" /></member>
-    <member><xref linkend="sphinxclient.resetgroupby" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setidrange.xml b/reference/sphinx/sphinxclient/setidrange.xml
deleted file mode 100644
index 0974a7e299..0000000000
--- a/reference/sphinx/sphinxclient/setidrange.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setidrange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setIDRange</refname>
-  <refpurpose>Set a range of accepted document IDs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setIDRange</methodname>
-   <methodparam><type>int</type><parameter>min</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets an accepted range of document IDs. Default range is from 0 to 0, i.e.
-   no limit. Only those records that have document ID between
-   <parameter>min</parameter> and <parameter>max</parameter> 
-   (including IDs exactly equal to <parameter>min</parameter> or
-   <parameter>max</parameter>) will be matched.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>min</parameter></term>
-     <listitem>
-      <para>
-       Minimum ID value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>max</parameter></term>
-     <listitem>
-      <para>
-       Maximum ID value.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setindexweights.xml b/reference/sphinx/sphinxclient/setindexweights.xml
deleted file mode 100644
index b13cc19daf..0000000000
--- a/reference/sphinx/sphinxclient/setindexweights.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setindexweights" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setIndexWeights</refname>
-  <refpurpose>Set per-index weights</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setIndexWeights</methodname>
-   <methodparam><type>array</type><parameter>weights</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets per-index weights and enables weighted summing of match weights across
-   different indexes.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>weights</parameter></term>
-     <listitem>
-      <para>
-       An associative array mapping string index names to integer
-       weights. Default is empty array, i.e. weighting summing is disabled.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setlimits.xml b/reference/sphinx/sphinxclient/setlimits.xml
deleted file mode 100644
index e7a998f1bb..0000000000
--- a/reference/sphinx/sphinxclient/setlimits.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setlimits" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setLimits</refname>
-  <refpurpose>Set offset and limit of the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setLimits</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>limit</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>max_matches</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>cutoff</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets <parameter>offset</parameter> into server-side result set and amount
-   of matches to return to client starting from that offset
-   (<parameter>limit</parameter>). Can additionally control maximum
-   server-side result set size for current query
-   (<parameter>max_matches</parameter>) and the threshold amount of matches
-   to stop searching at (<parameter>cutoff</parameter>).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       Result set offset.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <para>
-       Amount of matches to return.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>max_matches</parameter></term>
-     <listitem>
-      <para>
-       Controls how much matches searchd will keep in RAM while searching.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cutoff</parameter></term>
-     <listitem>
-      <para>
-       Used for advanced performance control. It tells searchd to forcibly 
-       stop search query once <parameter>cutoff</parameter> matches have been 
-       found and processed.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setmatchmode.xml b/reference/sphinx/sphinxclient/setmatchmode.xml
deleted file mode 100644
index 3788dbb572..0000000000
--- a/reference/sphinx/sphinxclient/setmatchmode.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setmatchmode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setMatchMode</refname>
-  <refpurpose>Set full-text query matching mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setMatchMode</methodname>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets full-text query matching mode. <parameter>mode</parameter> is one of
-   the constants listed below.
-   <table>
-    <title>Match modes</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>SPH_MATCH_ALL</entry>
-       <entry>Match all query words (default mode).</entry>
-      </row>
-      <row>
-       <entry>SPH_MATCH_ANY</entry>
-       <entry>Match any of query words.</entry>
-      </row>
-      <row>
-       <entry>SPH_MATCH_PHRASE</entry>
-       <entry>Match query as a phrase, requiring perfect match.</entry>
-      </row>
-      <row>
-       <entry>SPH_MATCH_BOOLEAN</entry>
-       <entry>Match query as a boolean expression.</entry>
-      </row>
-      <row>
-       <entry>SPH_MATCH_EXTENDED</entry>
-       <entry>Match query as an expression in Sphinx internal query language.</entry>
-      </row>
-      <row>
-       <entry>SPH_MATCH_FULLSCAN</entry>
-       <entry>Enables fullscan.</entry>
-      </row>
-      <row>
-       <entry>SPH_MATCH_EXTENDED2</entry>
-       <entry>The same as <constant>SPH_MATCH_EXTENDED</constant> plus ranking
-       and quorum searching support.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Matching mode.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setrankingmode" /></member>
-    <member><xref linkend="sphinxclient.setsortmode" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setmaxquerytime.xml b/reference/sphinx/sphinxclient/setmaxquerytime.xml
deleted file mode 100644
index 95343c728e..0000000000
--- a/reference/sphinx/sphinxclient/setmaxquerytime.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setmaxquerytime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setMaxQueryTime</refname>
-  <refpurpose>Set maximum query time</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setMaxQueryTime</methodname>
-   <methodparam><type>int</type><parameter>qtime</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets maximum search query time.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>qtime</parameter></term>
-     <listitem>
-      <para>
-       Maximum query time, in milliseconds. It must be a
-       non-negative integer. Default value is 0, i.e. no limit.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setoverride.xml b/reference/sphinx/sphinxclient/setoverride.xml
deleted file mode 100644
index 491e0d16dc..0000000000
--- a/reference/sphinx/sphinxclient/setoverride.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setoverride" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setOverride</refname>
-  <refpurpose>Sets temporary per-document attribute value
-   overrides</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setOverride</methodname>
-   <methodparam><type>string</type><parameter>attribute</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets temporary (per-query) per-document attribute value overrides. Override
-   feature lets you "temporary" update attribute values for some documents
-   within a single query, leaving all other queries unaffected. This might be
-   useful for personalized data </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>attribute</parameter></term>
-     <listitem>
-      <para>
-       An attribute name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       An attribute type. Only supports scalar attributes.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>values</parameter></term>
-     <listitem>
-      <para>
-       Array of attribute values that maps document IDs to overridden
-       attribute values.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>PECL/sphinx &Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL sphinx 1.0.3</entry>
-       <entry>
-        Added SphinxClient::setOverride(), available only if compiled with
-        libsphinxclient >= 0.9.9.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setrankingmode.xml b/reference/sphinx/sphinxclient/setrankingmode.xml
deleted file mode 100644
index eec36a9712..0000000000
--- a/reference/sphinx/sphinxclient/setrankingmode.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setrankingmode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setRankingMode</refname>
-  <refpurpose>Set ranking mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setRankingMode</methodname>
-   <methodparam><type>int</type><parameter>ranker</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets ranking mode. Only available in
-   <constant>SPH_MATCH_EXTENDED2</constant> matching mode.
-   <table>
-    <title>Ranking modes</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>SPH_RANK_PROXIMITY_BM25</entry>
-       <entry>Default ranking mode which uses both proximity and BM25
-        ranking.</entry>
-      </row>
-      <row>
-       <entry>SPH_RANK_BM25</entry>
-       <entry>Statistical ranking mode which uses BM25 ranking only (similar
-        to most of other full-text engines). This mode is faster, but may result
-        in worse quality on queries which contain more than 1 keyword.</entry>
-      </row>
-      <row>
-       <entry>SPH_RANK_NONE</entry>
-       <entry>Disables ranking. This mode is the fastest. It is essentially
-        equivalent to boolean searching, a weight of 1 is assigned to all
-        matches.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ranker</parameter></term>
-     <listitem>
-      <para>
-       Ranking mode.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setmatchmode" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setretries.xml b/reference/sphinx/sphinxclient/setretries.xml
deleted file mode 100644
index 85a91eaa60..0000000000
--- a/reference/sphinx/sphinxclient/setretries.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setretries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setRetries</refname>
-  <refpurpose>Set retry count and delay</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setRetries</methodname>
-   <methodparam><type>int</type><parameter>count</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>delay</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets distributed retry count and delay.
-  </para>
-  <para>
-   On temporary failures searchd will attempt up to
-   <parameter>count</parameter> retries per agent.
-   <parameter>delay</parameter> is the delay between the retries, 
-   in milliseconds. Retries are disabled by default. 
-   Note that this call will not make the API itself retry
-   on temporary failure; it only tells searchd to do so.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>count</parameter></term>
-     <listitem>
-      <para>
-       Number of retries.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>delay</parameter></term>
-     <listitem>
-      <para>
-       Delay between retries, in milliseconds.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setselect.xml b/reference/sphinx/sphinxclient/setselect.xml
deleted file mode 100644
index 817d97f781..0000000000
--- a/reference/sphinx/sphinxclient/setselect.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setselect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setSelect</refname>
-  <refpurpose>Set select clause</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setSelect</methodname>
-   <methodparam><type>string</type><parameter>clause</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the select clause, listing specific attributes to fetch, and
-   expressions to compute and fetch.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>clause</parameter></term>
-     <listitem>
-      <para>
-       SQL-like clause.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>PECL/sphinx &Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL sphinx 1.0.1</entry>
-       <entry>
-        Added SphinxClient::setSelect(), available only if compiled with
-        libsphinxclient >= 0.9.9.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setserver.xml b/reference/sphinx/sphinxclient/setserver.xml
deleted file mode 100644
index e5f30cf046..0000000000
--- a/reference/sphinx/sphinxclient/setserver.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setServer</refname>
-  <refpurpose>Set searchd host and port</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setServer</methodname>
-   <methodparam><type>string</type><parameter>server</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets searchd host name and TCP port. All subsequent requests will use the
-   new host and port settings. Default host and port are 'localhost' and 3312,
-   respectively.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server</parameter></term>
-     <listitem>
-      <para>
-       IP or hostname.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>port</parameter></term>
-     <listitem>
-      <para>
-       Port number.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/setsortmode.xml b/reference/sphinx/sphinxclient/setsortmode.xml
deleted file mode 100644
index 9ebfc19a35..0000000000
--- a/reference/sphinx/sphinxclient/setsortmode.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.setsortmode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::setSortMode</refname>
-  <refpurpose>Set matches sorting mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SphinxClient::setSortMode</methodname>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>sortby</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets matches sorting mode. See available modes below.
-   <table>
-    <title>Sorting modes</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>SPH_SORT_RELEVANCE</entry>
-       <entry>Sort by relevance in descending order (best matches first).</entry>
-      </row>
-      <row>
-       <entry>SPH_SORT_ATTR_DESC</entry>
-       <entry>Sort by an attribute in descending order (bigger attribute
-        values first).</entry>
-      </row>
-      <row>
-       <entry>SPH_SORT_ATTR_ASC</entry>
-       <entry>Sort by an attribute in ascending order (smaller attribute
-        values first).</entry>
-      </row>
-      <row>
-       <entry>SPH_SORT_TIME_SEGMENTS</entry>
-       <entry>Sort by time segments (last hour/day/week/month) in descending
-       order, and then by relevance in descending order.</entry>
-      </row>
-      <row>
-       <entry>SPH_SORT_EXTENDED</entry>
-       <entry>Sort by SQL-like combination of columns in ASC/DESC order.</entry>
-      </row>
-      <row>
-       <entry>SPH_SORT_EXPR</entry>
-       <entry>Sort by an arithmetic expression.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Sorting mode.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sortby</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><xref linkend="sphinxclient.setmatchmode" /></member>
-    <member><xref linkend="sphinxclient.setsortmode" /></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/status.xml b/reference/sphinx/sphinxclient/status.xml
deleted file mode 100644
index 0acaa5fb6c..0000000000
--- a/reference/sphinx/sphinxclient/status.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.status" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::status</refname>
-  <refpurpose>Queries searchd status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SphinxClient::status</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Queries searchd status, and returns an array of status variable name and
-   value pairs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>PECL/sphinx &Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL sphinx 1.0.3</entry>
-       <entry>
-        Added SphinxClient::status(), available only if compiled with
-        libsphinxclient >= 0.9.9.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array of search server statistics&return.falseforfailure;.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/sphinxclient/updateattributes.xml b/reference/sphinx/sphinxclient/updateattributes.xml
deleted file mode 100644
index 7e9df0afa7..0000000000
--- a/reference/sphinx/sphinxclient/updateattributes.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="sphinxclient.updateattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SphinxClient::updateAttributes</refname>
-  <refpurpose>Update document attributes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SphinxClient::updateAttributes</methodname>
-   <methodparam><type>string</type><parameter>index</parameter></methodparam>
-   <methodparam><type>array</type><parameter>attributes</parameter></methodparam>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>mva</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Instantly updates given attribute values in given documents.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       Name of the index (or indexes) to be updated.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>attributes</parameter></term>
-     <listitem>
-      <para>
-       Array of attribute names, listing attributes that are updated.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>values</parameter></term>
-     <listitem>
-      <para>
-       Associative array containing document IDs as keys and array of
-       attribute values as values.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns number of actually updated documents (0 or more) on success, or
-    &false; on failure.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sphinx/versions.xml b/reference/sphinx/versions.xml
deleted file mode 100644
index 691f677b46..0000000000
--- a/reference/sphinx/versions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
-
- <function name='SphinxClient' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::__construct' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::addQuery' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::buildExcerpts' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::buildKeywords' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::escapeString' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::getLastError' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::getLastWarning' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::query' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::resetFilters' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::resetGroupBy' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::runQueries' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setArrayResult' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setConnectTimeout' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setFieldWeights' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setFilter' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setFilterFloatRange' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setFilterRange' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setGeoAnchor' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setGroupBy' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setGroupDistinct' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setIdRange' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setIndexWeights' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setLimits' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setMatchMode' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setMaxQueryTime' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setRankingMode' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setRetries' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setServer' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setSortMode' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::updateAttributes' from='PECL sphinx &gt;= 0.1.0'/>
- <function name='SphinxClient::setSelect' from='PECL sphinx &gt;= 1.0.1'/>
- <function name='SphinxClient::setOverride' from='PECL sphinx &gt;= 1.0.3'/>
- <function name='SphinxClient::open' from='PECL sphinx &gt;= 1.0.3'/>
- <function name='SphinxClient::close' from='PECL sphinx &gt;= 1.0.3'/>
- <function name='SphinxClient::status' from='PECL sphinx &gt;= 1.0.3'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/spl/appenditerator/construct.xml b/reference/spl/appenditerator/construct.xml
index e6b1206ff0..27d9ac2801 100644
--- a/reference/spl/appenditerator/construct.xml
+++ b/reference/spl/appenditerator/construct.xml
@@ -114,7 +114,7 @@ while ($appendIterator->valid()) {
    <para>
     When using <function>iterator_to_array</function> to copy the values of the AppendIterator 
     into an array, you have to set the optional <parameter>use_key</parameter> argument to 
-    &false;. When <parameter>use_key</parameter> is not &false; any keys reoccuring in inner 
+    &false;. When <parameter>use_key</parameter> is not &false; any keys reoccurring in inner 
     iterators will get overwritten in the returned array. There is no way to preserve the original keys.
    </para>
   </caution>
diff --git a/reference/spl/arrayobject.xml b/reference/spl/arrayobject.xml
index c645b353ba..748c93ed6b 100644
--- a/reference/spl/arrayobject.xml
+++ b/reference/spl/arrayobject.xml
@@ -99,31 +99,6 @@
     </variablelist>
    </section>
   </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.3.0</entry>
-        <entry>
-         Implements <interfacename>Serializable</interfacename>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
   
 <!-- {{{ ArrayObject properties
   <section xml:id="arrayobject.props">
diff --git a/reference/spl/cachingiterator/hasnext.xml b/reference/spl/cachingiterator/hasnext.xml
index 7024592d0f..8da6c895ca 100644
--- a/reference/spl/cachingiterator/hasnext.xml
+++ b/reference/spl/cachingiterator/hasnext.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>CachingIterator::hasNext</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>CachingIterator::hasNext</methodname>
    <void />
   </methodsynopsis>
 
diff --git a/reference/spl/constants.xml b/reference/spl/constants.xml
index dee0471622..a833dda89c 100644
--- a/reference/spl/constants.xml
+++ b/reference/spl/constants.xml
@@ -3,12 +3,6 @@
 <appendix xml:id="spl.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.constants;
  &extension.constants;
- <warning>
-  <para>
-   SPL uses class constants since PHP 5.1. Prior releases use global constants
-   in the form <constant>RIT_LEAVES_ONLY</constant>.
-  </para>
- </warning>
 </appendix>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/spl/countable.xml b/reference/spl/countable.xml
index f4b1082bd6..2566a6ac72 100644
--- a/reference/spl/countable.xml
+++ b/reference/spl/countable.xml
@@ -27,9 +27,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>Countable</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>Countable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
diff --git a/reference/spl/directoryiterator.xml b/reference/spl/directoryiterator.xml
index 0795878eeb..88d1515b9f 100644
--- a/reference/spl/directoryiterator.xml
+++ b/reference/spl/directoryiterator.xml
@@ -71,32 +71,6 @@
   </section>
 }}} -->
 
-  <!-- {{{ Changelog -->
-  <section role="changelog" xml:id="directoryiterator.changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.1.2</entry>
-        <entry>
-         <classname>DirectoryIterator</classname> extends <classname>SplFileInfo</classname>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-  <!-- }}} -->
- 
  </partintro>
  
  &reference.spl.entities.directoryiterator;
diff --git a/reference/spl/directoryiterator/getextension.xml b/reference/spl/directoryiterator/getextension.xml
index 90e571687e..9d92c75810 100644
--- a/reference/spl/directoryiterator/getextension.xml
+++ b/reference/spl/directoryiterator/getextension.xml
@@ -66,7 +66,6 @@ gz
   &reftitle.notes;
   <note>
    <para>
-    This method is only available as of PHP 5.3.6.
     Another way of getting the extension is to use the
     <function>pathinfo</function> function.
    </para>
diff --git a/reference/spl/filesystemiterator.xml b/reference/spl/filesystemiterator.xml
index fc03ef6dc4..da01d199b9 100644
--- a/reference/spl/filesystemiterator.xml
+++ b/reference/spl/filesystemiterator.xml
@@ -199,30 +199,6 @@
   </section>
   <!-- }}} -->
 
-  <!-- {{{ Changelog -->
-  <section role="changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.3.1</entry>
-        <entry>Added <constant>FilesystemIterator::FOLLOW_SYMLINKS</constant></entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-  <!-- }}} -->  
-
  </partintro>
 
  &reference.spl.entities.filesystemiterator;
diff --git a/reference/spl/functions/class-implements.xml b/reference/spl/functions/class-implements.xml
index 8189b119a4..d5ce0e4d74 100644
--- a/reference/spl/functions/class-implements.xml
+++ b/reference/spl/functions/class-implements.xml
@@ -36,8 +36,7 @@
      <term><parameter>autoload</parameter></term>
      <listitem>
       <para>
-       Whether to allow this function to load the class automatically through
-       the <function>__autoload</function> magic method.
+       Whether to call &link.autoload; by default.
       </para>
      </listitem>
     </varlistentry>
@@ -67,15 +66,12 @@ class bar implements foo {}
 
 print_r(class_implements(new bar));
 
-// since PHP 5.1.0 you may also specify the parameter as a string
+// you may also specify the parameter as a string
 print_r(class_implements('bar'));
 
+spl_autoload_register();
 
-function __autoload($class_name) {
-   require_once $class_name . '.php';
-}
-
-// use __autoload to load the 'not_loaded' class
+// use autoloading to load the 'not_loaded' class
 print_r(class_implements('not_loaded', true));
 
 ?>
@@ -88,7 +84,10 @@ Array
 (
     [foo] => foo
 )
-
+Array
+(
+    [foo] => foo
+)
 Array
 (
     [interface_of_not_loaded] => interface_of_not_loaded
diff --git a/reference/spl/functions/class-parents.xml b/reference/spl/functions/class-parents.xml
index 0da3b027dd..63124e707c 100644
--- a/reference/spl/functions/class-parents.xml
+++ b/reference/spl/functions/class-parents.xml
@@ -36,8 +36,7 @@
      <term><parameter>autoload</parameter></term>
      <listitem>
       <para>
-       Whether to allow this function to load the class automatically through
-       the <function>__autoload</function> magic method.
+       Whether to call &link.autoload; by default.
       </para>
      </listitem>
     </varlistentry>
@@ -66,16 +65,14 @@ class bar extends foo {}
 
 print_r(class_parents(new bar));
 
-// since PHP 5.1.0 you may also specify the parameter as a string
+// you may also specify the parameter as a string
 print_r(class_parents('bar'));
 
+spl_autoload_register();
 
-function __autoload($class_name) {
-   require_once $class_name . '.php';
-}
-
-// use __autoload to load the 'not_loaded' class
+// use autoloading to load the 'not_loaded' class
 print_r(class_parents('not_loaded', true));
+
 ?>
 ]]>
     </programlisting>
@@ -86,7 +83,10 @@ Array
 (
     [foo] => foo
 )
-
+Array
+(
+    [foo] => foo
+)
 Array
 (
     [parent_of_not_loaded] => parent_of_not_loaded
diff --git a/reference/spl/functions/class-uses.xml b/reference/spl/functions/class-uses.xml
index 32768a092d..d13880ba17 100644
--- a/reference/spl/functions/class-uses.xml
+++ b/reference/spl/functions/class-uses.xml
@@ -37,8 +37,7 @@
      <term><parameter>autoload</parameter></term>
      <listitem>
       <para>
-       Whether to allow this function to load the class automatically through
-       the <function>__autoload</function> magic method.
+       Whether to call &link.autoload; by default.
       </para>
      </listitem>
     </varlistentry>
@@ -72,11 +71,9 @@ print_r(class_uses(new bar));
 
 print_r(class_uses('bar'));
 
-function __autoload($class_name) {
-   require_once $class_name . '.php';
-}
+spl_autoload_register();
 
-// use __autoload to load the 'not_loaded' class
+// use autoloading to load the 'not_loaded' class
 print_r(class_uses('not_loaded', true));
 
 ?>
@@ -89,12 +86,10 @@ Array
 (
     [foo] => foo
 )
-
 Array
 (
     [foo] => foo
 )
-
 Array
 (
     [trait_of_not_loaded] => trait_of_not_loaded
diff --git a/reference/spl/functions/iterator-to-array.xml b/reference/spl/functions/iterator-to-array.xml
index 3017b7289d..d795033c2f 100644
--- a/reference/spl/functions/iterator-to-array.xml
+++ b/reference/spl/functions/iterator-to-array.xml
@@ -37,7 +37,7 @@
        Whether to use the iterator element keys as index.
       </para>
       <para>
-       In PHP 5.5 and later, if a key is an <type>array</type> or
+       If a key is an <type>array</type> or
        <type>object</type>, a warning will be generated. &null; keys will be
        converted to an empty string, <type>float</type> keys will be
        truncated to their <type>int</type> counterpart,
diff --git a/reference/spl/functions/spl-autoload-register.xml b/reference/spl/functions/spl-autoload-register.xml
index 14a2bf903a..077cb6d793 100644
--- a/reference/spl/functions/spl-autoload-register.xml
+++ b/reference/spl/functions/spl-autoload-register.xml
@@ -45,6 +45,10 @@
        If no parameter is provided, then the default implementation of
        <function>spl_autoload</function> will be registered.      
       </para>
+      <methodsynopsis>
+       <type>void</type><methodname><replaceable>callback</replaceable></methodname>
+       <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
+      </methodsynopsis>
      </listitem>
     </varlistentry>
     <varlistentry>
@@ -97,7 +101,7 @@ function my_autoloader($class) {
 
 spl_autoload_register('my_autoloader');
 
-// Or, using an anonymous function as of PHP 5.3.0
+// Or, using an anonymous function
 spl_autoload_register(function ($class) {
     include 'classes/' . $class . '.class.php';
 });
@@ -120,7 +124,7 @@ class Foo {
     }
 }
 
-spl_autoload_register(__NAMESPACE__ .'\Foo::test'); // As of PHP 5.3.0
+spl_autoload_register(__NAMESPACE__ .'\Foo::test');
 
 new InexistentClass;
 
diff --git a/reference/spl/outeriterator.xml b/reference/spl/outeriterator.xml
index 4ac9a0774e..fe0fb8685d 100644
--- a/reference/spl/outeriterator.xml
+++ b/reference/spl/outeriterator.xml
@@ -27,9 +27,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>OuterIterator</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>OuterIterator</interfacename>
+     </oointerface>
 
      <ooclass>
       <modifier>extends</modifier>
diff --git a/reference/spl/recursivearrayiterator.xml b/reference/spl/recursivearrayiterator.xml
index 763b54f71d..9b7e246bfb 100644
--- a/reference/spl/recursivearrayiterator.xml
+++ b/reference/spl/recursivearrayiterator.xml
@@ -86,30 +86,6 @@
     </variablelist>
    </section>
   </section>
-  
-  <section role="changelog">
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.3.0</entry>
-        <entry>
-         <constant>CHILD_ARRAYS_ONLY</constant> flag was added.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
 
 <!-- {{{ RecursiveArrayIterator properties
   <section xml:id="recursivearrayiterator.props">
diff --git a/reference/spl/recursivecallbackfilteriterator/construct.xml b/reference/spl/recursivecallbackfilteriterator/construct.xml
index 8c1fc4a7ae..47f170d940 100644
--- a/reference/spl/recursivecallbackfilteriterator/construct.xml
+++ b/reference/spl/recursivecallbackfilteriterator/construct.xml
@@ -13,7 +13,7 @@
    <modifier>public</modifier>
    <methodname>RecursiveCallbackFilterIterator::__construct</methodname>
    <methodparam><type>RecursiveIterator</type><parameter>iterator</parameter></methodparam>
-   <methodparam><type>string</type><parameter>callback</parameter></methodparam>
+   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
   </constructorsynopsis>
   <para>
    Creates a filtered iterator from a <interfacename>RecursiveIterator</interfacename>
diff --git a/reference/spl/recursivedirectoryiterator.xml b/reference/spl/recursivedirectoryiterator.xml
index d5da75bc88..46bdf53b0b 100644
--- a/reference/spl/recursivedirectoryiterator.xml
+++ b/reference/spl/recursivedirectoryiterator.xml
@@ -81,42 +81,6 @@
   </section>
 }}} -->
 
-  <section role="changelog"><!-- {{{ -->
-   &reftitle.changelog;
-   <para>
-    <informaltable>
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>5.3.0</entry>
-        <entry>
-         The <classname>FilesystemIterator</classname> was introduced as 
-         the parent class. Previously, the parent was the 
-         <classname>DirectoryIterator</classname>.
-        </entry>
-       </row>
-       <row>
-        <entry>5.3.0</entry>
-        <entry>
-         Implements <interfacename>SeekableIterator</interfacename>.
-        </entry>
-       </row>
-       <row>
-        <entry>5.2.11, 5.3.1</entry>
-        <entry>Added <constant>RecursiveDirectoryIterator::FOLLOW_SYMLINKS</constant></entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section><!-- }}} -->
-  
  </partintro>
  
  &reference.spl.entities.recursivedirectoryiterator;
diff --git a/reference/spl/recursiveiterator.xml b/reference/spl/recursiveiterator.xml
index f300ba2734..19fcf9c6b1 100644
--- a/reference/spl/recursiveiterator.xml
+++ b/reference/spl/recursiveiterator.xml
@@ -27,9 +27,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>RecursiveIterator</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>RecursiveIterator</interfacename>
+     </oointerface>
 
      <ooclass>
       <modifier>extends</modifier>
diff --git a/reference/spl/regexiterator/getflags.xml b/reference/spl/regexiterator/getflags.xml
index 2352e95404..32976a9a36 100644
--- a/reference/spl/regexiterator/getflags.xml
+++ b/reference/spl/regexiterator/getflags.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/spl/regexiterator/getmode.xml b/reference/spl/regexiterator/getmode.xml
index 1d84cad612..4646cda28d 100644
--- a/reference/spl/regexiterator/getmode.xml
+++ b/reference/spl/regexiterator/getmode.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/spl/regexiterator/getpregflags.xml b/reference/spl/regexiterator/getpregflags.xml
index ae77080695..e9cb7a7555 100644
--- a/reference/spl/regexiterator/getpregflags.xml
+++ b/reference/spl/regexiterator/getpregflags.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/spl/seekableiterator.xml b/reference/spl/seekableiterator.xml
index 92316a1ea0..2f51870072 100644
--- a/reference/spl/seekableiterator.xml
+++ b/reference/spl/seekableiterator.xml
@@ -26,9 +26,9 @@
 
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
-     <ooclass>
-      <classname>SeekableIterator</classname>
-     </ooclass>
+     <oointerface>
+      <interfacename>SeekableIterator</interfacename>
+     </oointerface>
      
      <ooclass>
       <modifier>extends</modifier>
diff --git a/reference/spl/spldoublylinkedlist.xml b/reference/spl/spldoublylinkedlist.xml
index b98e0b3975..401a09087c 100644
--- a/reference/spl/spldoublylinkedlist.xml
+++ b/reference/spl/spldoublylinkedlist.xml
@@ -84,7 +84,6 @@
     }}} -->
  
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.spldoublylinkedlist')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.spldoublylinkedlist')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
  
diff --git a/reference/spl/spldoublylinkedlist/construct.xml b/reference/spl/spldoublylinkedlist/construct.xml
deleted file mode 100644
index 04b5647ee5..0000000000
--- a/reference/spl/spldoublylinkedlist/construct.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="spldoublylinkedlist.construct" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>SplDoublyLinkedList::__construct</refname>
-  <refpurpose>Constructs a new doubly linked list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SplDoublyLinkedList::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   This constructs a new empty doubly linked list. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>SplDoublyLinkedList::__construct</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$dll = new SplDoublyLinkedList();
-
-$dll->push(2);
-$dll->push(3);
-$dll->unshift(5);
-
-var_dump($dll);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-object(SplDoublyLinkedList)#1 (2) {
-  ["flags":"SplDoublyLinkedList":private]=>
-  int(0)
-  ["dllist":"SplDoublyLinkedList":private]=>
-  array(3) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/spl/splfileinfo/getextension.xml b/reference/spl/splfileinfo/getextension.xml
index 39556575e2..9238463030 100644
--- a/reference/spl/splfileinfo/getextension.xml
+++ b/reference/spl/splfileinfo/getextension.xml
@@ -67,7 +67,6 @@ string(2) "gz"
   &reftitle.notes;
   <note>
    <para>
-    This method is only available as of PHP 5.3.6.
     Another way of getting the extension is to use the 
     <function>pathinfo</function> function.
    </para>
diff --git a/reference/spl/splfileobject.xml b/reference/spl/splfileobject.xml
index 173ae27600..582d78febb 100644
--- a/reference/spl/splfileobject.xml
+++ b/reference/spl/splfileobject.xml
@@ -118,31 +118,6 @@
   </section>
 <!-- }}} -->
 
- <section role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.3.9</entry>
-       <entry>
-        <constant>SplFileObject::SKIP_EMPTY</constant> value changed to 4.
-        Previously, value was 6.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </section><!-- }}} -->
-
  </partintro>
 
  &reference.spl.entities.splfileobject;
diff --git a/reference/spl/splfileobject/fgetcsv.xml b/reference/spl/splfileobject/fgetcsv.xml
index d5c72c3725..42ba04d3f8 100644
--- a/reference/spl/splfileobject/fgetcsv.xml
+++ b/reference/spl/splfileobject/fgetcsv.xml
@@ -35,7 +35,7 @@
      <term><parameter>delimiter</parameter></term>
      <listitem>
       <para>
-       The field delimiter (one character only). Defaults as a comma or the value set using <methodname>SplFileObject::setCsvControl</methodname>.
+       The field delimiter (one single-byte character only). Defaults as a comma or the value set using <methodname>SplFileObject::setCsvControl</methodname>.
       </para>
      </listitem>
     </varlistentry>
@@ -43,7 +43,7 @@
      <term><parameter>enclosure</parameter></term>
      <listitem>
       <para>
-       The field enclosure character (one character only). Defaults as a double quotation mark or the value set using <methodname>SplFileObject::setCsvControl</methodname>.
+       The field enclosure character (one single-byte character only). Defaults as a double quotation mark or the value set using <methodname>SplFileObject::setCsvControl</methodname>.
       </para>
      </listitem>
     </varlistentry>
@@ -51,7 +51,7 @@
      <term><parameter>escape</parameter></term>
      <listitem>
       <para>
-       The escape character (at most one character). Defaults as a backslash (<literal>\</literal>) or the value set using <methodname>SplFileObject::setCsvControl</methodname>.
+       The escape character (at most one single-byte character). Defaults as a backslash (<literal>\</literal>) or the value set using <methodname>SplFileObject::setCsvControl</methodname>.
        An empty string (<literal>""</literal>) disables the proprietary escape mechanism.
       </para>
       <note>
diff --git a/reference/spl/splfileobject/fputcsv.xml b/reference/spl/splfileobject/fputcsv.xml
index 8d4ee58c75..b0332033b7 100644
--- a/reference/spl/splfileobject/fputcsv.xml
+++ b/reference/spl/splfileobject/fputcsv.xml
@@ -37,7 +37,7 @@
     <listitem>
      <para>
       The optional <parameter>delimiter</parameter> parameter sets the field
-      delimiter (one character only).
+      delimiter (one single-byte character only).
      </para>
     </listitem>
    </varlistentry>
@@ -46,7 +46,7 @@
     <listitem>
      <para>
       The optional <parameter>enclosure</parameter> parameter sets the field
-       enclosure (one character only).
+       enclosure (one single-byte character only).
      </para>
     </listitem>
    </varlistentry>
@@ -55,7 +55,7 @@
     <listitem>
      <para>
       The optional <parameter>escape</parameter> parameter sets the
-      escape character (at most one character).
+      escape character (at most one single-byte character).
       An empty string (<literal>""</literal>) disables the proprietary escape mechanism.
      </para>
     </listitem>
@@ -110,12 +110,6 @@
         string to disable the proprietary escape mechanism.
        </entry>
       </row>
-      <row>
-       <entry>5.5.21, 5.6.5</entry>
-       <entry>
-        Added the <parameter>escape</parameter> parameter.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/spl/splfileobject/getcsvcontrol.xml b/reference/spl/splfileobject/getcsvcontrol.xml
index 8f0ee327b6..5d58974055 100644
--- a/reference/spl/splfileobject/getcsvcontrol.xml
+++ b/reference/spl/splfileobject/getcsvcontrol.xml
@@ -49,7 +49,7 @@
        </entry>
       </row>
       <row>
-       <entry>5.6.25, 7.0.10</entry>
+       <entry>7.0.10</entry>
        <entry>
         Added the escape character to the returned array.
        </entry>
diff --git a/reference/spl/splfileobject/setcsvcontrol.xml b/reference/spl/splfileobject/setcsvcontrol.xml
index 46010a9c72..6b7332a3da 100644
--- a/reference/spl/splfileobject/setcsvcontrol.xml
+++ b/reference/spl/splfileobject/setcsvcontrol.xml
@@ -28,7 +28,7 @@
      <term><parameter>delimiter</parameter></term>
      <listitem>
       <para>
-       The field delimiter (one character only).
+       The field delimiter (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -36,7 +36,7 @@
      <term><parameter>enclosure</parameter></term>
      <listitem>
       <para>
-       The field enclosure character (one character only).
+       The field enclosure character (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -44,7 +44,7 @@
      <term><parameter>escape</parameter></term>
      <listitem>
       <para>
-       The field escape character (at most one character).
+       The field escape character (at most one single-byte character).
        An empty string (<literal>""</literal>) disables the proprietary escape mechanism.
       </para>
      </listitem>
diff --git a/reference/spl/versions.xml b/reference/spl/versions.xml
index abe8299d71..32d7b82e81 100644
--- a/reference/spl/versions.xml
+++ b/reference/spl/versions.xml
@@ -5,1023 +5,1023 @@
 -->
 <versions>
  <!-- Functions -->
- <function name="class_parents" from="PHP 5, PHP 7"/>
- <function name="class_implements" from="PHP 5, PHP 7"/>
- <function name="class_uses" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="iterator_to_array" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iterator_count" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iterator_apply" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_autoload" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_autoload_call" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_autoload_extensions" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_autoload_functions" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_autoload_register" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_autoload_unregister" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="spl_classes" from="PHP 5, PHP 7"/>
- <function name="spl_object_hash" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="spl_object_id" from="PHP 7 &gt;= 7.2.0"/>
+ <function name="class_parents" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="class_implements" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="class_uses" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="iterator_to_array" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iterator_count" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iterator_apply" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_autoload" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_autoload_call" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_autoload_extensions" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_autoload_functions" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_autoload_register" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_autoload_unregister" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="spl_classes" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="spl_object_hash" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="spl_object_id" from="PHP 7 &gt;= 7.2.0, PHP 8"/>
 
  <!-- Methods -->
- <function name="logicexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="logicexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="logicexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="logicexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="badfunctioncallexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badfunctioncallexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="badfunctioncallexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badfunctioncallexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="badmethodcallexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="badmethodcallexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="badmethodcallexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="badmethodcallexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="domainexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="domainexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="domainexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="domainexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="invalidargumentexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="invalidargumentexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="invalidargumentexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="invalidargumentexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="lengthexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="lengthexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="lengthexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="lengthexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="outofrangeexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofrangeexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="outofrangeexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofrangeexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="runtimeexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="runtimeexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="runtimeexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="runtimeexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="outofboundsexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outofboundsexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="outofboundsexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outofboundsexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="overflowexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="overflowexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="overflowexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="overflowexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="rangeexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="rangeexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="rangeexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="rangeexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="underflowexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="underflowexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="underflowexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="underflowexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="unexpectedvalueexception" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="unexpectedvalueexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="unexpectedvalueexception" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::__clone" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::getmessage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::getcode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::getfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::getline" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::gettrace" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::getprevious" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::gettraceasstring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="unexpectedvalueexception::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="recursiveiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="recursiveiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="recursiveiteratoriterator" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::__construct" from="PHP 5 &gt;= 5.1.3, PHP 7"/>
- <function name="recursiveiteratoriterator::beginchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::beginiteration" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::callgetchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::callhaschildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::current" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::endchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::enditeration" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::getdepth" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::getmaxdepth" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::getsubiterator" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::key" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::next" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::nextelement" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::rewind" from="PHP 5, PHP 7"/>
- <function name="recursiveiteratoriterator::setmaxdepth" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursiveiteratoriterator::valid" from="PHP 5, PHP 7"/>
+ <function name="recursiveiteratoriterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::__construct" from="PHP 5 &gt;= 5.1.3, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::beginchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::beginiteration" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::callgetchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::callhaschildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::current" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::endchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::enditeration" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::getdepth" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::getmaxdepth" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::getsubiterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::key" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::next" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::nextelement" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::rewind" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::setmaxdepth" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursiveiteratoriterator::valid" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="outeriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outeriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outeriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outeriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outeriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outeriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="outeriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="outeriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outeriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outeriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outeriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outeriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outeriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="outeriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="iteratoriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="iteratoriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="iteratoriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="iteratoriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="filteriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="filteriterator::accept" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="filteriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="filteriterator::accept" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="recursivefilteriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivefilteriterator::accept" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="recursivefilteriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivefilteriterator::accept" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="parentiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::accept" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="parentiterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="parentiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::accept" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="parentiterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="countable" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="countable::count" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="countable" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="countable::count" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="seekableiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="seekableiterator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="seekableiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="seekableiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="seekableiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="seekableiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="seekableiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="seekableiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="seekableiterator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="seekableiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="seekableiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="seekableiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="seekableiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="seekableiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="limititerator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::getposition" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="limititerator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="limititerator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::getposition" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="limititerator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="cachingiterator" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::__construct" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::__tostring" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::count" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="cachingiterator::current" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::getcache" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::getflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::getinneriterator" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::hasnext" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::key" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::next" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::offsetexists" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::offsetget" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::offsetset" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::offsetunset" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::rewind" from="PHP 5, PHP 7"/>
- <function name="cachingiterator::setflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="cachingiterator::valid" from="PHP 5, PHP 7"/>
+ <function name="cachingiterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::count" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="cachingiterator::current" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::getcache" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::getflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::getinneriterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::hasnext" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::key" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::next" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::offsetexists" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::offsetget" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::offsetset" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::offsetunset" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::rewind" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="cachingiterator::setflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="cachingiterator::valid" from="PHP 5, PHP 7, PHP 8"/>
 
  <function name="cachingrecursiveiterator" from="PHP 5 &lt; 5.1.0"/>
  <function name="cachingrecursiveiterator::getchildren" from="PHP 5 &lt; 5.1.0"/>
  <function name="cachingrecursiveiterator::haschildren" from="PHP 5 &lt; 5.1.0"/>
 
- <function name="recursivecachingiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::hasnext" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::offsetget" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::offsetset" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::offsetunset" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::offsetexists" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::getcache" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivecachingiterator::count" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="recursivecachingiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::hasnext" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::offsetget" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::offsetset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::offsetunset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::offsetexists" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::getcache" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivecachingiterator::count" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="norewinditerator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="norewinditerator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="norewinditerator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="norewinditerator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="appenditerator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::append" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="appenditerator::getiteratorindex" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="appenditerator::getarrayiterator" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
+ <function name="appenditerator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::append" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::getiteratorindex" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="appenditerator::getarrayiterator" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
 
- <function name="infiniteiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="infiniteiterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="infiniteiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="infiniteiterator::getinneriterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="regexiterator" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::__construct" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::accept" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::getmode" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::setmode" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::getflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::setflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::getpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::setpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::rewind" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::valid" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::key" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::current" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::next" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::getinneriterator" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="regexiterator::getregex" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="regexiterator" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::__construct" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::accept" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::getmode" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::setmode" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::getflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::setflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::getpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::setpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::rewind" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::valid" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::key" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::current" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::next" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::getinneriterator" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="regexiterator::getregex" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
- <function name="recursiveregexiterator" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::__construct" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::haschildren" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::getchildren" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::accept" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::getmode" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::setmode" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::getflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::setflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::getpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::setpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::rewind" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::valid" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::key" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::current" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::next" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursiveregexiterator::getinneriterator" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
+ <function name="recursiveregexiterator" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::__construct" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::haschildren" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::getchildren" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::accept" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::getmode" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::setmode" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::getflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::setflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::getpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::setpregflags" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::rewind" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::valid" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::key" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::current" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::next" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursiveregexiterator::getinneriterator" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
 
- <function name="emptyiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="emptyiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="emptyiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="emptyiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="emptyiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="emptyiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="emptyiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="emptyiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="emptyiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="emptyiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="emptyiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="emptyiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="recursivetreeiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::beginiteration" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::enditeration" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::callhaschildren" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::callgetchildren" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::beginchildren" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::endchildren" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::nextelement" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::getprefix" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::setprefixpart" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::getentry" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::getpostfix" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::setpostfix" from="PHP 5 &gt;= 5.5.3, PHP 7"/>
- <function name="recursivetreeiterator::getdepth" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::getsubiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::getinneriterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::setmaxdepth" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivetreeiterator::getmaxdepth" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="recursivetreeiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::beginiteration" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::enditeration" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::callhaschildren" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::callgetchildren" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::beginchildren" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::endchildren" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::nextelement" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getprefix" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::setprefixpart" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getentry" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getpostfix" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::setpostfix" from="PHP 5 &gt;= 5.5.3, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getdepth" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getsubiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getinneriterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::setmaxdepth" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivetreeiterator::getmaxdepth" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="arrayobject" from="PHP 5, PHP 7"/>
- <function name="arrayobject::__construct" from="PHP 5, PHP 7"/>
- <function name="arrayobject::offsetexists" from="PHP 5, PHP 7"/>
- <function name="arrayobject::offsetget" from="PHP 5, PHP 7"/>
- <function name="arrayobject::offsetset" from="PHP 5, PHP 7"/>
- <function name="arrayobject::offsetunset" from="PHP 5, PHP 7"/>
- <function name="arrayobject::append" from="PHP 5, PHP 7"/>
- <function name="arrayobject::getarraycopy" from="PHP 5, PHP 7"/>
- <function name="arrayobject::count" from="PHP 5, PHP 7"/>
- <function name="arrayobject::getiterator" from="PHP 5, PHP 7"/>
- <function name="arrayobject::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayobject::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayobject::exchangearray" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayobject::setiteratorclass" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayobject::getiteratorclass" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayobject::asort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayobject::ksort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayobject::uasort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayobject::uksort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayobject::natsort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayobject::natcasesort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayobject::unserialize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="arrayobject::serialize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="arrayobject" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::offsetexists" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::offsetget" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::offsetset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::offsetunset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::append" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::getarraycopy" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::count" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::getiterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayobject::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::exchangearray" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::setiteratorclass" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::getiteratorclass" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::asort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::ksort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::uasort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::uksort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::natsort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::natcasesort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::unserialize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="arrayobject::serialize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="arrayiterator" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::__construct" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::offsetexists" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::offsetget" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::offsetset" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::offsetunset" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::append" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::getarraycopy" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::count" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::rewind" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::current" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::key" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::next" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::valid" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::seek" from="PHP 5, PHP 7"/>
- <function name="arrayiterator::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayiterator::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="arrayiterator::asort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayiterator::ksort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayiterator::uasort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayiterator::uksort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayiterator::natsort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayiterator::natcasesort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="arrayiterator::unserialize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="arrayiterator::serialize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="arrayiterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::offsetexists" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::offsetget" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::offsetset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::offsetunset" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::append" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::getarraycopy" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::count" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::rewind" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::current" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::key" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::next" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::valid" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::seek" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="arrayiterator::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::asort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::ksort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::uasort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::uksort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::natsort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::natcasesort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::unserialize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="arrayiterator::serialize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="recursivearrayiterator" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::offsetexists" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::offsetget" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::offsetset" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::offsetunset" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::append" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::getarraycopy" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::count" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivearrayiterator::asort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursivearrayiterator::ksort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursivearrayiterator::uasort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursivearrayiterator::uksort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursivearrayiterator::natsort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursivearrayiterator::natcasesort" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="recursivearrayiterator::unserialize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivearrayiterator::serialize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="recursivearrayiterator" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::haschildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::offsetexists" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::offsetget" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::offsetset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::offsetunset" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::append" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::getarraycopy" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::count" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::asort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::ksort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::uasort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::uksort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::natsort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::natcasesort" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::unserialize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivearrayiterator::serialize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::__construct" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::__tostring" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getatime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getbasename" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="splfileinfo::getctime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getextension" from="PHP 5 &gt;= 5.3.6, PHP 7"/>
- <function name="splfileinfo::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getfilename" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getgroup" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getinode" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getlinktarget" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="splfileinfo::getmtime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getowner" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getpath" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getpathname" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getperms" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::getrealpath" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="splfileinfo::getsize" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::gettype" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::isdir" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::isexecutable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::isfile" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::islink" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::isreadable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::iswritable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::openfile" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileinfo::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
+ <function name="splfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::__construct" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::__tostring" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getatime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getbasename" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getctime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getextension" from="PHP 5 &gt;= 5.3.6, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getfilename" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getgroup" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getinode" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getlinktarget" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getmtime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getowner" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getpath" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getpathname" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getperms" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getrealpath" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::getsize" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::gettype" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::isdir" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::isexecutable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::isfile" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::islink" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::isreadable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::iswritable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::openfile" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileinfo::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
 
- <function name="directoryiterator" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::__construct" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::__tostring" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::current" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getatime" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getbasename" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="directoryiterator::getctime" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getextension" from="PHP 5 &gt;= 5.3.6, PHP 7"/>
- <function name="directoryiterator::getfilename" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getgroup" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getinode" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getmtime" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getowner" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getpath" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getpathname" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getperms" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getsize" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::gettype" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::getlinktarget" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="directoryiterator::getrealpath" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="directoryiterator::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="directoryiterator::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="directoryiterator::isdir" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::isdot" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::isexecutable" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::isfile" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::islink" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::isreadable" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::iswritable" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::key" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::next" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::openfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="directoryiterator::rewind" from="PHP 5, PHP 7"/>
- <function name="directoryiterator::seek" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="directoryiterator::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="directoryiterator::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="directoryiterator::valid" from="PHP 5, PHP 7"/>
+ <function name="directoryiterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::__construct" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::__tostring" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::current" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getatime" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getbasename" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getctime" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getextension" from="PHP 5 &gt;= 5.3.6, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getfilename" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getgroup" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getinode" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getmtime" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getowner" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getpath" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getpathname" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getperms" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getsize" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::gettype" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getlinktarget" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getrealpath" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::isdir" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::isdot" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::isexecutable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::isfile" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::islink" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::isreadable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::iswritable" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::key" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::next" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::openfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="directoryiterator::rewind" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="directoryiterator::seek" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="directoryiterator::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="directoryiterator::valid" from="PHP 5, PHP 7, PHP 8"/>
 
- <function name="filesystemiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getfilename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getbasename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::isdot" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::seek" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::__tostring" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getpath" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getpathname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getperms" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getinode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getsize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getowner" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getgroup" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getatime" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getmtime" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getctime" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::gettype" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::iswritable" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::isreadable" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::isexecutable" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::isfile" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::isdir" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::islink" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getlinktarget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getrealpath" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getfileinfo" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::getpathinfo" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::openfile" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::setfileclass" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="filesystemiterator::setinfoclass" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="filesystemiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getfilename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getbasename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::isdot" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::seek" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::__tostring" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getpath" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getpathname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getperms" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getinode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getsize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getowner" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getgroup" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getatime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getmtime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getctime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::gettype" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::iswritable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::isreadable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::isexecutable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::isfile" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::isdir" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::islink" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getlinktarget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getrealpath" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getfileinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::getpathinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::openfile" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::setfileclass" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="filesystemiterator::setinfoclass" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
 
- <function name="recursivedirectoryiterator" from="PHP 5, PHP 7"/>
- <function name="recursivedirectoryiterator::__construct" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="recursivedirectoryiterator::__tostring" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="recursivedirectoryiterator::haschildren" from="PHP 5, PHP 7"/>PHP 5 &gt;= 5.1.0
- <function name="recursivedirectoryiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getsubpath" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getsubpathname" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::rewind" from="PHP 5, PHP 7"/>
- <function name="recursivedirectoryiterator::key" from="PHP 5, PHP 7"/>
- <function name="recursivedirectoryiterator::next" from="PHP 5, PHP 7"/>
- <function name="recursivedirectoryiterator::current" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="recursivedirectoryiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivedirectoryiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getsubpath" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="recursivedirectoryiterator" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::__construct" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::__tostring" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::haschildren" from="PHP 5, PHP 7, PHP 8"/>PHP 5 &gt;= 5.1.0
+ <function name="recursivedirectoryiterator::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getsubpath" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getsubpathname" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::rewind" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::key" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::next" from="PHP 5, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::current" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getsubpath" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
  <function name="recursivedirectoryiterator::getsubpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="recursivedirectoryiterator::getsubpathname" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getfilename" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getbasename" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::isdot" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getpath" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getpathname" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getperms" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getinode" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getsize" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getowner" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getgroup" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getatime" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getmtime" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getctime" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::gettype" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::iswritable" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::isreadable" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::isexecutable" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::isfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::isdir" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::islink" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::getlinktarget" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="recursivedirectoryiterator::getrealpath" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="recursivedirectoryiterator::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="recursivedirectoryiterator::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="recursivedirectoryiterator::openfile" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::setfileclass" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="recursivedirectoryiterator::setinfoclass" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="recursivedirectoryiterator::getsubpathname" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getfilename" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getbasename" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::isdot" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::seek" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getpath" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getpathname" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getperms" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getinode" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getsize" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getowner" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getgroup" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getatime" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getmtime" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getctime" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::gettype" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::iswritable" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::isreadable" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::isexecutable" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::isfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::isdir" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::islink" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getlinktarget" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getrealpath" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::openfile" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::setfileclass" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="recursivedirectoryiterator::setinfoclass" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="globiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::__tostring" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getfilename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getbasename" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::isdot" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::seek" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getpath" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getpathname" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getperms" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getinode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getsize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getowner" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getgroup" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getatime" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getmtime" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getctime" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::gettype" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::iswritable" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::isreadable" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::isexecutable" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::isfile" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::isdir" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::islink" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getlinktarget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getrealpath" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getfileinfo" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::getpathinfo" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::openfile" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::setfileclass" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="globiterator::setinfoclass" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="globiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::__tostring" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getfilename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getbasename" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::isdot" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::seek" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getpath" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getpathname" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getperms" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getinode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getsize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getowner" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getgroup" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getatime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getmtime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getctime" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::gettype" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::iswritable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::isreadable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::isexecutable" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::isfile" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::isdir" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::islink" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getlinktarget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getrealpath" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getfileinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::getpathinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::openfile" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::setfileclass" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="globiterator::setinfoclass" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splfileobject" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::eof" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fflush" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fgetc" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fgetcsv" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fgets" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="splfileobject" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::__construct" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::__tostring" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::eof" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fflush" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fgetc" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fgetcsv" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fgets" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
  <function name="splfileobject::fgetss" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::flock" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fpassthru" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fputcsv" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="splfileobject::fread" from="PHP 5 &gt;= 5.5.11, PHP 7"/>
- <function name="splfileobject::fscanf" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fseek" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fstat" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::ftell" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::ftruncate" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::fwrite" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::getcsvcontrol" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="splfileobject::getfilename" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::getmaxlinelen" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::getcurrentline" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getpath" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getfilename" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getbasename" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getpathname" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getperms" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getinode" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getsize" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getowner" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getgroup" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getatime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getmtime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getctime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::gettype" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getlinktarget" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getrealpath" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::haschildren" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::iswritable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::isreadable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::isexecutable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::isfile" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::isdir" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::islink" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::openfile" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::seek" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::setcsvcontrol" from="PHP 5 &gt;= 5.2.0, PHP 7"/>
- <function name="splfileobject::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="splfileobject::setmaxlinelen" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splfileobject::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="splfileobject::flock" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fpassthru" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fputcsv" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fread" from="PHP 5 &gt;= 5.5.11, PHP 7, PHP 8"/>
+ <function name="splfileobject::fscanf" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fseek" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fstat" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::ftell" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::ftruncate" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::fwrite" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::getchildren" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::getcsvcontrol" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::getfilename" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::getflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::getmaxlinelen" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::getcurrentline" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getpath" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getfilename" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getbasename" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getpathname" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getperms" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getinode" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getsize" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getowner" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getgroup" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getatime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getmtime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getctime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::gettype" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getlinktarget" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getrealpath" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::haschildren" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::iswritable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::isreadable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::isexecutable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::isfile" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::isdir" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::islink" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::openfile" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::seek" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::setcsvcontrol" from="PHP 5 &gt;= 5.2.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::setflags" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="splfileobject::setmaxlinelen" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splfileobject::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="spltempfileobject" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::__construct" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::rewind" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::eof" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::valid" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fgets" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fgetcsv" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::setcsvcontrol" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getcsvcontrol" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::flock" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fflush" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::ftell" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fseek" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fgetc" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fpassthru" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
+ <function name="spltempfileobject" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::__construct" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::rewind" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::eof" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::valid" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fgets" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fgetcsv" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::setcsvcontrol" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getcsvcontrol" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::flock" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fflush" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::ftell" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fseek" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fgetc" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fpassthru" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
  <function name="spltempfileobject::fgetss" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fscanf" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fwrite" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::fstat" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::ftruncate" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::current" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::key" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::next" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::setflags" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getflags" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::setmaxlinelen" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getmaxlinelen" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::haschildren" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getchildren" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::seek" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getcurrentline" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::__tostring" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getpath" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getfilename" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getbasename" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getpathname" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getperms" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getinode" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getsize" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getowner" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getgroup" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getatime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getmtime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getctime" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::gettype" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::iswritable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::isreadable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::isexecutable" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::isfile" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::isdir" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::islink" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getlinktarget" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getrealpath" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::openfile" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
- <function name="spltempfileobject::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7"/>
+ <function name="spltempfileobject::fscanf" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fwrite" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::fstat" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::ftruncate" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::current" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::key" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::next" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::setflags" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getflags" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::setmaxlinelen" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getmaxlinelen" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::haschildren" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getchildren" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::seek" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getcurrentline" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::__tostring" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getpath" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getfilename" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getbasename" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getpathname" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getperms" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getinode" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getsize" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getowner" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getgroup" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getatime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getmtime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getctime" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::gettype" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::iswritable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::isreadable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::isexecutable" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::isfile" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::isdir" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::islink" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getlinktarget" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getrealpath" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getfileinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::getpathinfo" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::openfile" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::setfileclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
+ <function name="spltempfileobject::setinfoclass" from="PHP 5 &gt;= 5.1.2, PHP 7, PHP 8"/>
 
- <function name="spldoublylinkedlist" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="spldoublylinkedlist" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="spldoublylinkedlist::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::pop" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::add" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="spldoublylinkedlist::shift" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::push" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::unshift" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::bottom" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::setiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::getiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::prev" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="spldoublylinkedlist::serialize" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="spldoublylinkedlist::unserialize" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="spldoublylinkedlist::pop" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::add" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::shift" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::push" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::unshift" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::bottom" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::setiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::getiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::prev" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::serialize" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="spldoublylinkedlist::unserialize" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
- <function name="splqueue" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splqueue" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="splqueue::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::add" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="splqueue::enqueue" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::dequeue" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::pop" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::shift" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::push" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::unshift" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::bottom" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::setiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::getiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splqueue::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splqueue::add" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="splqueue::enqueue" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::dequeue" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::pop" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::shift" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::push" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::unshift" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::bottom" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::setiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::getiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splqueue::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splstack" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splstack" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="splstack::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::add" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="splstack::pop" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::shift" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::push" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::unshift" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::bottom" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::setiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::getiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splstack::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splstack::add" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="splstack::pop" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::shift" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::push" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::unshift" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::bottom" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::setiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::getiteratormode" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splstack::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splheap" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splheap" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="splheap::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::extract" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::insert" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::iscorrupted" from="PHP 7"/>
- <function name="splheap::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splheap::compare" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splheap::extract" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::insert" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::iscorrupted" from="PHP 7, PHP 8"/>
+ <function name="splheap::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splheap::compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splminheap" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::compare" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::extract" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::insert" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splminheap::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splminheap" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::extract" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::insert" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splminheap::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splmaxheap" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::compare" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::extract" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::insert" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splmaxheap::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splmaxheap" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::extract" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::insert" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splmaxheap::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splpriorityqueue" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splpriorityqueue" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="splpriorityqueue::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::compare" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::insert" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::getextractflags" from="PHP 7"/>
- <function name="splpriorityqueue::setextractflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::top" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::extract" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::iscorrupted" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splpriorityqueue::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splpriorityqueue::compare" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::insert" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::getextractflags" from="PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::setextractflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::top" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::extract" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::iscorrupted" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::isempty" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splpriorityqueue::recoverfromcorruption" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="splfixedarray" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::__wakeup" from="PHP 5 &gt;= 5.5.0, PHP 7"/>
- <function name="splfixedarray::count" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::toarray" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::fromarray" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::getsize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::setsize" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splfixedarray::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="splfixedarray" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::__wakeup" from="PHP 5 &gt;= 5.5.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::count" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::toarray" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::fromarray" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::getsize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::setsize" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splfixedarray::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
  <function name="splfixedarray::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
  <function name="splfixedarray::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
  <function name="splfixedarray::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
  <function name="splfixedarray::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
  <function name="splfixedarray::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
 
- <function name="splobserver" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobserver::update" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="splobserver" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobserver::update" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="splsubject" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splsubject::attach" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splsubject::detach" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splsubject::notify" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="splsubject" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splsubject::attach" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splsubject::detach" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splsubject::notify" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="splobjectstorage" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::addall" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::attach" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::contains" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::count" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::current" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::detach" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::gethash" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="splobjectstorage::getinfo" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::key" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::next" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::removeall" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::removeallexcept" from="PHP 5 &gt;= 5.3.6, PHP 7"/>
- <function name="splobjectstorage::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
- <function name="splobjectstorage::serialize" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="splobjectstorage::setinfo" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="splobjectstorage::unserialize" from="PHP 5 &gt;= 5.2.2, PHP 7"/>
- <function name="splobjectstorage::valid" from="PHP 5 &gt;= 5.1.0, PHP 7"/>
+ <function name="splobjectstorage" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::addall" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::attach" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::contains" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::count" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::current" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::detach" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::gethash" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::getinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::key" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::next" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::offsetexists" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::offsetget" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::offsetset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::offsetunset" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::removeall" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::removeallexcept" from="PHP 5 &gt;= 5.3.6, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::rewind" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::serialize" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::setinfo" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::unserialize" from="PHP 5 &gt;= 5.2.2, PHP 7, PHP 8"/>
+ <function name="splobjectstorage::valid" from="PHP 5 &gt;= 5.1.0, PHP 7, PHP 8"/>
 
- <function name="multipleiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::attachiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::detachiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::containsiterator" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::countiterators" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
- <function name="multipleiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7"/>
+ <function name="multipleiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::__construct" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::getflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::setflags" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::attachiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::detachiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::containsiterator" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::countiterators" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::rewind" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::valid" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::key" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::current" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
+ <function name="multipleiterator::next" from="PHP 5 &gt;= 5.3.0, PHP 7, PHP 8"/>
 
- <function name="callbackfilteriterator" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="callbackfilteriterator::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="callbackfilteriterator::accept" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="callbackfilteriterator" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="callbackfilteriterator::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="callbackfilteriterator::accept" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
- <function name="recursivecallbackfilteriterator" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="recursivecallbackfilteriterator::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="recursivecallbackfilteriterator::getchildren" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
- <function name="recursivecallbackfilteriterator::haschildren" from="PHP 5 &gt;= 5.4.0, PHP 7"/>
+ <function name="recursivecallbackfilteriterator" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="recursivecallbackfilteriterator::__construct" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="recursivecallbackfilteriterator::getchildren" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
+ <function name="recursivecallbackfilteriterator::haschildren" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
 
 </versions>
 <!-- Keep this comment at the end of the file
diff --git a/reference/sqlite3/configure.xml b/reference/sqlite3/configure.xml
index ea98c698cd..41a9441f44 100644
--- a/reference/sqlite3/configure.xml
+++ b/reference/sqlite3/configure.xml
@@ -4,14 +4,14 @@
 <section xml:id="sqlite3.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  The SQLite3 extension is enabled by default as of PHP 5.3.0. It's
+  The SQLite3 extension is enabled by default. It's
   possible to disable it by using <literal>--without-sqlite3</literal>
   at compile time.
  </para>
  <para>
   Windows users must enable <filename>php_sqlite3.dll</filename>
   in order to use this extension. This <acronym>DLL</acronym> is
-  included with Windows distributions of PHP as of PHP 5.3.0.
+  included with Windows distributions of PHP.
  </para>
  <note>
   <title>Additional setup on Windows as of PHP 7.4.0</title>
@@ -19,12 +19,6 @@
    &ext.windows.path.dll; <filename>libsqlite3.dll</filename>.
   </para>
  </note>
- <note>
-  <para>
-   This extension was briefly a <acronym>PECL</acronym> extension
-   but that version is only recommended for experimental use.
-  </para>
- </note>
 </section>
 
 
diff --git a/reference/sqlite3/ini.xml b/reference/sqlite3/ini.xml
index 876b02b071..fbe3564f73 100644
--- a/reference/sqlite3/ini.xml
+++ b/reference/sqlite3/ini.xml
@@ -21,7 +21,7 @@
       <entry><link linkend="ini.sqlite3.extension-dir">sqlite3.extension_dir</link></entry>
       <entry>""</entry>
       <entry>PHP_INI_SYSTEM</entry>
-      <entry>Available as of PHP 5.3.11.</entry>
+      <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.sqlite3.defensive">sqlite3.defensive</link></entry>
diff --git a/reference/sqlite3/sqlite3/backup.xml b/reference/sqlite3/sqlite3/backup.xml
index 84bcebfeaa..fa61ca23fa 100644
--- a/reference/sqlite3/sqlite3/backup.xml
+++ b/reference/sqlite3/sqlite3/backup.xml
@@ -20,6 +20,12 @@
    It is useful either for creating backups of databases
    or for copying in-memory databases to or from persistent files.
   </para>
+  <tip>
+   <para>
+    As of SQLite 3.27.0 (2019-02-07), it is also possible to use the statement
+    <literal>VACUUM INTO 'file.db';</literal> to backup the database to a new file.
+   </para>
+  </tip>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/sqlite3/sqlite3/lastinsertrowid.xml b/reference/sqlite3/sqlite3/lastinsertrowid.xml
index 31354ae446..c83816293c 100644
--- a/reference/sqlite3/sqlite3/lastinsertrowid.xml
+++ b/reference/sqlite3/sqlite3/lastinsertrowid.xml
@@ -26,7 +26,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the row ID of the most recent INSERT into the database
+   Returns the row ID of the most recent INSERT into the database.
+   If no successful INSERTs into rowid tables have ever occurred on this database connection,
+   then <methodname>SQLite3::lastInsertRowID</methodname> returns <literal>0</literal>.
   </para>
  </refsect1>
 
diff --git a/reference/sqlite3/sqlite3/setauthorizer.xml b/reference/sqlite3/sqlite3/setauthorizer.xml
index 1c6f59449a..769861f021 100644
--- a/reference/sqlite3/sqlite3/setauthorizer.xml
+++ b/reference/sqlite3/sqlite3/setauthorizer.xml
@@ -82,11 +82,11 @@
    </table>
   </para>
   <para>
-   The 5th parameter will be the name of the database (<literal>"main"</literal>,
+   The 4th parameter will be the name of the database (<literal>"main"</literal>,
    <literal>"temp"</literal>, etc.) if applicable.
   </para>
   <para>
-   The 6th parameter to the authorizer callback is the name of the inner-most trigger or
+   The 5th parameter to the authorizer callback is the name of the inner-most trigger or
    view that is responsible for the access attempt or &null; if this access attempt is
    directly from top-level SQL code.
   </para>
@@ -98,7 +98,7 @@
   </para>
   <para>
    If the action code is <constant>SQLite3::READ</constant> and the callback returns
-   <constant>SQLite3::IGNORE</constant> then the prepared statement statement is
+   <constant>SQLite3::IGNORE</constant> then the prepared statement is
    constructed to substitute a &null; value in place of the table column that would have
    been read if <constant>SQLite3::OK</constant> had been returned. The
    <constant>SQLite3::IGNORE</constant> return can be used to deny an untrusted user
diff --git a/reference/sqlsrv/book.xml b/reference/sqlsrv/book.xml
index 6f1c155d54..26b26aa84e 100644
--- a/reference/sqlsrv/book.xml
+++ b/reference/sqlsrv/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.sqlsrv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Microsoft SQL Server Driver for PHP</title>
  <titleabbrev>SQLSRV</titleabbrev>
  
diff --git a/reference/sqlsrv/configure.xml b/reference/sqlsrv/configure.xml
index ecc92ad4bd..61c5e0bfd3 100644
--- a/reference/sqlsrv/configure.xml
+++ b/reference/sqlsrv/configure.xml
@@ -5,25 +5,18 @@
  <para>
   The SQLSRV extension is enabled by adding appropriate DLL file to your PHP 
   extension directory and the corresponding entry to the &php.ini; file. The SQLSRV 
-  download comes 8 driver files, four of which are for PDO support. If you are 
-  running non-thread-safe PHP (PHP 5.3), use the php_sqlsrv_53_nts.dll file. 
-  (You should use a non-thread-safe version if you are using IIS as your web 
-  server). If you are running thread-safe PHP, use the php_sqlsrv_53_ts.dll file. 
-  Similarly for PHP 5.4, use the php_sqlsrv_54_nts.dll or php_sqlsrv_54_ts.dll 
-  depending on whether your PHP installation is non-thread-safe or thread-safe. 
+  download comes with 8 driver files, four of which are for PDO support. 
  </para>
  <para>
   The most recent version of the driver is available for download here:
-  <link xlink:href="&url.sqlsrv;">SQLSRV 4.0 download</link>. If you need support 
-  for PHP 5.2 and/or PHP compiled with VC6, use the 2.0 release of the driver: 
-  <link xlink:href="&url.sqlsrv.v2driverdownload;">SQLSRV 2.0 download</link>.
+  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>.
  </para>
  <para>
   For more information about SQLSRV requirements, see 
   <link xlink:href="&url.sqlsrv.system.requirements;">SQLSRV System Requirements</link>.
  </para>
  <para>
-  The SQLSRV extension is only compatible with PHP 5 running on Windows. Since version 4.0 the SQLSRV extension is compatilbe only with PHP 7.0 running on Linux or Windows.
+  Since version 4.0 the SQLSRV extension is compatible only with PHP 7.0 running on Linux or Windows.
  </para>
 </section>
 
@@ -46,4 +39,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/sqlsrv/setup.xml b/reference/sqlsrv/setup.xml
index 4c14828f8b..e5a57aaa08 100644
--- a/reference/sqlsrv/setup.xml
+++ b/reference/sqlsrv/setup.xml
@@ -27,18 +27,11 @@
    </simplelist>
   </para>
   <para>
-   The SQLSRV download comes 8 driver files, four of which are for PDO support. 
-   If you are running non-thread-safe PHP (PHP 5.3), use the php_sqlsrv_53_nts.dll 
-   file. (You should use a non-thread-safe version if you are using IIS as your 
-   web server). If you are running thread-safe PHP, use the php_sqlsrv_53_ts.dll 
-   file. Similarly for PHP 5.4, use the php_sqlsrv_54_nts.dll or php_sqlsrv_54_ts.dll
-   depending on whether your PHP installation is non-thread-safe or thread-safe.
+   The SQLSRV download comes 8 driver files, four of which are for PDO support.
   </para>
   <para>
   The most recent version of the driver is available for download here:
-  <link xlink:href="&url.sqlsrv;">SQLSRV 4.0 download</link>. If you need support 
-  for PHP 5.2 and/or PHP compiled with VC6, use the 2.0 release of the driver: 
-  <link xlink:href="&url.sqlsrv.v2driverdownload;">SQLSRV 2.0 download</link>.
+  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>.
   </para>
    <para>
    For more information about SQLSRV requirements, see 
diff --git a/reference/ssdeep/book.xml b/reference/ssdeep/book.xml
index aa4223a891..86beb5e893 100644
--- a/reference/ssdeep/book.xml
+++ b/reference/ssdeep/book.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <book xml:id="book.ssdeep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>ssdeep Fuzzy Hashing</title>
  <titleabbrev>ssdeep</titleabbrev>
 
@@ -29,7 +28,6 @@
  &reference.ssdeep.reference;
 
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -49,4 +47,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/ssh2/book.xml b/reference/ssh2/book.xml
index f663fd3fff..65ea086f51 100644
--- a/reference/ssh2/book.xml
+++ b/reference/ssh2/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.ssh2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Secure Shell2</title>
  <titleabbrev>SSH2</titleabbrev>
  
diff --git a/reference/ssh2/functions/ssh2-sftp-lstat.xml b/reference/ssh2/functions/ssh2-sftp-lstat.xml
index 58d0c7d029..6e45dd4ce4 100644
--- a/reference/ssh2/functions/ssh2-sftp-lstat.xml
+++ b/reference/ssh2/functions/ssh2-sftp-lstat.xml
@@ -19,7 +19,7 @@
   </para>
   <para>
    This function is similar to using the <function>lstat</function> function
-   with the <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper in PHP 5
+   with the <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper
    and returns the same values.  
   </para>
  </refsect1>
diff --git a/reference/ssh2/functions/ssh2-sftp-stat.xml b/reference/ssh2/functions/ssh2-sftp-stat.xml
index c8777a5cc9..71c0a48281 100644
--- a/reference/ssh2/functions/ssh2-sftp-stat.xml
+++ b/reference/ssh2/functions/ssh2-sftp-stat.xml
@@ -18,7 +18,7 @@
   </para>
   <para>
    This function is similar to using the <function>stat</function> function
-   with the <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper in PHP 5
+   with the <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper
    and returns the same values.
   </para>
  </refsect1>
diff --git a/reference/ssh2/setup.xml b/reference/ssh2/setup.xml
index d400f2451b..ab7e695a0e 100644
--- a/reference/ssh2/setup.xml
+++ b/reference/ssh2/setup.xml
@@ -28,7 +28,7 @@
    will only be available with libssh >= 1.2.9.
   </para>
   <para>
-   Libssh2 comes in two flavours: gcrypt or openssl. Some linux
+   Libssh2 comes in two flavours: gcrypt or openssl. Some Linux
    distributions build libssh2 with the gcrypt library, some use openssl.
    Libssh2 has some issues when compiled with gcrypt, please use openssl.
   </para>
diff --git a/reference/stats/book.xml b/reference/stats/book.xml
deleted file mode 100644
index dc8a7ea134..0000000000
--- a/reference/stats/book.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
- 
-<book xml:id="book.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Statistics</title>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.stats">
-  &reftitle.intro;
-  <para>
-   This is the statistics extension. It contains few dozens of functions
-   useful for statistical computations. It is a wrapper around 2 scientific
-   libraries, namely DCDFLIB (Library of C routines for Cumulative
-   Distributions Functions, Inverses, and Other parameters) by B. Brown &amp;
-   J. Lavato and RANDLIB by Barry Brown, James Lavato &amp; Kathy Russell.
-   Includes CD and PD functions.
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.stats.setup;
- &reference.stats.constants;
- &reference.stats.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/stats/constants.xml b/reference/stats/constants.xml
deleted file mode 100644
index db0033b20f..0000000000
--- a/reference/stats/constants.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="stats.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &no.constants;
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/stats/functions/stats-absolute-deviation.xml b/reference/stats/functions/stats-absolute-deviation.xml
deleted file mode 100644
index e79c08d859..0000000000
--- a/reference/stats/functions/stats-absolute-deviation.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-absolute-deviation" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_absolute_deviation</refname>
-  <refpurpose>Returns the absolute deviation of an array of values</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_absolute_deviation</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the absolute deviation of the values in <parameter>a</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The input array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the absolute deviation of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_absolute_deviation</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-beta.xml b/reference/stats/functions/stats-cdf-beta.xml
deleted file mode 100644
index b20ecf6bff..0000000000
--- a/reference/stats/functions/stats-cdf-beta.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-beta" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_beta</refname>
-  <refpurpose>Calculates any one parameter of the beta distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_beta</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the beta distribution. The kind of the return value and parameters (<parameter>par1</parameter>,
-   <parameter>par2</parameter>, and <parameter>par3</parameter>) are determined by
-   <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, alpha, and beta denotes cumulative distribution function, the value of the random
-   variable, and shape parameters of the beta distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>alpha</entry>
-       <entry>beta</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>alpha</entry>
-       <entry>beta</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>alpha</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>beta</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>beta</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>alpha</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, alpha, or beta, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_beta</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-binomial.xml b/reference/stats/functions/stats-cdf-binomial.xml
deleted file mode 100644
index a9421844a6..0000000000
--- a/reference/stats/functions/stats-cdf-binomial.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-binomial" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_binomial</refname>
-  <refpurpose>Calculates any one parameter of the binomial distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_binomial</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the binomial distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, n, and p denotes cumulative distribution function, the number of successes,
-   the number of trials, and the success rate for each trial, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>n</entry>
-       <entry>p</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>n</entry>
-       <entry>p</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>n</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>p</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>p</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>n</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, n, or p, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_binomial</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-cauchy.xml b/reference/stats/functions/stats-cdf-cauchy.xml
deleted file mode 100644
index 9245450d24..0000000000
--- a/reference/stats/functions/stats-cdf-cauchy.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-cauchy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_cauchy</refname>
-  <refpurpose>Calculates any one parameter of the Cauchy distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_cauchy</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the Cauchy distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, x0, and gamma denotes cumulative distribution function, the value of the random
-   variable, the location and the scale parameter of the Cauchy distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>x0</entry>
-       <entry>gamma</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>x0</entry>
-       <entry>gamma</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>x0</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>gamma</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>gamma</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>x0</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, x0, or gamma, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_cauchy</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-chisquare.xml b/reference/stats/functions/stats-cdf-chisquare.xml
deleted file mode 100644
index 7f3764a670..0000000000
--- a/reference/stats/functions/stats-cdf-chisquare.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-chisquare" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_chisquare</refname>
-  <refpurpose>Calculates any one parameter of the chi-square distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_chisquare</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the chi-square distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter> and <parameter>par2</parameter>) are determined by
-   <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, and k denotes cumulative distribution function, the value of the random variable,
-   and the degree of freedom of the chi-square distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>k</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>k</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, or k, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_chisquare</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-exponential.xml b/reference/stats/functions/stats-cdf-exponential.xml
deleted file mode 100644
index b22f5fda63..0000000000
--- a/reference/stats/functions/stats-cdf-exponential.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-exponential" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_exponential</refname>
-  <refpurpose>Calculates any one parameter of the exponential distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_exponential</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the exponential distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter> and <parameter>par2</parameter>) are determined by
-   <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, and lambda denotes cumulative distribution function, the value of the random
-   variable, and the rate parameter of the exponential distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>lambda</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, or lambda, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_exponential</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-f.xml b/reference/stats/functions/stats-cdf-f.xml
deleted file mode 100644
index 18e5973624..0000000000
--- a/reference/stats/functions/stats-cdf-f.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-f" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_f</refname>
-  <refpurpose>Calculates any one parameter of the F distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_f</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the F distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, d1, and d2 denotes cumulative distribution function, the value of the random
-   variable, and the degree of freedoms of the F distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>d1</entry>
-       <entry>d2</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>d1</entry>
-       <entry>d2</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>d1</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>d2</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>d2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>d1</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, d1, or d2, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_f</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-gamma.xml b/reference/stats/functions/stats-cdf-gamma.xml
deleted file mode 100644
index e58a70ec27..0000000000
--- a/reference/stats/functions/stats-cdf-gamma.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-gamma" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_gamma</refname>
-  <refpurpose>Calculates any one parameter of the gamma distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_gamma</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the gamma distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, k, and theta denotes cumulative distribution function, the value of the random
-   variable, and the shape and the scale parameter of the gamma distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>k</entry>
-       <entry>theta</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-       <entry>theta</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>k</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>theta</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>theta</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, k, or theta, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_gamma</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-laplace.xml b/reference/stats/functions/stats-cdf-laplace.xml
deleted file mode 100644
index 38ef88db64..0000000000
--- a/reference/stats/functions/stats-cdf-laplace.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-laplace" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_laplace</refname>
-  <refpurpose>Calculates any one parameter of the Laplace distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_laplace</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the Laplace distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, mu, and b denotes cumulative distribution function, the value of the random
-   variable, and the location and the scale parameter of the Laplace distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>mu</entry>
-       <entry>b</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-       <entry>b</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>mu</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>b</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>b</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, mu, or b, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_laplace</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-logistic.xml b/reference/stats/functions/stats-cdf-logistic.xml
deleted file mode 100644
index 6d3cb1bcb1..0000000000
--- a/reference/stats/functions/stats-cdf-logistic.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-logistic" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_logistic</refname>
-  <refpurpose>Calculates any one parameter of the logistic distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_logistic</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the logistic distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, mu, and s denotes cumulative distribution function, the value of the random
-   variable, and the location and the scale parameter of the logistic distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>mu</entry>
-       <entry>s</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-       <entry>s</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>mu</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>s</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>s</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, mu, or s, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_logistic</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-negative-binomial.xml b/reference/stats/functions/stats-cdf-negative-binomial.xml
deleted file mode 100644
index eea959c7ed..0000000000
--- a/reference/stats/functions/stats-cdf-negative-binomial.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-negative-binomial" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_negative_binomial</refname>
-  <refpurpose>Calculates any one parameter of the negative binomial distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_negative_binomial</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the negative binomial distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, r, and p denotes cumulative distribution function, the number of failure, the number
-   of success, and the success rate for each trial, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>r</entry>
-       <entry>p</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>r</entry>
-       <entry>p</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>r</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>p</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>p</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>r</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, r, or p, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_negative_binomial</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-noncentral-chisquare.xml b/reference/stats/functions/stats-cdf-noncentral-chisquare.xml
deleted file mode 100644
index 7003018494..0000000000
--- a/reference/stats/functions/stats-cdf-noncentral-chisquare.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-noncentral-chisquare" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_noncentral_chisquare</refname>
-  <refpurpose>Calculates any one parameter of the non-central chi-square distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_noncentral_chisquare</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the non-central chi-square distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, k, and lambda denotes cumulative distribution function, the value of the random
-   variable, the degree of freedom and the non-centrality parameter of the distribution,
-   respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>k</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>k</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>lambda</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, k, or lambda, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_noncentral_chisquare</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-noncentral-f.xml b/reference/stats/functions/stats-cdf-noncentral-f.xml
deleted file mode 100644
index de8e1651c1..0000000000
--- a/reference/stats/functions/stats-cdf-noncentral-f.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-noncentral-f" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_noncentral_f</refname>
-  <refpurpose>Calculates any one parameter of the non-central F distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_noncentral_f</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par4</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the non-central F distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, <parameter>par3</parameter>,
-   and <parameter>par4</parameter>) are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, nu1, nu2, and lambda denotes cumulative distribution function, the value of the
-   random variable, the degree of freedoms and the non-centrality parameter of the distribution,
-   respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="6">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-       <entry><parameter>par4</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>nu1</entry>
-       <entry>nu2</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu1</entry>
-       <entry>nu2</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>nu1</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu2</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>nu2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu1</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>5</entry>
-       <entry>lambda</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu1</entry>
-       <entry>nu2</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par4</parameter></term>
-     <listitem>
-      <para>
-       The fourth parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, nu1, nu2, or lambda, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_noncentral_f</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-noncentral-t.xml b/reference/stats/functions/stats-cdf-noncentral-t.xml
deleted file mode 100644
index 4e2bf39b3c..0000000000
--- a/reference/stats/functions/stats-cdf-noncentral-t.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.stats-cdf-noncentral-t" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>stats_cdf_noncentral_t</refname>
-  <refpurpose>Calculates any one parameter of the non-central t-distribution give values for the others</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>float</type><methodname>stats_cdf_noncentral_t</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the non-central t-distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, nu, and mu denotes cumulative distribution function, the value of the random
-   variable, the degrees of freedom and the non-centrality parameter of the distribution,
-   respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>nu</entry>
-       <entry>mu</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu</entry>
-       <entry>mu</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>nu</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>mu</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, nu, or mu, determined by <parameter>which</parameter>.
-  </para>
- </refsect1><!-- }}} -->
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function issue E_* level errors, and/or throw exceptions.
-  </para>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Enter the version of change here</entry>
-      <entry>
-       Describe the change
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function-name.example.basic">
-   <title><function>function-name</function> example</title>
-   <para>
-     Any text that describes the purpose of the example, or what
-     goes on in the example should be here. (Inside the <example> tag, not out).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-   echo 'Use the PEAR Coding standards';
-}
-if ($thereisoutput === 'and it is multiple lines') {
-   echo 'Use a screen like we did below';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Use the PEAR Coding standards
-Use a screen like we did below
-]]>
-   </screen>
-  </example>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>somefunc</function></member>
-   <member><function>another_func</function></member>
-   <member>The <link linkend="something">something appendix</link></member>
-  </simplelist>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-normal.xml b/reference/stats/functions/stats-cdf-normal.xml
deleted file mode 100644
index 1a58ea588e..0000000000
--- a/reference/stats/functions/stats-cdf-normal.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.stats-cdf-normal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>stats_cdf_normal</refname>
-  <refpurpose>Calculates any one parameter of the normal distribution given values for the others</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>float</type><methodname>stats_cdf_normal</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the normal distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, mu, and sigma denotes cumulative distribution function, the value of the random
-   variable, the mean and the standard deviation of the normal distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>mu</entry>
-       <entry>sigma</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-       <entry>sigma</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>mu</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>sigma</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>sigma</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>mu</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, mu, or sigma, determined by <parameter>which</parameter>.
-  </para>
- </refsect1><!-- }}} -->
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function issue E_* level errors, and/or throw exceptions.
-  </para>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Enter the version of change here</entry>
-      <entry>
-       Describe the change
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- -->
- 
- <!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function-name.example.basic">
-   <title><function>function-name</function> example</title>
-   <para>
-     Any text that describes the purpose of the example, or what
-     goes on in the example should be here. (Inside the <example> tag, not out).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-   echo 'Use the PEAR Coding standards';
-}
-if ($thereisoutput === 'and it is multiple lines') {
-   echo 'Use a screen like we did below';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Use the PEAR Coding standards
-Use a screen like we did below
-]]>
-   </screen>
-  </example>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>somefunc</function></member>
-   <member><function>another_func</function></member>
-   <member>The <link linkend="something">something appendix</link></member>
-  </simplelist>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-poisson.xml b/reference/stats/functions/stats-cdf-poisson.xml
deleted file mode 100644
index 302b783298..0000000000
--- a/reference/stats/functions/stats-cdf-poisson.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-poisson" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_poisson</refname>
-  <refpurpose>Calculates any one parameter of the Poisson distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_poisson</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters, of the Poisson distribution.
-   The kind of the return value and parameters (<parameter>par1</parameter> and <parameter>par2</parameter>) are
-   determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, and lambda denotes cumulative distribution function, the value of the random variable,
-   and the parameter of the Poisson distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>lambda</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, or lambda, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_poisson</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-t.xml b/reference/stats/functions/stats-cdf-t.xml
deleted file mode 100644
index 17daaf3f70..0000000000
--- a/reference/stats/functions/stats-cdf-t.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-t" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_t</refname>
-  <refpurpose>Calculates any one parameter of the t-distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_t</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the t-distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter> and <parameter>par2</parameter>) are determined by
-   <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, and nu denotes cumulative distribution function, the value of the random
-   variable, and the degrees of freedom of the t-distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>nu</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>nu</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>nu</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, or nu, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_t</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-uniform.xml b/reference/stats/functions/stats-cdf-uniform.xml
deleted file mode 100644
index 93604c06d3..0000000000
--- a/reference/stats/functions/stats-cdf-uniform.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-uniform" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_uniform</refname>
-  <refpurpose>Calculates any one parameter of the uniform distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_uniform</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the uniform distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, a, and b denotes cumulative distribution function, the value of the random variable,
-   the lower bound and the higher bound of the uniform distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>a</entry>
-       <entry>b</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>a</entry>
-       <entry>b</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>a</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>b</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>b</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>a</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, a, or b, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_uniform</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-cdf-weibull.xml b/reference/stats/functions/stats-cdf-weibull.xml
deleted file mode 100644
index 0fc5ae789f..0000000000
--- a/reference/stats/functions/stats-cdf-weibull.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-cdf-weibull" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_cdf_weibull</refname>
-  <refpurpose>Calculates any one parameter of the Weibull distribution given values for the others</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_cdf_weibull</methodname>
-   <methodparam><type>float</type><parameter>par1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>par3</parameter></methodparam>
-   <methodparam><type>int</type><parameter>which</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the cumulative distribution function, its inverse, or one of its parameters,
-   of the Weibull distribution. The kind of the return value and parameters
-   (<parameter>par1</parameter>, <parameter>par2</parameter>, and <parameter>par3</parameter>)
-   are determined by <parameter>which</parameter>.
-  </para>
-  <para>
-   The following table lists the return value and parameters by <parameter>which</parameter>.
-   CDF, x, k, and lambda denotes cumulative distribution function, the value of the random variable,
-   the shape and the scale parameter of the Weibull distribution, respectively.
-   <table>
-    <title>Return value and parameters</title>
-    <tgroup cols="5">
-     <thead>
-      <row>
-       <entry><parameter>which</parameter></entry>
-       <entry>Return value</entry>
-       <entry><parameter>par1</parameter></entry>
-       <entry><parameter>par2</parameter></entry>
-       <entry><parameter>par3</parameter></entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>CDF</entry>
-       <entry>x</entry>
-       <entry>k</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>k</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>lambda</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>lambda</entry>
-       <entry>x</entry>
-       <entry>CDF</entry>
-       <entry>k</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>par1</parameter></term>
-     <listitem>
-      <para>
-       The first parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <para>
-       The second parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <para>
-       The third parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <para>
-       The flag to determine what to be calculated
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns CDF, x, k, or lambda, determined by <parameter>which</parameter>.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_cdf_weibull</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-covariance.xml b/reference/stats/functions/stats-covariance.xml
deleted file mode 100644
index 303d71813b..0000000000
--- a/reference/stats/functions/stats-covariance.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-covariance" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_covariance</refname>
-  <refpurpose>Computes the covariance of two data sets</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_covariance</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-   <methodparam><type>array</type><parameter>b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the covariance of <parameter>a</parameter> and <parameter>b</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The first array
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       The second array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the covariance of <parameter>a</parameter> and <parameter>b</parameter>,
-   or &false; on failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_covariance</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-beta.xml b/reference/stats/functions/stats-dens-beta.xml
deleted file mode 100644
index 8df89f19f9..0000000000
--- a/reference/stats/functions/stats-dens-beta.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-beta" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_beta</refname>
-  <refpurpose>Probability density function of the beta distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_beta</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>a</parameter></methodparam>
-   <methodparam><type>float</type><parameter>b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the beta distribution of which the shape parameters
-   are <parameter>a</parameter> and <parameter>b</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_beta</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-cauchy.xml b/reference/stats/functions/stats-dens-cauchy.xml
deleted file mode 100644
index 3048d0833c..0000000000
--- a/reference/stats/functions/stats-dens-cauchy.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-cauchy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_cauchy</refname>
-  <refpurpose>Probability density function of the Cauchy distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_cauchy</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ave</parameter></methodparam>
-   <methodparam><type>float</type><parameter>stdev</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the Cauchy distribution whose location and scale are
-   <parameter>ave</parameter> and <parameter>stdev</parameter>, respectively.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <para>
-       The location parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <para>
-       The scale parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_cauchy</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-chisquare.xml b/reference/stats/functions/stats-dens-chisquare.xml
deleted file mode 100644
index 812fb4ad30..0000000000
--- a/reference/stats/functions/stats-dens-chisquare.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-chisquare" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_chisquare</refname>
-  <refpurpose>Probability density function of the chi-square distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_chisquare</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>dfr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the chi-square distribution of which the degree of
-   freedom is <parameter>dfr</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr</parameter></term>
-     <listitem>
-      <para>
-       The degree of freedom of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_chisquare</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-exponential.xml b/reference/stats/functions/stats-dens-exponential.xml
deleted file mode 100644
index dffa0e5e15..0000000000
--- a/reference/stats/functions/stats-dens-exponential.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-exponential" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_exponential</refname>
-  <refpurpose>Probability density function of the exponential distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_exponential</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>scale</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the exponential distribution of which the scale is
-   <parameter>scale</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>scale</parameter></term>
-     <listitem>
-      <para>
-       The scale of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_exponential</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-f.xml b/reference/stats/functions/stats-dens-f.xml
deleted file mode 100644
index b1eb378007..0000000000
--- a/reference/stats/functions/stats-dens-f.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-f" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_f</refname>
-  <refpurpose>Probability density function of the F distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_f</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>dfr1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>dfr2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the F distribution of which the degree of freedoms
-   are <parameter>dfr1</parameter> and <parameter>dfr2</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr1</parameter></term>
-     <listitem>
-      <para>
-       The degree of freedom of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr2</parameter></term>
-     <listitem>
-      <para>
-       The degree of freedom of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_f</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-gamma.xml b/reference/stats/functions/stats-dens-gamma.xml
deleted file mode 100644
index 7493ecf771..0000000000
--- a/reference/stats/functions/stats-dens-gamma.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-gamma" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_gamma</refname>
-  <refpurpose>Probability density function of the gamma distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_gamma</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>shape</parameter></methodparam>
-   <methodparam><type>float</type><parameter>scale</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the gamma distribution of which the shape parameter
-   is <parameter>shape</parameter> and the scale parameter is <parameter>scale</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>shape</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>scale</parameter></term>
-     <listitem>
-      <para>
-       The scale parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_gamma</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-laplace.xml b/reference/stats/functions/stats-dens-laplace.xml
deleted file mode 100644
index e2443edb84..0000000000
--- a/reference/stats/functions/stats-dens-laplace.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-laplace" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_laplace</refname>
-  <refpurpose>Probability density function of the Laplace distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_laplace</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ave</parameter></methodparam>
-   <methodparam><type>float</type><parameter>stdev</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the Laplace distribution of which the location parameter
-   is <parameter>ave</parameter> and the scale parameter is <parameter>stdev</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <para>
-       The location parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_laplace</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-logistic.xml b/reference/stats/functions/stats-dens-logistic.xml
deleted file mode 100644
index 1b0959644f..0000000000
--- a/reference/stats/functions/stats-dens-logistic.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-logistic" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_logistic</refname>
-  <refpurpose>Probability density function of the logistic distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_logistic</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ave</parameter></methodparam>
-   <methodparam><type>float</type><parameter>stdev</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the logistic distribution of which the location parameter
-   is <parameter>ave</parameter> and the scale parameter is <parameter>stdev</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <para>
-       The location parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_logistic</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-normal.xml b/reference/stats/functions/stats-dens-normal.xml
deleted file mode 100644
index 8053d8e3fa..0000000000
--- a/reference/stats/functions/stats-dens-normal.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-normal" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_normal</refname>
-  <refpurpose>Probability density function of the normal distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_normal</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ave</parameter></methodparam>
-   <methodparam><type>float</type><parameter>stdev</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the normal distribution of which the mean is
-   <parameter>ave</parameter> and the standard deviation is
-   <parameter>stdev</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <para>
-       The mean of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_normal</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-pmf-binomial.xml b/reference/stats/functions/stats-dens-pmf-binomial.xml
deleted file mode 100644
index 3f6422c6da..0000000000
--- a/reference/stats/functions/stats-dens-pmf-binomial.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-pmf-binomial" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_pmf_binomial</refname>
-  <refpurpose>Probability mass function of the binomial distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_pmf_binomial</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>n</parameter></methodparam>
-   <methodparam><type>float</type><parameter>pi</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability mass at <parameter>x</parameter>, where the random variable
-   follows the binomial distribution of which the number of trials is <parameter>n</parameter>
-   and the success rate is <parameter>pi</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability mass is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-       The number of trials of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pi</parameter></term>
-     <listitem>
-      <para>
-       The success rate of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability mass at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_pmf_binomial</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-pmf-hypergeometric.xml b/reference/stats/functions/stats-dens-pmf-hypergeometric.xml
deleted file mode 100644
index 26867dbac0..0000000000
--- a/reference/stats/functions/stats-dens-pmf-hypergeometric.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-pmf-hypergeometric" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_pmf_hypergeometric</refname>
-  <refpurpose>Probability mass function of the hypergeometric distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_pmf_hypergeometric</methodname>
-   <methodparam><type>float</type><parameter>n1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>n2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>N1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>N2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability mass at <parameter>n1</parameter>, where the random variable
-   follows the hypergeometric distribution of which the number of failure is
-   <parameter>n2</parameter>, the number of success samples is <parameter>N1</parameter>,
-   and the number of failure samples is <parameter>N2</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>n1</parameter></term>
-     <listitem>
-      <para>
-       The number of success, at which the probability mass is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n2</parameter></term>
-     <listitem>
-      <para>
-       The number of failure of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>N1</parameter></term>
-     <listitem>
-      <para>
-       The number of success samples of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>N2</parameter></term>
-     <listitem>
-      <para>
-       The number of failure samples of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability mass at <parameter>n1</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_pmf_hypergeometric</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-pmf-negative-binomial.xml b/reference/stats/functions/stats-dens-pmf-negative-binomial.xml
deleted file mode 100644
index 80e1c5c581..0000000000
--- a/reference/stats/functions/stats-dens-pmf-negative-binomial.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.stats-dens-pmf-negative-binomial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>stats_dens_pmf_negative_binomial</refname>
-  <refpurpose>Probability mass function of the negative binomial distribution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_pmf_negative_binomial</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>n</parameter></methodparam>
-   <methodparam><type>float</type><parameter>pi</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability mass at <parameter>x</parameter>, where the
-   random variable follows the negative binomial distribution of which
-   the number of the success is <parameter>n</parameter> and the success
-   rate is <parameter>pi</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability mass is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-       The number of the success of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pi</parameter></term>
-     <listitem>
-      <para>
-       The success rate of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability mass at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function issue E_* level errors, and/or throw exceptions.
-  </para>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Enter the version of change here</entry>
-      <entry>
-       Describe the change
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function-name.example.basic">
-   <title><function>function-name</function> example</title>
-   <para>
-     Any text that describes the purpose of the example, or what
-     goes on in the example should be here. (Inside the <example> tag, not out).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-   echo 'Use the PEAR Coding standards';
-}
-if ($thereisoutput === 'and it is multiple lines') {
-   echo 'Use a screen like we did below';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Use the PEAR Coding standards
-Use a screen like we did below
-]]>
-   </screen>
-  </example>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>somefunc</function></member>
-   <member><function>another_func</function></member>
-   <member>The <link linkend="something">something appendix</link></member>
-  </simplelist>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-pmf-poisson.xml b/reference/stats/functions/stats-dens-pmf-poisson.xml
deleted file mode 100644
index 633aee3c8f..0000000000
--- a/reference/stats/functions/stats-dens-pmf-poisson.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-pmf-poisson" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_pmf_poisson</refname>
-  <refpurpose>Probability mass function of the Poisson distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_pmf_poisson</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>lb</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability mass at <parameter>x</parameter>, where the random variable
-   follows the Poisson distribution whose parameter is <parameter>lb</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability mass is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lb</parameter></term>
-     <listitem>
-      <para>
-       The parameter of the Poisson distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability mass at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_pmf_poisson</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-t.xml b/reference/stats/functions/stats-dens-t.xml
deleted file mode 100644
index 1f5415b7e6..0000000000
--- a/reference/stats/functions/stats-dens-t.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-t" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_t</refname>
-  <refpurpose>Probability density function of the t-distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_t</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>dfr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the t-distribution of which the degree of
-   freedom is <parameter>dfr</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr</parameter></term>
-     <listitem>
-      <para>
-       The degree of freedom of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_t</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-uniform.xml b/reference/stats/functions/stats-dens-uniform.xml
deleted file mode 100644
index 27aabb0943..0000000000
--- a/reference/stats/functions/stats-dens-uniform.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.stats-dens-uniform" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>stats_dens_uniform</refname>
-  <refpurpose>Probability density function of the uniform distribution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_uniform</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>a</parameter></methodparam>
-   <methodparam><type>float</type><parameter>b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the uniform distribution of which the lower bound is
-   <parameter>a</parameter> and the upper bound is <parameter>b</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The lower bound of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       The upper bound of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function issue E_* level errors, and/or throw exceptions.
-  </para>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Enter the version of change here</entry>
-      <entry>
-       Describe the change
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function-name.example.basic">
-   <title><function>function-name</function> example</title>
-   <para>
-     Any text that describes the purpose of the example, or what
-     goes on in the example should be here. (Inside the <example> tag, not out).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-   echo 'Use the PEAR Coding standards';
-}
-if ($thereisoutput === 'and it is multiple lines') {
-   echo 'Use a screen like we did below';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Use the PEAR Coding standards
-Use a screen like we did below
-]]>
-   </screen>
-  </example>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>somefunc</function></member>
-   <member><function>another_func</function></member>
-   <member>The <link linkend="something">something appendix</link></member>
-  </simplelist>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-dens-weibull.xml b/reference/stats/functions/stats-dens-weibull.xml
deleted file mode 100644
index d71b612d1b..0000000000
--- a/reference/stats/functions/stats-dens-weibull.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-dens-weibull" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_dens_weibull</refname>
-  <refpurpose>Probability density function of the Weibull distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_dens_weibull</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>a</parameter></methodparam>
-   <methodparam><type>float</type><parameter>b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the Weibull distribution of which the shape parameter
-   is <parameter>a</parameter> and the scale parameter is <parameter>b</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The value at which the probability density is calculated
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       The scale parameter of the distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_dens_weibull</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-harmonic-mean.xml b/reference/stats/functions/stats-harmonic-mean.xml
deleted file mode 100644
index 1327fbd197..0000000000
--- a/reference/stats/functions/stats-harmonic-mean.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-harmonic-mean" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_harmonic_mean</refname>
-  <refpurpose>Returns the harmonic mean of an array of values</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>number</type><methodname>stats_harmonic_mean</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the harmonic mean of the values in <parameter>a</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The input array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the harmonic mean of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_harmonic_mean</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-kurtosis.xml b/reference/stats/functions/stats-kurtosis.xml
deleted file mode 100644
index 47b7d42654..0000000000
--- a/reference/stats/functions/stats-kurtosis.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-kurtosis" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_kurtosis</refname>
-  <refpurpose>Computes the kurtosis of the data in the array</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_kurtosis</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the kurtosis of the values in <parameter>a</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The input array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the kurtosis of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_kurtosis</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-beta.xml b/reference/stats/functions/stats-rand-gen-beta.xml
deleted file mode 100644
index 5d5405b653..0000000000
--- a/reference/stats/functions/stats-rand-gen-beta.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-beta" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_beta</refname>
-  <refpurpose>Generates a random deviate from the beta distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_beta</methodname>
-   <methodparam><type>float</type><parameter>a</parameter></methodparam>
-   <methodparam><type>float</type><parameter>b</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the beta distribution with parameters A and
-   B. The density of the beta is x^(a-1) * (1-x)^(b-1) / B(a,b) for 0 &lt; x
-   &lt;. Method R. C. H. Cheng.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the beta distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <para>
-       The shape parameter of the beta distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_beta</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-chisquare.xml b/reference/stats/functions/stats-rand-gen-chisquare.xml
deleted file mode 100644
index 372b57b7a5..0000000000
--- a/reference/stats/functions/stats-rand-gen-chisquare.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-chisquare" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_chisquare</refname>
-  <refpurpose>Generates a random deviate from the chi-square distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_chisquare</methodname>
-   <methodparam><type>float</type><parameter>df</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the chi-square distribution where the degrees of
-   freedom is  <parameter>df</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_chisquare</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-exponential.xml b/reference/stats/functions/stats-rand-gen-exponential.xml
deleted file mode 100644
index 88d58536cd..0000000000
--- a/reference/stats/functions/stats-rand-gen-exponential.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-exponential" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_exponential</refname>
-  <refpurpose>Generates a random deviate from the exponential distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_exponential</methodname>
-   <methodparam><type>float</type><parameter>av</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the exponential distribution of which the scale is
-   <parameter>av</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>av</parameter></term>
-     <listitem>
-      <para>
-       The scale parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_exponential</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-f.xml b/reference/stats/functions/stats-rand-gen-f.xml
deleted file mode 100644
index 0574db6aae..0000000000
--- a/reference/stats/functions/stats-rand-gen-f.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-f" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_f</refname>
-  <refpurpose>Generates a random deviate from the F distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_f</methodname>
-   <methodparam><type>float</type><parameter>dfn</parameter></methodparam>
-   <methodparam><type>float</type><parameter>dfd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Generates a random deviate from the F (variance ratio) distribution with 
-   "dfn" degrees of freedom in the numerator and "dfd" degrees of freedom in 
-   the denominator. Method : directly generates ratio of chisquare variates.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dfn</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom in the numerator
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfd</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom in the denominator
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_f</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-funiform.xml b/reference/stats/functions/stats-rand-gen-funiform.xml
deleted file mode 100644
index 087da301cd..0000000000
--- a/reference/stats/functions/stats-rand-gen-funiform.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-funiform" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_funiform</refname>
-  <refpurpose>Generates uniform float between low (exclusive) and high (exclusive)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_funiform</methodname>
-   <methodparam><type>float</type><parameter>low</parameter></methodparam>
-   <methodparam><type>float</type><parameter>high</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the uniform distribution from
-   <parameter>low</parameter> to <parameter>high</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>low</parameter></term>
-     <listitem>
-      <para>
-       The lower bound (inclusive)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>high</parameter></term>
-     <listitem>
-      <para>
-       The upper bound (exclusive)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_funiform</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-gamma.xml b/reference/stats/functions/stats-rand-gen-gamma.xml
deleted file mode 100644
index 85523b087d..0000000000
--- a/reference/stats/functions/stats-rand-gen-gamma.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.stats-rand-gen-gamma" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_gamma</refname>
-  <refpurpose>Generates a random deviate from the gamma distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_gamma</methodname>
-   <methodparam><type>float</type><parameter>a</parameter></methodparam>
-   <methodparam><type>float</type><parameter>r</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Generates a random deviate from the gamma distribution whose density is
-   (A**R)/Gamma(R) * X**(R-1) * Exp(-A*X).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       location parameter of Gamma distribution (<parameter>a</parameter>
-       &gt; 0).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>r</parameter></term>
-     <listitem>
-      <para>
-       shape parameter of Gamma distribution (<parameter>r</parameter> &gt;
-       0).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_gamma</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-ibinomial-negative.xml b/reference/stats/functions/stats-rand-gen-ibinomial-negative.xml
deleted file mode 100644
index ac7edfee03..0000000000
--- a/reference/stats/functions/stats-rand-gen-ibinomial-negative.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-ibinomial-negative" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_ibinomial_negative</refname>
-  <refpurpose>Generates a random deviate from the negative binomial distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>stats_rand_gen_ibinomial_negative</methodname>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-   <methodparam><type>float</type><parameter>p</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from a negative binomial distribution where the number of success is
-   <parameter>n</parameter> and the success rate is <parameter>p</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-       The number of success
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>p</parameter></term>
-     <listitem>
-      <para>
-       The success rate
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate, which is the number of failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_ibinomial_negative</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-ibinomial.xml b/reference/stats/functions/stats-rand-gen-ibinomial.xml
deleted file mode 100644
index 348d4e9338..0000000000
--- a/reference/stats/functions/stats-rand-gen-ibinomial.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-ibinomial" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_ibinomial</refname>
-  <refpurpose>Generates a random deviate from the binomial distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>stats_rand_gen_ibinomial</methodname>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-   <methodparam><type>float</type><parameter>pp</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the binomial distribution whose number of trials is <parameter>n</parameter>
-   and whose probability of an event in each trial is <parameter>pp</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-       The number of trials
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pp</parameter></term>
-     <listitem>
-      <para>
-       The probability of an event in each trial
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_ibinomial</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-int.xml b/reference/stats/functions/stats-rand-gen-int.xml
deleted file mode 100644
index 28aefa0574..0000000000
--- a/reference/stats/functions/stats-rand-gen-int.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-int" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_int</refname>
-  <refpurpose>Generates random integer between 1 and 2147483562</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>stats_rand_gen_int</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns a random integer between 1 and 2147483562
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-  </para>
- </refsect1>
- -->
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random integer
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_int</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-ipoisson.xml b/reference/stats/functions/stats-rand-gen-ipoisson.xml
deleted file mode 100644
index 087ff4806f..0000000000
--- a/reference/stats/functions/stats-rand-gen-ipoisson.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-ipoisson" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_ipoisson</refname>
-  <refpurpose>Generates a single random deviate from a Poisson distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>stats_rand_gen_ipoisson</methodname>
-   <methodparam><type>float</type><parameter>mu</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the Poisson distribution with parameter <parameter>mu</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mu</parameter></term>
-     <listitem>
-      <para>
-       The parameter of the Poisson distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_ipoisson</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-iuniform.xml b/reference/stats/functions/stats-rand-gen-iuniform.xml
deleted file mode 100644
index b676c1196f..0000000000
--- a/reference/stats/functions/stats-rand-gen-iuniform.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-iuniform" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_iuniform</refname>
-  <refpurpose>Generates integer uniformly distributed between LOW (inclusive) and HIGH (inclusive)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>stats_rand_gen_iuniform</methodname>
-   <methodparam><type>int</type><parameter>low</parameter></methodparam>
-   <methodparam><type>int</type><parameter>high</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random integer from the discrete uniform distribution between <parameter>low</parameter> (inclusive)
-   and <parameter>high</parameter> (inclusive).
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>low</parameter></term>
-     <listitem>
-      <para>
-       The lower bound
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>high</parameter></term>
-     <listitem>
-      <para>
-       The upper bound
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random integer
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_iuniform</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-noncentral-chisquare.xml b/reference/stats/functions/stats-rand-gen-noncentral-chisquare.xml
deleted file mode 100644
index a9ef7c83da..0000000000
--- a/reference/stats/functions/stats-rand-gen-noncentral-chisquare.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.stats-rand-gen-noncentral-chisquare" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>stats_rand_gen_noncentral_chisquare</refname>
-  <refpurpose>Generates a random deviate from the non-central chi-square distribution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_noncentral_chisquare</methodname>
-   <methodparam><type>float</type><parameter>df</parameter></methodparam>
-   <methodparam><type>float</type><parameter>xnonc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the non-central chi-square distribution with degrees of freedom,
-   <parameter>df</parameter>, and non-centrality parameter, <parameter>xnonc</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xnonc</parameter></term>
-     <listitem>
-      <para>
-       The non-centrality parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function issue E_* level errors, and/or throw exceptions.
-  </para>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Enter the version of change here</entry>
-      <entry>
-       Describe the change
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function-name.example.basic">
-   <title><function>function-name</function> example</title>
-   <para>
-     Any text that describes the purpose of the example, or what
-     goes on in the example should be here. (Inside the <example> tag, not out).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-   echo 'Use the PEAR Coding standards';
-}
-if ($thereisoutput === 'and it is multiple lines') {
-   echo 'Use a screen like we did below';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Use the PEAR Coding standards
-Use a screen like we did below
-]]>
-   </screen>
-  </example>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>somefunc</function></member>
-   <member><function>another_func</function></member>
-   <member>The <link linkend="something">something appendix</link></member>
-  </simplelist>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-noncentral-f.xml b/reference/stats/functions/stats-rand-gen-noncentral-f.xml
deleted file mode 100644
index de5e2cc632..0000000000
--- a/reference/stats/functions/stats-rand-gen-noncentral-f.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-noncentral-f" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_noncentral_f</refname>
-  <refpurpose>Generates a random deviate from the noncentral F distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_noncentral_f</methodname>
-   <methodparam><type>float</type><parameter>dfn</parameter></methodparam>
-   <methodparam><type>float</type><parameter>dfd</parameter></methodparam>
-   <methodparam><type>float</type><parameter>xnonc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the non-central F distribution where the degrees of freedoms are
-   <parameter>dfn</parameter> (numerator) and <parameter>dfd</parameter> (denominator), and the non-centrality
-   parameter is <parameter>xnonc</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dfn</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom of the numerator
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfd</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom of the denominator
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xnonc</parameter></term>
-     <listitem>
-      <para>
-       The non-centrality parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_noncentral_f</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-noncentral-t.xml b/reference/stats/functions/stats-rand-gen-noncentral-t.xml
deleted file mode 100644
index ede7d12f2b..0000000000
--- a/reference/stats/functions/stats-rand-gen-noncentral-t.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-noncentral-t" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_noncentral_t</refname>
-  <refpurpose>Generates a single random deviate from a non-central t-distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_noncentral_t</methodname>
-   <methodparam><type>float</type><parameter>df</parameter></methodparam>
-   <methodparam><type>float</type><parameter>xnonc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the non-central t-distribution with the degrees of freedom,
-   <parameter>df</parameter>, and the non-centrality parameter, <parameter>xnonc</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xnonc</parameter></term>
-     <listitem>
-      <para>
-       The non-centrality parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_noncentral_t</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-normal.xml b/reference/stats/functions/stats-rand-gen-normal.xml
deleted file mode 100644
index 5853e8ec6c..0000000000
--- a/reference/stats/functions/stats-rand-gen-normal.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-normal" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_normal</refname>
-  <refpurpose>Generates a single random deviate from a normal distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_normal</methodname>
-   <methodparam><type>float</type><parameter>av</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the normal distribution with mean, <parameter>av</parameter>, and standard deviation,
-   <parameter>sd</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>av</parameter></term>
-     <listitem>
-      <para>
-       The mean of the normal distribution
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sd</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the normal distribution
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_normal</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-gen-t.xml b/reference/stats/functions/stats-rand-gen-t.xml
deleted file mode 100644
index 3294ece5f8..0000000000
--- a/reference/stats/functions/stats-rand-gen-t.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-gen-t" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_gen_t</refname>
-  <refpurpose>Generates a single random deviate from a t-distribution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_gen_t</methodname>
-   <methodparam><type>float</type><parameter>df</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a random deviate from the t-distribution with the degrees of freedom, <parameter>df</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <para>
-       The degrees of freedom
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random deviate
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_gen_t</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-get-seeds.xml b/reference/stats/functions/stats-rand-get-seeds.xml
deleted file mode 100644
index 488129a5e9..0000000000
--- a/reference/stats/functions/stats-rand-get-seeds.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-get-seeds" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_get_seeds</refname>
-  <refpurpose>Get the seed values of the random number generator</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>stats_rand_get_seeds</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the current seed values of the random number generator
-  </para>
- </refsect1>
- <!--
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-  </para>
- </refsect1>
- -->
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of two integers.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_get_seeds</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-phrase-to-seeds.xml b/reference/stats/functions/stats-rand-phrase-to-seeds.xml
deleted file mode 100644
index f15b1abefd..0000000000
--- a/reference/stats/functions/stats-rand-phrase-to-seeds.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-phrase-to-seeds" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_phrase_to_seeds</refname>
-  <refpurpose>Generate two seeds for the RGN random number generator</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>stats_rand_phrase_to_seeds</methodname>
-   <methodparam><type>string</type><parameter>phrase</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Generate two seeds for the random number generator from a <parameter>phrase</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>phrase</parameter></term>
-     <listitem>
-      <para>
-       The input phrase
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of two integers.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_phrase_to_seeds</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-ranf.xml b/reference/stats/functions/stats-rand-ranf.xml
deleted file mode 100644
index 13b4720ecd..0000000000
--- a/reference/stats/functions/stats-rand-ranf.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-ranf" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_ranf</refname>
-  <refpurpose>Generates a random floating point number between 0 and 1</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_rand_ranf</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns a random floating point number from a uniform distribution between 0 (exclusive) and  1 (exclusive).
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-  </para>
- </refsect1>
- -->
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A random floating point number
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_ranf</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-rand-setall.xml b/reference/stats/functions/stats-rand-setall.xml
deleted file mode 100644
index dcdf15030b..0000000000
--- a/reference/stats/functions/stats-rand-setall.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-rand-setall" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_rand_setall</refname>
-  <refpurpose>Set seed values to the random generator</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>stats_rand_setall</methodname>
-   <methodparam><type>int</type><parameter>iseed1</parameter></methodparam>
-   <methodparam><type>int</type><parameter>iseed2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set <parameter>iseed1</parameter> and <parameter>iseed2</parameter> as seed values to the random generator
-   used in statistic functions.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>iseed1</parameter></term>
-     <listitem>
-      <para>
-       The value which is used as the random seed
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>iseed2</parameter></term>
-     <listitem>
-      <para>
-       The value which is used as the random seed
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   No values are returned.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_rand_setall</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-skew.xml b/reference/stats/functions/stats-skew.xml
deleted file mode 100644
index 2180f4b2ef..0000000000
--- a/reference/stats/functions/stats-skew.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.stats-skew" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_skew</refname>
-  <refpurpose>Computes the skewness of the data in the array</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_skew</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the skewness of the values in <parameter>a</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The input array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the skewness of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_skew</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-standard-deviation.xml b/reference/stats/functions/stats-standard-deviation.xml
deleted file mode 100644
index f58c68a05c..0000000000
--- a/reference/stats/functions/stats-standard-deviation.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-standard-deviation" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_standard_deviation</refname>
-  <refpurpose>Returns the standard deviation</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_standard_deviation</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>sample</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the standard deviation of the values in <parameter>a</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The array of data to find the standard deviation for. Note that all 
-       values of the array will be cast to <type>float</type>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sample</parameter></term>
-     <listitem>
-      <para>
-       Indicates if <parameter>a</parameter> represents a sample of the 
-       population; defaults to &false;.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the standard deviation on success; &false; on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   Raises an <constant>E_WARNING</constant> when there are fewer than 2 
-   values in <parameter>a</parameter>.
-  </para>
- </refsect1><!-- }}} -->
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_standard_deviation</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-binomial-coef.xml b/reference/stats/functions/stats-stat-binomial-coef.xml
deleted file mode 100644
index 94f5f7171e..0000000000
--- a/reference/stats/functions/stats-stat-binomial-coef.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-stat-binomial-coef" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_binomial_coef</refname>
-  <refpurpose>Returns a binomial coefficient</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_binomial_coef</methodname>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the binomial coefficient of <parameter>n</parameter> choose <parameter>x</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The number of chooses from the set
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <para>
-       The number of elements in the set
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the binomial coefficient
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_binomial_coef</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-correlation.xml b/reference/stats/functions/stats-stat-correlation.xml
deleted file mode 100644
index 20bbf43c9f..0000000000
--- a/reference/stats/functions/stats-stat-correlation.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-stat-correlation" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_correlation</refname>
-  <refpurpose>Returns the Pearson correlation coefficient of two data sets</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_correlation</methodname>
-   <methodparam><type>array</type><parameter>arr1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arr2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the Pearson correlation coefficient between <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <para>
-       The first array
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <para>
-       The second array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the Pearson correlation coefficient between <parameter>arr1</parameter> and <parameter>arr2</parameter>,
-   or &false; on failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_correlation</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-factorial.xml b/reference/stats/functions/stats-stat-factorial.xml
deleted file mode 100644
index f3bb459a18..0000000000
--- a/reference/stats/functions/stats-stat-factorial.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.stats-stat-factorial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>stats_stat_factorial</refname>
-  <refpurpose>Returns the factorial of an integer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>float</type><methodname>stats_stat_factorial</methodname>
-   <methodparam><type>int</type><parameter>n</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the factorial of an integer, <parameter>n</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>n</parameter></term>
-    <listitem>
-     <para>
-      An integer
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The factorial of <parameter>n</parameter>.
-  </para>
- </refsect1>
-
- <!--
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function issue E_* level errors, and/or throw exceptions.
-  </para>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Enter the version of change here</entry>
-      <entry>
-       Describe the change
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function-name.example.basic">
-   <title><function>function-name</function> example</title>
-   <para>
-     Any text that describes the purpose of the example, or what
-     goes on in the example should be here. (Inside the <example> tag, not out).
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-   echo 'Use the PEAR Coding standards';
-}
-if ($thereisoutput === 'and it is multiple lines') {
-   echo 'Use a screen like we did below';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Use the PEAR Coding standards
-Use a screen like we did below
-]]>
-   </screen>
-  </example>
- </refsect1>
- -->
-
- <!--
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>somefunc</function></member>
-   <member><function>another_func</function></member>
-   <member>The <link linkend="something">something appendix</link></member>
-  </simplelist>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-independent-t.xml b/reference/stats/functions/stats-stat-independent-t.xml
deleted file mode 100644
index 4ac049fff4..0000000000
--- a/reference/stats/functions/stats-stat-independent-t.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.stats-stat-independent-t" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_independent_t</refname>
-  <refpurpose>Returns the t-value from the independent two-sample t-test</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_independent_t</methodname>
-   <methodparam><type>array</type><parameter>arr1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arr2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the t-value of the independent two-sample t-test between
-   <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </para>
-  &warn.undocumented.func;
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <para>
-       The first set of values
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <para>
-       The second set of values
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the t-value, or &false; if failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_independent_t</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-innerproduct.xml b/reference/stats/functions/stats-stat-innerproduct.xml
deleted file mode 100644
index cbfe91f099..0000000000
--- a/reference/stats/functions/stats-stat-innerproduct.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-stat-innerproduct" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_innerproduct</refname>
-  <refpurpose>Returns the inner product of two vectors</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_innerproduct</methodname>
-   <methodparam><type>array</type><parameter>arr1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arr2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the inner product of <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <para>
-       The first array
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <para>
-       The second array
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the inner product of <parameter>arr1</parameter> and <parameter>arr2</parameter>,
-   or &false; on failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_innerproduct</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-paired-t.xml b/reference/stats/functions/stats-stat-paired-t.xml
deleted file mode 100644
index b4a0e02873..0000000000
--- a/reference/stats/functions/stats-stat-paired-t.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-stat-paired-t" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_paired_t</refname>
-  <refpurpose>Returns the t-value of the dependent t-test for paired samples</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_paired_t</methodname>
-   <methodparam><type>array</type><parameter>arr1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arr2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the t-value of the dependent t-test for paired samples
-   <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <para>
-       The first samples
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <para>
-       The second samples
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the t-value, or &false; if failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_paired_t</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-percentile.xml b/reference/stats/functions/stats-stat-percentile.xml
deleted file mode 100644
index 35901a186d..0000000000
--- a/reference/stats/functions/stats-stat-percentile.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-stat-percentile" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_percentile</refname>
-  <refpurpose>Returns the percentile value</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_percentile</methodname>
-   <methodparam><type>array</type><parameter>arr</parameter></methodparam>
-   <methodparam><type>float</type><parameter>perc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the <parameter>perc</parameter>-th percentile value of the array <parameter>arr</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr</parameter></term>
-     <listitem>
-      <para>
-       The input array
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>perc</parameter></term>
-     <listitem>
-      <para>
-       The percentile
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the percentile values of the input array.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_percentile</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-stat-powersum.xml b/reference/stats/functions/stats-stat-powersum.xml
deleted file mode 100644
index 29f1d83a5a..0000000000
--- a/reference/stats/functions/stats-stat-powersum.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-stat-powersum" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_stat_powersum</refname>
-  <refpurpose>Returns the power sum of a vector</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_stat_powersum</methodname>
-   <methodparam><type>array</type><parameter>arr</parameter></methodparam>
-   <methodparam><type>float</type><parameter>power</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the sum of the <parameter>power</parameter>-th power of a vector represented as an array <parameter>arr</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr</parameter></term>
-     <listitem>
-      <para>
-       The input array
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>power</parameter></term>
-     <listitem>
-      <para>
-       The power
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the power sum of the input array.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_stat_powersum</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/functions/stats-variance.xml b/reference/stats/functions/stats-variance.xml
deleted file mode 100644
index 8d28e43b1b..0000000000
--- a/reference/stats/functions/stats-variance.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.stats-variance" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>stats_variance</refname>
-  <refpurpose>Returns the variance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>stats_variance</methodname>
-   <methodparam><type>array</type><parameter>a</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>sample</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the variance of the values in <parameter>a</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <para>
-       The array of data to find the standard deviation for. Note that all 
-       values of the array will be cast to <type>float</type>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sample</parameter></term>
-     <listitem>
-      <para>
-       Indicates if <parameter>a</parameter> represents a sample of the 
-       population; defaults to &false;.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the variance on success; &false; on failure.
-  </para>
- </refsect1>
-
- <!-- Use when ERRORS exist
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   When does this function throw E_* level errors, or exceptions?
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when a CHANGELOG exists
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>Enter the PHP version of change here</entry>
-       <entry>Description of change</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when examples exist
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>stats_variance</function> example</title>
-    <para>
-     Any text that describes the purpose of the example, or
-     what goes on in the example should go here (inside the
-     <example> tag, not out
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if ($anexample === true) {
-    echo 'Use the PEAR Coding Standards';
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Use the PEAR Coding Standards
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- -->
-
-
- <!-- Use when adding See Also links
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function></function></member>
-    <member>Or <link linkend="somethingelse">something else</link></member>
-   </simplelist>
-  </para>
- </refsect1>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/reference.xml b/reference/stats/reference.xml
deleted file mode 100644
index 0328879932..0000000000
--- a/reference/stats/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="ref.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Statistic &Functions;</title>
-
- &reference.stats.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stats/setup.xml b/reference/stats/setup.xml
deleted file mode 100644
index f95bf8a337..0000000000
--- a/reference/stats/setup.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="stats.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="stats.requirements">
-  &reftitle.required;
-  <para>
-   No external libraries are needed. The extension comes bundled with the libraries used.
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- <section xml:id="stats.installation">
-  &reftitle.install;
-   <para>
-    &pecl.moved;
-   </para>
-   <para>
-    &pecl.info;
-    <link xlink:href="&url.pecl.package;stats">&url.pecl.package;stats</link>.
-   </para>
-   <para>
-    &pecl.windows.download;
-   </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="stats.configuration">
-  &reftitle.runtime;
-  &no.config;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="stats.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
- <!-- }}} -->
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/stats/versions.xml b/reference/stats/versions.xml
deleted file mode 100644
index b5540ec717..0000000000
--- a/reference/stats/versions.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions>
- <function name='stats_absolute_deviation' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_beta' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_binomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_cauchy' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_chisquare' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_exponential' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_f' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_gamma' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_laplace' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_logistic' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_negative_binomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_noncentral_chisquare' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_noncentral_f' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_noncentral_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_normal' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_poisson' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_uniform' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_cdf_weibull' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_covariance' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_den_uniform' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_beta' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_cauchy' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_chisquare' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_exponential' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_f' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_gamma' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_laplace' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_logistic' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_negative_binomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_normal' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_pmf_binomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_pmf_hypergeometric' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_pmf_negative_binomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_pmf_poisson' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_uniform' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_dens_weibull' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_harmonic_mean' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_kurtosis' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_beta' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_chisquare' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_exponential' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_f' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_funiform' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_gamma' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_ibinomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_ibinomial_negative' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_int' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_ipoisson' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_iuniform' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_noncenral_chisquare' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_noncenral_f' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_noncentral_chisquare' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_noncentral_f' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_noncentral_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_normal' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_gen_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_get_seeds' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_getsd' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_ibinomial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_ibinomial_negative' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_ignlgi' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_phrase_to_seeds' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_ranf' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_rand_setall' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_skew' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_standard_deviation' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_binomial_coef' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_correlation' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_factorial' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_gennch' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_independent_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_innerproduct' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_noncentral_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_paired_t' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_percentile' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_stat_powersum' from='PECL stats &gt;= 1.0.0'/>
- <function name='stats_variance' from='PECL stats &gt;= 1.0.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
\ No newline at end of file
diff --git a/reference/stomp/book.xml b/reference/stomp/book.xml
index f3ece2050c..079679ad80 100644
--- a/reference/stomp/book.xml
+++ b/reference/stomp/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.stomp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Stomp Client</title>
  <titleabbrev>Stomp</titleabbrev>
 
diff --git a/reference/stomp/setup.xml b/reference/stomp/setup.xml
index 6925e520eb..2d8fb2085c 100644
--- a/reference/stomp/setup.xml
+++ b/reference/stomp/setup.xml
@@ -6,7 +6,6 @@
 
  <section xml:id="stomp.requirements">
   &reftitle.required;
-  <para>PECL/stomp requires PHP 5.2.2 or newer.</para>
   <para>The <link xlink:href="&url.openssl;">OpenSSL</link> package >= 0.9.6 and the <link linkend="book.openssl">openssl</link> extension may also be required to use stomp over SSL.</para>
  </section>
 
diff --git a/reference/stomp/stomp/abort.xml b/reference/stomp/stomp/abort.xml
index 5391805d34..2267d1d521 100644
--- a/reference/stomp/stomp/abort.xml
+++ b/reference/stomp/stomp/abort.xml
@@ -53,11 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -124,6 +119,10 @@ stomp_close($link);
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.sync;
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/stomp/stomp/ack.xml b/reference/stomp/stomp/ack.xml
index 72818607da..33f11c0266 100644
--- a/reference/stomp/stomp/ack.xml
+++ b/reference/stomp/stomp/ack.xml
@@ -53,12 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.transaction;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -154,6 +148,12 @@ stomp_close($link);
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.transaction;
+  &stomp.note.sync;
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/stomp/stomp/begin.xml b/reference/stomp/stomp/begin.xml
index ae2ae8ad4b..9b1741d793 100644
--- a/reference/stomp/stomp/begin.xml
+++ b/reference/stomp/stomp/begin.xml
@@ -53,11 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -65,6 +60,10 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.sync;
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/stomp/stomp/commit.xml b/reference/stomp/stomp/commit.xml
index 8791e28b93..715ca590e2 100644
--- a/reference/stomp/stomp/commit.xml
+++ b/reference/stomp/stomp/commit.xml
@@ -53,11 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -125,6 +120,10 @@ stomp_close($link);
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.sync;
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/stomp/stomp/send.xml b/reference/stomp/stomp/send.xml
index 5e724d5d15..98f92b1c81 100644
--- a/reference/stomp/stomp/send.xml
+++ b/reference/stomp/stomp/send.xml
@@ -63,12 +63,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.transaction;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -76,6 +70,12 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.transaction;
+  &stomp.note.sync;
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/stomp/stomp/setreadtimeout.xml b/reference/stomp/stomp/setreadtimeout.xml
index bafc6968b2..1828ff71dd 100644
--- a/reference/stomp/stomp/setreadtimeout.xml
+++ b/reference/stomp/stomp/setreadtimeout.xml
@@ -53,6 +53,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -106,7 +113,6 @@ stomp_close($link);
   </para>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/stomp/stomp/subscribe.xml b/reference/stomp/stomp/subscribe.xml
index 033bfe215b..db1513952a 100644
--- a/reference/stomp/stomp/subscribe.xml
+++ b/reference/stomp/stomp/subscribe.xml
@@ -53,11 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -65,6 +60,10 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.sync;
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/stomp/stomp/unsubscribe.xml b/reference/stomp/stomp/unsubscribe.xml
index 12f8c79678..cc1522f01d 100644
--- a/reference/stomp/stomp/unsubscribe.xml
+++ b/reference/stomp/stomp/unsubscribe.xml
@@ -53,11 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -65,6 +60,10 @@
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &stomp.note.sync;
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/stomp/stompexception/getdetails.xml b/reference/stomp/stompexception/getdetails.xml
index bbb600c949..27254a59d3 100644
--- a/reference/stomp/stompexception/getdetails.xml
+++ b/reference/stomp/stompexception/getdetails.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/stream/constants.xml b/reference/stream/constants.xml
index a09fbb4709..72c2f11317 100644
--- a/reference/stream/constants.xml
+++ b/reference/stream/constants.xml
@@ -292,21 +292,21 @@
       <entry><constant>STREAM_SHUT_RD</constant></entry>
       <entry>
        Used with <function>stream_socket_shutdown</function> to disable
-       further receptions. Added in PHP 5.2.1.
+       further receptions.
       </entry>
      </row>
      <row xml:id="constant.stream-shut-wr">
       <entry><constant>STREAM_SHUT_WR</constant></entry>
       <entry>
        Used with <function>stream_socket_shutdown</function> to disable
-       further transmissions. Added in PHP 5.2.1.
+       further transmissions.
       </entry>
      </row>
      <row xml:id="constant.stream-shut-rdwr">
       <entry><constant>STREAM_SHUT_RDWR</constant></entry>
       <entry>
        Used with <function>stream_socket_shutdown</function> to disable
-       further receptions and transmissions. Added in PHP 5.2.1.
+       further receptions and transmissions.
       </entry>
      </row>
      <row xml:id="constant.stream-cast-for-select">
@@ -383,16 +383,15 @@
  </para>
  <note>
   <simpara>
-   The constants marked with <literal>+</literal> are available since PHP
-   5.1.0 and are meant to be used with
+   The constants marked with <literal>+</literal> are meant to be used with
    <function>stream_socket_pair</function>. Please note that some of these
    constants might not be available in your system.
   </simpara>
  </note>
  <note>
   <simpara>
-   The <constant>STREAM_META_*</constant> constants are available since PHP
-   5.4.0 and are meant to be used with <function>stream_metadata</function>. 
+   The <constant>STREAM_META_*</constant> constants 
+   are meant to be used with <function>stream_metadata</function>. 
   </simpara>
  </note>
 </appendix>
diff --git a/reference/stream/functions/stream-bucket-make-writeable.xml b/reference/stream/functions/stream-bucket-make-writeable.xml
index ca9bd43be3..aeeac02ac9 100644
--- a/reference/stream/functions/stream-bucket-make-writeable.xml
+++ b/reference/stream/functions/stream-bucket-make-writeable.xml
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>object</type><methodname>stream_bucket_make_writeable</methodname>
+   <type class="union"><type>object</type><type>null</type></type><methodname>stream_bucket_make_writeable</methodname>
    <methodparam><type>resource</type><parameter>brigade</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/stream/functions/stream-context-get-default.xml b/reference/stream/functions/stream-context-get-default.xml
index 9e37274a6c..2fc938d66d 100644
--- a/reference/stream/functions/stream-context-get-default.xml
+++ b/reference/stream/functions/stream-context-get-default.xml
@@ -33,12 +33,6 @@
        array of associative arrays in the format
        <literal>$arr['wrapper']['option'] = $value</literal>.
       </simpara>
-      <note>
-       <para>
-        As of PHP 5.3.0, the <function>stream_context_set_default</function> function
-        can be used to set the default context.
-       </para>
-      </note>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -104,6 +98,7 @@ readfile('http://www.example.com', false, $alternate);
   <para>
    <simplelist>
     <member><function>stream_context_create</function></member>
+    <member><function>stream_context_set_default</function></member>
     <member>Listing of supported wrappers with context options (<xref linkend="wrappers"/>).</member>
    </simplelist>
   </para>
diff --git a/reference/stream/functions/stream-context-set-option.xml b/reference/stream/functions/stream-context-set-option.xml
index 0fb2e7b9f5..bb05a57a41 100644
--- a/reference/stream/functions/stream-context-set-option.xml
+++ b/reference/stream/functions/stream-context-set-option.xml
@@ -38,6 +38,32 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>wrapper</parameter></term>
+     <listitem>
+      <para>
+       The name of the wrapper (which may be diffrent than the protocol).
+       Refer to <link linkend="context">context options and parameters</link>
+       for a listing of stream options.
+     </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><parameter>option</parameter></term>
+     <listitem>
+      <para>
+       The name of the option.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><parameter>value</parameter></term>
+     <listitem>
+      <para>
+       The value of the option.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>options</parameter></term>
      <listitem>
diff --git a/reference/stream/functions/stream-context-set-params.xml b/reference/stream/functions/stream-context-set-params.xml
index 63bbbfaca1..ba1dc2f34d 100644
--- a/reference/stream/functions/stream-context-set-params.xml
+++ b/reference/stream/functions/stream-context-set-params.xml
@@ -34,51 +34,46 @@
      <term><parameter>params</parameter></term>
      <listitem>
       <para>
-       An array of parameters to set.
+       An associative array of parameters to be set in the following format:
+       <literal>$params['paramname'] = "paramvalue";</literal>.
       </para>
-      <note>
-       <para>
-        <parameter>params</parameter> should be an associative array of the structure:
-        <literal>$params['paramname'] = "paramvalue";</literal>.
-       </para>
-      </note>
+      <table>
+       <title>Supported parameters</title>
+       <tgroup cols="2">
+        <thead>
+         <row>
+          <entry>Parameter</entry>
+          <entry>Purpose</entry>
+         </row>
+        </thead>
+        <tbody>
+         <row>
+          <entry>
+           <literal>notification</literal>
+          </entry>
+          <entry>
+           Name of user-defined callback function to be called whenever a stream triggers a notification.
+           Only supported for <link linkend="wrappers.http">http://</link> and
+           <link linkend="wrappers.ftp">ftp://</link> stream wrappers.
+          </entry>
+         </row>
+         <row>
+          <entry>
+           <literal>options</literal>
+          </entry>
+          <entry>
+           Array of options as in <link linkend="context">context options and parameters</link>.
+          </entry>
+         </row>
+        </tbody>
+       </tgroup>
+      </table>
      </listitem>
     </varlistentry>
    </variablelist>
   </para>
  </refsect1><!-- }}} -->
 
- <refsect1 role="options"><!-- {{{ -->
-  <title>Supported parameters</title>
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Parameters</entry>
-      <entry>Purpose</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><literal>notification</literal></entry>
-      <entry>
-       Name of user-defined callback function to be called whenever a stream triggers a notification.
-       Only supported for <link linkend="wrappers.http">http://</link> and
-       <link linkend="wrappers.ftp">ftp://</link> stream wrappers.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>options</literal></entry>
-      <entry>
-       Array of options as in <link linkend="context">context options and
-        parameters</link>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
- 
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
   <para>
diff --git a/reference/stream/functions/stream-get-filters.xml b/reference/stream/functions/stream-get-filters.xml
index 817e867b09..f9d56636cc 100644
--- a/reference/stream/functions/stream-get-filters.xml
+++ b/reference/stream/functions/stream-get-filters.xml
@@ -16,6 +16,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/stream/functions/stream-get-line.xml b/reference/stream/functions/stream-get-line.xml
index aa283fbee0..5e864209a8 100644
--- a/reference/stream/functions/stream-get-line.xml
+++ b/reference/stream/functions/stream-get-line.xml
@@ -11,14 +11,14 @@
    <type>string</type><methodname>stream_get_line</methodname>
    <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
    <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>ending</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>ending</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
    Gets a line from the given handle.
   </para>
   <para>
    Reading ends when <parameter>length</parameter> bytes have been read, when
-   the string specified by <parameter>ending</parameter> is found (which is
+   the non-empty string specified by <parameter>ending</parameter> is found (which is
    <emphasis>not</emphasis> included in the return value), or on <acronym>EOF</acronym>
    (whichever comes first).
   </para>
@@ -45,7 +45,10 @@
      <term><parameter>length</parameter></term>
      <listitem>
       <para>
-       The number of bytes to read from the handle.
+       The maximum number of bytes to read from the handle.
+       Negative values are not supported.
+       Zero (<literal>0</literal>) means the default socket chunk size,
+       i.e. <literal>8192</literal> bytes.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/stream/functions/stream-get-transports.xml b/reference/stream/functions/stream-get-transports.xml
index d89df13413..4a8b0ebe0c 100644
--- a/reference/stream/functions/stream-get-transports.xml
+++ b/reference/stream/functions/stream-get-transports.xml
@@ -17,6 +17,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/stream/functions/stream-get-wrappers.xml b/reference/stream/functions/stream-get-wrappers.xml
index a7d205aa1c..5e34c5bb3b 100644
--- a/reference/stream/functions/stream-get-wrappers.xml
+++ b/reference/stream/functions/stream-get-wrappers.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/stream/functions/stream-set-blocking.xml b/reference/stream/functions/stream-set-blocking.xml
index b01402c1fc..3e0224aab5 100644
--- a/reference/stream/functions/stream-set-blocking.xml
+++ b/reference/stream/functions/stream-set-blocking.xml
@@ -62,13 +62,6 @@
 
  <refsect1 role="notes">
   &reftitle.notes;
-  <note>
-   <para>
-    This function was previously called as
-    <function>set_socket_blocking</function> and later
-    <function>socket_set_blocking</function> but this usage is deprecated.
-   </para>
-  </note>
   <note>
    <para>On Windows, this has no affect on local files. Non-blocking IO for local files is not supported on Windows.
    </para>
diff --git a/reference/stream/functions/stream-socket-enable-crypto.xml b/reference/stream/functions/stream-socket-enable-crypto.xml
index d1f6709287..6bd9baeb94 100644
--- a/reference/stream/functions/stream-socket-enable-crypto.xml
+++ b/reference/stream/functions/stream-socket-enable-crypto.xml
@@ -98,36 +98,6 @@
    (only for non-blocking sockets).
   </para>
  </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Introduce <constant>STREAM_CRYPTO_METHOD_ANY_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_ANY_SERVER</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_0_SERVER</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_1_SERVER</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_2_SERVER</constant>.
-       </entry>
-      </row>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        The <parameter>crypto_type</parameter> is now optional.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
  
  <refsect1 role="examples"><!-- {{{ -->
   &reftitle.examples;
diff --git a/reference/stream/functions/stream-wrapper-register.xml b/reference/stream/functions/stream-wrapper-register.xml
index b6ecf95f65..24851ec448 100644
--- a/reference/stream/functions/stream-wrapper-register.xml
+++ b/reference/stream/functions/stream-wrapper-register.xml
@@ -29,6 +29,7 @@
      <listitem>
       <para>
        The wrapper name to be registered.
+       Valid protocol names must contain alphanumerics, dots (.), plusses (+), or hyphens (-) only.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/stream/streamwrapper/construct.xml b/reference/stream/streamwrapper/construct.xml
index 8e3bd3fcdd..317aa16eb3 100644
--- a/reference/stream/streamwrapper/construct.xml
+++ b/reference/stream/streamwrapper/construct.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <methodname>streamWrapper::__construct</methodname>
+   <modifier>public</modifier> <methodname>streamWrapper::__construct</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/stream/streamwrapper/destruct.xml b/reference/stream/streamwrapper/destruct.xml
index 36cb403f72..f5a2a34a3f 100644
--- a/reference/stream/streamwrapper/destruct.xml
+++ b/reference/stream/streamwrapper/destruct.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <methodname>streamWrapper::__destruct</methodname>
+   <modifier>public</modifier> <methodname>streamWrapper::__destruct</methodname>
    <void />
   </methodsynopsis>
   <para>
@@ -25,6 +25,13 @@
   &no.function.parameters;
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/stream/streamwrapper/url-stat.xml b/reference/stream/streamwrapper/url-stat.xml
index 77b4378a7a..c02df1a168 100644
--- a/reference/stream/streamwrapper/url-stat.xml
+++ b/reference/stream/streamwrapper/url-stat.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>streamWrapper::url_stat</methodname>
+   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>streamWrapper::url_stat</methodname>
    <methodparam><type>string</type><parameter>path</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
@@ -118,10 +118,11 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Should return as many elements as <function>stat</function> does.
+   Should return an &array; with the same elements as <function>stat</function> does.
    Unknown or unavailable values should be set to a rational value
-   (usually <constant>0</constant>). Pay special attention to
+   (usually <constant>0</constant>). Special attention should be payed to
    <literal>mode</literal> as documented under <function>stat</function>.
+   Should return &false; on failure.
   </para>
  </refsect1>
 
diff --git a/reference/strings/functions/addslashes.xml b/reference/strings/functions/addslashes.xml
index ee191914ee..d57f50dc47 100644
--- a/reference/strings/functions/addslashes.xml
+++ b/reference/strings/functions/addslashes.xml
@@ -36,15 +36,6 @@ eval("echo '" . addslashes($str) . "';");
     </programlisting>
    </informalexample>
   </para>
-  <para>
-   Prior to PHP 5.4.0, the PHP directive <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>
-   was <literal>on</literal> by default and it essentially ran <function>addslashes</function>
-   on all GET, POST and COOKIE data.
-   <function>addslashes</function> must not be used on strings that have already
-   been escaped with <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>,
-   as the strings will be double escaped. <function>get_magic_quotes_gpc</function> can be used to check
-   if <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link> is <literal>on</literal>.
-  </para>
   <para>
    The <function>addslashes</function> is sometimes incorrectly used to try to prevent
    <link linkend="security.database.sql-injection">SQL Injection</link>. Instead,
diff --git a/reference/strings/functions/chr.xml b/reference/strings/functions/chr.xml
index 8a62753f13..6e0ec18d93 100644
--- a/reference/strings/functions/chr.xml
+++ b/reference/strings/functions/chr.xml
@@ -146,6 +146,7 @@ echo $str;
     <member><function>ord</function></member>
     <member>An <link xlink:href="&url.asciitable;">ASCII-table</link></member>
     <member><function>mb_chr</function></member>
+    <member><function>IntlChar::chr</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/strings/functions/chunk-split.xml b/reference/strings/functions/chunk-split.xml
index 95fd0b55db..b15ae65e81 100644
--- a/reference/strings/functions/chunk-split.xml
+++ b/reference/strings/functions/chunk-split.xml
@@ -84,7 +84,6 @@ $new_string = chunk_split(base64_encode($data));
    <simplelist>
     <member><function>str_split</function></member>
     <member><function>explode</function></member>
-    <member><function>split</function></member>
     <member><function>wordwrap</function></member>
     <member><link xlink:href="&url.rfc;2045">RFC 2045</link></member>
    </simplelist>
diff --git a/reference/strings/functions/echo.xml b/reference/strings/functions/echo.xml
index 12c3479026..41e5324c99 100644
--- a/reference/strings/functions/echo.xml
+++ b/reference/strings/functions/echo.xml
@@ -16,7 +16,7 @@
    Outputs one or more expressions, with no additional newlines or spaces.
   </simpara>
   <para>
-   <literal>echo</literal> is not a function but a language language construct.
+   <literal>echo</literal> is not a function but a language construct.
    Its arguments are a list of expressions following the <literal>echo</literal>
    keyword, separated by commas, and not delimited by parentheses.
    Unlike some other language constructs, <literal>echo</literal> does not have
diff --git a/reference/strings/functions/explode.xml b/reference/strings/functions/explode.xml
index 0bfc73ec4f..faaa8b9e3a 100644
--- a/reference/strings/functions/explode.xml
+++ b/reference/strings/functions/explode.xml
@@ -84,10 +84,37 @@
    contained in <parameter>string</parameter> and a negative
    <parameter>limit</parameter> is used, then an empty <type>array</type> will be
    returned, otherwise an <type>array</type> containing
-   <parameter>string</parameter> will be returned.
+   <parameter>string</parameter> will be returned. If <parameter>separator</parameter> 
+   values appear at the start or end of <parameter>string</parameter>, said values 
+   will be added as an empty <type>array</type> value either in the first or last 
+   position of the returned <type>array</type> respectively.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <function>explode</function> will now throw <classname>ValueError</classname>
+       when <parameter>separator</parameter> parameter is given an empty string
+       (<literal>""</literal>).
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -165,7 +192,7 @@ $str = 'one|two|three|four';
 // positive limit
 print_r(explode('|', $str, 2));
 
-// negative limit (since PHP 5.1)
+// negative limit
 print_r(explode('|', $str, -1));
 ?>
 ]]>
diff --git a/reference/strings/functions/localeconv.xml b/reference/strings/functions/localeconv.xml
index 8d8878a148..273e0da54c 100644
--- a/reference/strings/functions/localeconv.xml
+++ b/reference/strings/functions/localeconv.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/strings/functions/money-format.xml b/reference/strings/functions/money-format.xml
index e252f1c20c..3d297ed5dc 100644
--- a/reference/strings/functions/money-format.xml
+++ b/reference/strings/functions/money-format.xml
@@ -257,24 +257,6 @@
    </informaltable>
   </para>
  </refsect1>
- 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    The function <function>money_format</function> is only defined if
-    the system has strfmon capabilities.  For example, Windows does
-    not, so <function>money_format</function> is undefined in Windows.
-   </para>
-  </note>
-  <note>
-   <para>
-    The <constant>LC_MONETARY</constant> category of the locale settings,
-    affects the behavior of this function. Use <function>setlocale</function>
-    to set to the appropriate default locale before using this function.
-   </para>
-  </note>   
- </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
@@ -335,6 +317,24 @@ echo money_format($fmt, 1234.56) . "\n";
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    The function <function>money_format</function> is only defined if
+    the system has strfmon capabilities.  For example, Windows does
+    not, so <function>money_format</function> is undefined in Windows.
+   </para>
+  </note>
+  <note>
+   <para>
+    The <constant>LC_MONETARY</constant> category of the locale settings,
+    affects the behavior of this function. Use <function>setlocale</function>
+    to set to the appropriate default locale before using this function.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/strings/functions/ord.xml b/reference/strings/functions/ord.xml
index fbd4922d9c..da3931c3a8 100644
--- a/reference/strings/functions/ord.xml
+++ b/reference/strings/functions/ord.xml
@@ -97,6 +97,7 @@ Byte 3 of $str has value 152
     <member><function>chr</function></member>
     <member>An <link xlink:href="&url.asciitable;">ASCII-table</link></member>
     <member><function>mb_ord</function></member>
+    <member><function>IntlChar::ord</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/strings/functions/parse-str.xml b/reference/strings/functions/parse-str.xml
index 3fd56e3942..5d83027410 100644
--- a/reference/strings/functions/parse-str.xml
+++ b/reference/strings/functions/parse-str.xml
@@ -156,14 +156,6 @@ echo $output['My_Value']; // Something
     sources</link>.
    </para>
   </note>
-  <note>
-   <para>
-    The <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link> setting
-    affects the output of this function, as <function>parse_str</function> uses
-    the same mechanism that PHP uses to populate the <varname>$_GET</varname>,
-    <varname>$_POST</varname>, etc. variables.
-   </para>
-  </note>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/strings/functions/print.xml b/reference/strings/functions/print.xml
index 3aa3e4af75..7a63aed759 100644
--- a/reference/strings/functions/print.xml
+++ b/reference/strings/functions/print.xml
@@ -16,7 +16,7 @@
    Outputs <parameter>expression</parameter>.
   </para>
   <para>
-   <literal>print</literal> is not a function but a language language construct.
+   <literal>print</literal> is not a function but a language construct.
    Its argument is the expression following the <literal>print</literal> keyword,
    and is not delimited by parentheses.
   </para>
diff --git a/reference/strings/functions/quotemeta.xml b/reference/strings/functions/quotemeta.xml
index 55c6b04e27..5c44ac2559 100644
--- a/reference/strings/functions/quotemeta.xml
+++ b/reference/strings/functions/quotemeta.xml
@@ -59,7 +59,6 @@
     <member><function>nl2br</function></member>
     <member><function>stripslashes</function></member>
     <member><function>stripcslashes</function></member>
-    <member><function>ereg</function></member>
     <member><function>preg_quote</function></member>
    </simplelist>
   </para>
diff --git a/reference/strings/functions/setlocale.xml b/reference/strings/functions/setlocale.xml
index f6650dd77c..ca6dea0bd1 100644
--- a/reference/strings/functions/setlocale.xml
+++ b/reference/strings/functions/setlocale.xml
@@ -32,8 +32,7 @@
     <function>setlocale</function>. This happens due to other scripts
     running in different threads of the same process at the same time,
     changing the process-wide locale using <function>setlocale</function>.
-    On Windows, locale information is maintained per thread as of PHP 5.6.20 and
-    PHP 7.0.5, respectively.
+    On Windows, locale information is maintained per thread as of PHP 7.0.5.
    </para>
   </warning>
  </refsect1>
diff --git a/reference/strings/functions/str-getcsv.xml b/reference/strings/functions/str-getcsv.xml
index 8321ac9ae3..3f0bb519fa 100644
--- a/reference/strings/functions/str-getcsv.xml
+++ b/reference/strings/functions/str-getcsv.xml
@@ -46,7 +46,7 @@
      <term><parameter>separator</parameter></term>
      <listitem>
       <para>
-       Set the field delimiter (one character only).
+       Set the field delimiter (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -54,7 +54,7 @@
      <term><parameter>enclosure</parameter></term>
      <listitem>
       <para>
-       Set the field enclosure character (one character only).
+       Set the field enclosure character (one single-byte character only).
       </para>
      </listitem>
     </varlistentry>
@@ -62,7 +62,7 @@
      <term><parameter>escape</parameter></term>
      <listitem>
       <para>
-       Set the escape character (at most one character). Defaults as a backslash
+       Set the escape character (at most one single-byte character). Defaults as a backslash
        (<literal>\</literal>)
        An empty string (<literal>""</literal>) disables the proprietary escape mechanism.
       </para>
diff --git a/reference/strings/functions/str-word-count.xml b/reference/strings/functions/str-word-count.xml
index 51875b2712..3f5cc84c0a 100644
--- a/reference/strings/functions/str-word-count.xml
+++ b/reference/strings/functions/str-word-count.xml
@@ -28,6 +28,7 @@
    For the purpose of this function, 'word' is defined as a locale dependent
    string containing alphabetic characters, which also may contain, but not start
    with &quot;'&quot; and &quot;-&quot; characters.
+   Note that multibyte locales are not supported.
   </para>
  </refsect1>
 
@@ -183,7 +184,6 @@ Array
    <simplelist>
     <member><function>explode</function></member>
     <member><function>preg_split</function></member>
-    <member><function>split</function></member>
     <member><function>count_chars</function></member>
     <member><function>substr_count</function></member>
    </simplelist>
diff --git a/reference/strings/functions/strcasecmp.xml b/reference/strings/functions/strcasecmp.xml
index e26025bc3b..b702438fbb 100644
--- a/reference/strings/functions/strcasecmp.xml
+++ b/reference/strings/functions/strcasecmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strcasecmp">
+<refentry xml:id="function.strcasecmp" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>strcasecmp</refname>
   <refpurpose>Binary safe case-insensitive string comparison</refpurpose>
@@ -10,11 +10,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>strcasecmp</methodname>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string1</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <para>
    Binary safe case-insensitive string comparison.
+   The comparision is not locale aware; only ASCII letters are compared in a
+   case-insentive way.
   </para>
  </refsect1>
 
@@ -23,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>str1</parameter></term>
+     <term><parameter>string1</parameter></term>
      <listitem>
       <para>
        The first string
@@ -31,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str2</parameter></term>
+     <term><parameter>string2</parameter></term>
      <listitem>
       <para>
        The second string
@@ -45,9 +47,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &lt; 0 if <parameter>str1</parameter> is less than
-   <parameter>str2</parameter>; &gt; 0 if <parameter>str1</parameter>
-   is greater than <parameter>str2</parameter>, and 0 if they are
+   Returns &lt; 0 if <parameter>string1</parameter> is less than
+   <parameter>string2</parameter>; &gt; 0 if <parameter>string1</parameter>
+   is greater than <parameter>string2</parameter>, and 0 if they are
    equal.
   </para>
  </refsect1>
@@ -87,7 +89,6 @@ if (strcasecmp($var1, $var2) == 0) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/strings/functions/strcmp.xml b/reference/strings/functions/strcmp.xml
index 81f000f1d8..be1d2633c2 100644
--- a/reference/strings/functions/strcmp.xml
+++ b/reference/strings/functions/strcmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strcmp">
+<refentry xml:id="function.strcmp" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>strcmp</refname>
   <refpurpose>Binary safe string comparison</refpurpose>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>strcmp</methodname>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string1</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <simpara>
    Note that this comparison is case sensitive.
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>str1</parameter></term>
+     <term><parameter>string1</parameter></term>
      <listitem>
       <para>
        The first string.
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str2</parameter></term>
+     <term><parameter>string2</parameter></term>
      <listitem>
       <para>
        The second string.
@@ -45,9 +45,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &lt; 0 if <parameter>str1</parameter> is less than
-   <parameter>str2</parameter>; &gt; 0 if <parameter>str1</parameter>
-   is greater than <parameter>str2</parameter>, and 0 if they are
+   Returns &lt; 0 if <parameter>string1</parameter> is less than
+   <parameter>string2</parameter>; &gt; 0 if <parameter>string1</parameter>
+   is greater than <parameter>string2</parameter>, and 0 if they are
    equal.
   </para>
  </refsect1>
@@ -87,7 +87,6 @@ if (strcmp($var1, $var2) !== 0) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/strings/functions/strip-tags.xml b/reference/strings/functions/strip-tags.xml
index 18290d2a5e..fecf3c2fd7 100644
--- a/reference/strings/functions/strip-tags.xml
+++ b/reference/strings/functions/strip-tags.xml
@@ -49,8 +49,7 @@
       </note>
       <note>
        <para>
-        In PHP 5.3.4 and later, self-closing
-        XHTML tags are ignored and only non-self-closing tags should be used in
+        Self-closing XHTML tags are ignored and only non-self-closing tags should be used in
         <parameter>allowed_tags</parameter>. For example,
         to allow both <literal>&lt;br&gt;</literal> and
         <literal>&lt;br/&gt;</literal>, you should use:
diff --git a/reference/strings/functions/stripslashes.xml b/reference/strings/functions/stripslashes.xml
index ee23f1b934..1d4f54dbce 100644
--- a/reference/strings/functions/stripslashes.xml
+++ b/reference/strings/functions/stripslashes.xml
@@ -16,9 +16,7 @@
    Un-quotes a quoted string.
   </para>
   <para>
-   An example use of <function>stripslashes</function> is when the PHP
-   directive <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>
-   is <literal>on</literal> (it was on by default before PHP 5.4), and you aren't inserting
+   <function>stripslashes</function> can be used if you aren't inserting
    this data into a place (such as a database) that requires escaping.
    For example, if you're simply outputting data straight from an HTML form.
   </para>
diff --git a/reference/strings/functions/stristr.xml b/reference/strings/functions/stristr.xml
index 0c91232e6b..6ebea767a1 100644
--- a/reference/strings/functions/stristr.xml
+++ b/reference/strings/functions/stristr.xml
@@ -104,7 +104,7 @@
 <?php
   $email = 'USER@EXAMPLE.com';
   echo stristr($email, 'e'); // outputs ER@EXAMPLE.com
-  echo stristr($email, 'e', true); // As of PHP 5.3.0, outputs US
+  echo stristr($email, 'e', true); // outputs US
 ?>
 ]]>
     </programlisting>
diff --git a/reference/strings/functions/strncasecmp.xml b/reference/strings/functions/strncasecmp.xml
index 6fc5f6e3f9..ffb0872bae 100644
--- a/reference/strings/functions/strncasecmp.xml
+++ b/reference/strings/functions/strncasecmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strncasecmp">
+<refentry xml:id="function.strncasecmp" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>strncasecmp</refname>
   <refpurpose>Binary safe case-insensitive string comparison of the first n characters</refpurpose>
@@ -10,9 +10,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>strncasecmp</methodname>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>len</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string1</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string2</parameter></methodparam>
+   <methodparam><type>int</type><parameter>length</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function is similar to <function>strcasecmp</function>, with the
@@ -26,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>str1</parameter></term>
+     <term><parameter>string1</parameter></term>
      <listitem>
       <para>
        The first string.
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str2</parameter></term>
+     <term><parameter>string2</parameter></term>
      <listitem>
       <para>
        The second string.
@@ -42,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>len</parameter></term>
+     <term><parameter>length</parameter></term>
      <listitem>
       <para>
        The length of strings to be used in the comparison.
@@ -56,9 +56,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &lt; 0 if <parameter>str1</parameter> is less than
-   <parameter>str2</parameter>; &gt; 0 if <parameter>str1</parameter> is
-   greater than <parameter>str2</parameter>, and 0 if they are equal.
+   Returns &lt; 0 if <parameter>string1</parameter> is less than
+   <parameter>string2</parameter>; &gt; 0 if <parameter>string1</parameter> is
+   greater than <parameter>string2</parameter>, and 0 if they are equal.
   </para>
  </refsect1>
 
@@ -77,7 +77,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/strings/functions/strncmp.xml b/reference/strings/functions/strncmp.xml
index c4d8db0329..d10c5052c5 100644
--- a/reference/strings/functions/strncmp.xml
+++ b/reference/strings/functions/strncmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strncmp">
+<refentry xml:id="function.strncmp" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>strncmp</refname>
   <refpurpose>Binary safe string comparison of the first n characters</refpurpose>
@@ -10,9 +10,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>strncmp</methodname>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>len</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string1</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string2</parameter></methodparam>
+   <methodparam><type>int</type><parameter>length</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function is similar to <function>strcmp</function>, with the
@@ -29,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>str1</parameter></term>
+     <term><parameter>string1</parameter></term>
      <listitem>
       <para>
        The first string.
@@ -37,7 +37,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str2</parameter></term>
+     <term><parameter>string2</parameter></term>
      <listitem>
       <para>
        The second string.
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>len</parameter></term>
+     <term><parameter>length</parameter></term>
      <listitem>
       <para>
        Number of characters to use in the comparison.
@@ -59,9 +59,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &lt; 0 if <parameter>str1</parameter> is less than
-   <parameter>str2</parameter>; &gt; 0 if <parameter>str1</parameter>
-   is greater than <parameter>str2</parameter>, and 0 if they are
+   Returns &lt; 0 if <parameter>string1</parameter> is less than
+   <parameter>string2</parameter>; &gt; 0 if <parameter>string1</parameter>
+   is greater than <parameter>string2</parameter>, and 0 if they are
    equal.
   </para>
  </refsect1>
@@ -81,7 +81,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/strings/functions/strstr.xml b/reference/strings/functions/strstr.xml
index 5860642784..4a84dc1232 100644
--- a/reference/strings/functions/strstr.xml
+++ b/reference/strings/functions/strstr.xml
@@ -116,7 +116,7 @@ $email  = 'name@example.com';
 $domain = strstr($email, '@');
 echo $domain; // prints @example.com
 
-$user = strstr($email, '@', true); // As of PHP 5.3.0
+$user = strstr($email, '@', true);
 echo $user; // prints name
 ?>
 ]]>
diff --git a/reference/strings/functions/strtok.xml b/reference/strings/functions/strtok.xml
index 86e3d90595..692dd60a59 100644
--- a/reference/strings/functions/strtok.xml
+++ b/reference/strings/functions/strtok.xml
@@ -36,6 +36,22 @@
    tokenized when any one of the characters in the <parameter>token</parameter> argument is
    found.
   </para>
+  <note>
+   <para>
+    This function behaves slightly different from what one may expect being
+    familiar with <function>explode</function>. 
+    First, a sequence of two or more contiguous <parameter>token</parameter>
+    characters in the parsed string is considered to be a single delimiter. 
+    Also, a <parameter>token</parameter> situated at the start or end of the
+    string is ignored.
+    For example, if a string <literal>";aaa;;bbb;"</literal> is used, successive
+    calls to <function>strtok</function> with <literal>";"</literal> as a
+    <parameter>token</parameter> would return strings
+    "aaa" and "bbb", and then &false;.
+    As a result, the string will be split into only two elements, while
+    <literal>explode(";", $string)</literal> would return an array of 5 elements.
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -107,6 +123,35 @@ var_dump($first_token, $second_token);
 <![CDATA[
     string(9) "something"
     bool(false)
+]]>
+    </screen>
+   </example>
+  </para>
+  <para>
+   <example>
+    <title>The difference between <function>strtok</function> and <function>explode</function></title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+$string = ";aaa;;bbb;";
+
+$parts = [];
+$tok = strtok($string, ";");
+while ($tok !== false) {
+    $parts[] = $tok;
+    $tok = strtok(";");
+}
+echo json_encode($parts),"\n";
+
+$parts = explode(";", $string);
+echo json_encode($parts),"\n";
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+["aaa","bbb"]
+["","aaa","","bbb",""]
 ]]>
     </screen>
    </example>
@@ -123,7 +168,6 @@ var_dump($first_token, $second_token);
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>split</function></member>
     <member><function>explode</function></member>
    </simplelist>
   </para>
diff --git a/reference/strings/functions/substr.xml b/reference/strings/functions/substr.xml
index 61215db751..7c8315b45f 100644
--- a/reference/strings/functions/substr.xml
+++ b/reference/strings/functions/substr.xml
@@ -122,6 +122,22 @@ $rest = substr("abcdef", -3, -1); // returns "de"
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Returns &false; on error.
+   <example>
+    <programlisting role="php">
+     <![CDATA[
+<?php
+var_dump(substr('a', 2)); // bool(false)
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -196,7 +212,7 @@ echo "7) ".var_export(substr(1.2e3, 0, 4), true).PHP_EOL;
 ?>
 ]]>
     </programlisting>
-    &example.outputs.7;
+    &example.outputs;
     <screen>
 <![CDATA[
 1) 'pe'
@@ -206,40 +222,12 @@ echo "7) ".var_export(substr(1.2e3, 0, 4), true).PHP_EOL;
 5) ''
 6) ''
 7) '1200'
-]]>
-    </screen>
-    &example.outputs.5;
-    <screen>
-<![CDATA[
-1) 'pe'
-2) '54'
-3) 'gr'
-4) '1'
-5) false
-6) false
-7) '1200'
 ]]>
     </screen>
    </example>
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Returns &false; on error.
-   <example>
-    <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(substr('a', 2)); // bool(false)
-?>
-]]>
-    </programlisting>
-   </example>   
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/strings/functions/ucwords.xml b/reference/strings/functions/ucwords.xml
index 3bf7b89126..79d7a9b5af 100644
--- a/reference/strings/functions/ucwords.xml
+++ b/reference/strings/functions/ucwords.xml
@@ -18,9 +18,9 @@
    <parameter>string</parameter> capitalized, if that character is alphabetic.
   </para>
   <para>
-   The definition of a word is any string of characters that is immediately
-   after any character listed in the <parameter>separators</parameter> parameter
-   (By default these are: space, form-feed, newline, carriage return, horizontal tab, and vertical tab).
+   For this function, a word is a string of characters that are not listed in 
+   the <parameter>separators</parameter> parameter. By default, these are: 
+   space, horizontal tab, carriage return, newline, form-feed and vertical tab.
   </para>
  </refsect1>
 
diff --git a/reference/suhosin/book.xml b/reference/suhosin/book.xml
deleted file mode 100644
index aaa73e7d0f..0000000000
--- a/reference/suhosin/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.suhosin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Suhosin extension</title>
- <titleabbrev>Suhosin</titleabbrev>
-
- <preface xml:id="intro.suhosin">
-  &reftitle.intro;
-  <para>
-   <!-- Copied from http://www.hardened-php.net/suhosin/ -->
-   <link xlink:href="&url.suhosin;">Suhosin</link> is an advanced protection
-   system for PHP installations. It was designed to protect servers and users
-   from known and unknown flaws in PHP applications and the PHP core.
-  </para>
- </preface>
-
- &reference.suhosin.setup;
- &reference.suhosin.constants;
- &reference.suhosin.reference;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/configure.xml b/reference/suhosin/configure.xml
deleted file mode 100644
index 895649f92e..0000000000
--- a/reference/suhosin/configure.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="suhosin.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  Some Linux distributions have Suhosin packages. There are also <link
-  xlink:href="&url.suhosin.install;">detailed installation instructions</link>.
- </para>
-
- <para>
-  There is no official Windows release.
- </para>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/constants.xml b/reference/suhosin/constants.xml
deleted file mode 100644
index 1cd3c216e6..0000000000
--- a/reference/suhosin/constants.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="suhosin.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.s-memory">
-   <term>
-    <constant>S_MEMORY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-vars">
-   <term>
-    <constant>S_VARS</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-files">
-   <term>
-    <constant>S_FILES</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-include">
-   <term>
-    <constant>S_INCLUDE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-sql">
-   <term>
-    <constant>S_SQL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-executor">
-   <term>
-    <constant>S_EXECUTOR</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-mail">
-   <term>
-    <constant>S_MAIL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-session">
-   <term>
-    <constant>S_SESSION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-misc">
-   <term>
-    <constant>S_MISC</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-internal">
-   <term>
-    <constant>S_INTERNAL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-all">
-   <term>
-    <constant>S_ALL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/functions/sha256-file.xml b/reference/suhosin/functions/sha256-file.xml
deleted file mode 100644
index 2ef89bb829..0000000000
--- a/reference/suhosin/functions/sha256-file.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.sha256-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>sha256_file</refname>
-  <refpurpose>Calculate the sha256 hash of given filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>sha256_file</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>raw_output</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       Name of the file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>raw_output</parameter></term>
-     <listitem>
-      <para>
-       Whether to return raw binary format (32 bytes).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the hash&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function is available only with Suhosin extension. You can also use
-    <function>hash_file</function> function with "sha256" algorithm.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sha256</function></member>
-    <member><function>hash_file</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/functions/sha256.xml b/reference/suhosin/functions/sha256.xml
deleted file mode 100644
index ed01802f46..0000000000
--- a/reference/suhosin/functions/sha256.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.sha256" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>sha256</refname>
-  <refpurpose>Calculate the sha256 hash of a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>sha256</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>raw_output</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-       The string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>raw_output</parameter></term>
-     <listitem>
-      <para>
-       Whether to return raw binary format (32 bytes).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the hash&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function is available only with Suhosin extension. You can also use
-    <function>hash</function> function with "sha256" algorithm.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sha256_file</function></member>
-    <member><function>hash</function></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/functions/suhosin-encrypt-cookie.xml b/reference/suhosin/functions/suhosin-encrypt-cookie.xml
deleted file mode 100644
index 600a501b36..0000000000
--- a/reference/suhosin/functions/suhosin-encrypt-cookie.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.suhosin-encrypt-cookie" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>suhosin_encrypt_cookie</refname>
-  <refpurpose>Encrypts a cookie value according to current cookie encrpytion setting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>suhosin_encrypt_cookie</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Cookie name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Cookie value.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the encrypted string&return.falseforfailure;.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/ini.xml b/reference/suhosin/ini.xml
deleted file mode 100644
index f39d4ad427..0000000000
--- a/reference/suhosin/ini.xml
+++ /dev/null
@@ -1,1726 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="suhosin.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Suhosin &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.syslog">suhosin.log.syslog</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.syslog.facility">suhosin.log.syslog.facility</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.syslog.priority">suhosin.log.syslog.priority</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.sapi">suhosin.log.sapi</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.script">suhosin.log.script</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.script.name">suhosin.log.script.name</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.use-x-forwarded-for">suhosin.log.use-x-forwarded-for</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.phpscript">suhosin.log.phpscript</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.phpscript.name">suhosin.log.phpscript.name</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.file">suhosin.log.file</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.file.name">suhosin.log.file.name</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.log.phpscript.is_safe">suhosin.log.phpscript.is_safe</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.perdir">suhosin.perdir</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.include.max_traversal">suhosin.executor.include.max_traversal</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.include.whitelist">suhosin.executor.include.whitelist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.include.blacklist">suhosin.executor.include.blacklist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.include.allow_writable_files">suhosin.executor.include.allow_writable_files</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.eval.whitelist">suhosin.executor.eval.whitelist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.eval.blacklist">suhosin.executor.eval.blacklist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.func.whitelist">suhosin.executor.func.whitelist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.func.blacklist">suhosin.executor.func.blacklist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.disable_eval">suhosin.executor.disable_eval</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.disable_emodifier">suhosin.executor.disable_emodifier</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.allow_symlink">suhosin.executor.allow_symlink</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.executor.max_depth">suhosin.executor.max_depth</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.multiheader">suhosin.multiheader</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.mail.protect">suhosin.mail.protect</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.memory_limit">suhosin.memory_limit</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.simulation">suhosin.simulation</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.filter.action">suhosin.filter.action</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.protectkey">suhosin.protectkey</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.coredump">suhosin.coredump</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.stealth">suhosin.stealth</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.apc_bug_workaround">suhosin.apc_bug_workaround</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.disable.display_errors">suhosin.disable.display_errors</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_SYSTEM</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.max_vars">suhosin.request.max_vars</link></entry>
-      <entry>1000</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.max_varname_length">suhosin.request.max_varname_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.max_value_length">suhosin.request.max_value_length</link></entry>
-      <entry>1000000</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.max_array_depth">suhosin.request.max_array_depth</link></entry>
-      <entry>50</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.max_totalname_length">suhosin.request.max_totalname_length</link></entry>
-      <entry>256</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.max_array_index_length">suhosin.request.max_array_index_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.disallow_nul">suhosin.request.disallow_nul</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.request.disallow_ws">suhosin.request.disallow_ws</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.max_vars">suhosin.cookie.max_vars</link></entry>
-      <entry>100</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.max_name_length">suhosin.cookie.max_name_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.max_totalname_length">suhosin.cookie.max_totalname_length</link></entry>
-      <entry>256</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.max_value_length">suhosin.cookie.max_value_length</link></entry>
-      <entry>10000</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.max_array_depth">suhosin.cookie.max_array_depth</link></entry>
-      <entry>50</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.max_array_index_length">suhosin.cookie.max_array_index_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.disallow_nul">suhosin.cookie.disallow_nul</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.disallow_ws">suhosin.cookie.disallow_ws</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.max_vars">suhosin.get.max_vars</link></entry>
-      <entry>100</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.max_name_length">suhosin.get.max_name_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.max_totalname_length">suhosin.get.max_totalname_length</link></entry>
-      <entry>256</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.max_value_length">suhosin.get.max_value_length</link></entry>
-      <entry>512</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.max_array_depth">suhosin.get.max_array_depth</link></entry>
-      <entry>50</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.max_array_index_length">suhosin.get.max_array_index_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.disallow_nul">suhosin.get.disallow_nul</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.get.disallow_ws">suhosin.get.disallow_ws</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.max_vars">suhosin.post.max_vars</link></entry>
-      <entry>1000</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.max_name_length">suhosin.post.max_name_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.max_totalname_length">suhosin.post.max_totalname_length</link></entry>
-      <entry>256</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.max_value_length">suhosin.post.max_value_length</link></entry>
-      <entry>1000000</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.max_array_depth">suhosin.post.max_array_depth</link></entry>
-      <entry>50</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.max_array_index_length">suhosin.post.max_array_index_length</link></entry>
-      <entry>64</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.disallow_nul">suhosin.post.disallow_nul</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.post.disallow_ws">suhosin.post.disallow_ws</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.upload.max_uploads">suhosin.upload.max_uploads</link></entry>
-      <entry>25</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.upload.disallow_elf">suhosin.upload.disallow_elf</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.upload.disallow_binary">suhosin.upload.disallow_binary</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.upload.remove_binary">suhosin.upload.remove_binary</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.upload.verification_script">suhosin.upload.verification_script</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.bailout_on_error">suhosin.sql.bailout_on_error</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.user_prefix">suhosin.sql.user_prefix</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.user_postfix">suhosin.sql.user_postfix</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.comment">suhosin.sql.comment</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.opencomment">suhosin.sql.opencomment</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.multiselect">suhosin.sql.multiselect</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.sql.union">suhosin.sql.union</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.encrypt">suhosin.session.encrypt</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.cryptkey">suhosin.session.cryptkey</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.cryptua">suhosin.session.cryptua</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.cryptdocroot">suhosin.session.cryptdocroot</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.cryptraddr">suhosin.session.cryptraddr</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.checkraddr">suhosin.session.checkraddr</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.session.max_id_length">suhosin.session.max_id_length</link></entry>
-      <entry>128</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.encrypt">suhosin.cookie.encrypt</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.cryptkey">suhosin.cookie.cryptkey</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.cryptua">suhosin.cookie.cryptua</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.cryptdocroot">suhosin.cookie.cryptdocroot</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.cryptraddr">suhosin.cookie.cryptraddr</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.checkraddr">suhosin.cookie.checkraddr</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.cryptlist">suhosin.cookie.cryptlist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.cookie.plainlist">suhosin.cookie.plainlist</link></entry>
-      <entry></entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.server.encode">suhosin.server.encode</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.server.strip">suhosin.server.strip</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.srand.ignore">suhosin.srand.ignore</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link xlink:href="&url.suhosin.configuration;#suhosin.mt_srand.ignore">suhosin.mt_srand.ignore</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.suhosin.log.syslog">
-     <term>
-      <parameter>suhosin.log.syslog</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.syslog.facility">
-     <term>
-      <parameter>suhosin.log.syslog.facility</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.syslog.priority">
-     <term>
-      <parameter>suhosin.log.syslog.priority</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.sapi">
-     <term>
-      <parameter>suhosin.log.sapi</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.script">
-     <term>
-      <parameter>suhosin.log.script</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.script.name">
-     <term>
-      <parameter>suhosin.log.script.name</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.use-x-forwarded-for">
-     <term>
-      <parameter>suhosin.log.use-x-forwarded-for</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.phpscript">
-     <term>
-      <parameter>suhosin.log.phpscript</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.phpscript.name">
-     <term>
-      <parameter>suhosin.log.phpscript.name</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.file">
-     <term>
-      <parameter>suhosin.log.file</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.file.name">
-     <term>
-      <parameter>suhosin.log.file.name</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.log.phpscript.is-safe">
-     <term>
-      <parameter>suhosin.log.phpscript.is_safe</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.perdir">
-     <term>
-      <parameter>suhosin.perdir</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.include.max-traversal">
-     <term>
-      <parameter>suhosin.executor.include.max_traversal</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.include.whitelist">
-     <term>
-      <parameter>suhosin.executor.include.whitelist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.include.blacklist">
-     <term>
-      <parameter>suhosin.executor.include.blacklist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.include.allow-writable-files">
-     <term>
-      <parameter>suhosin.executor.include.allow_writable_files</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.eval.whitelist">
-     <term>
-      <parameter>suhosin.executor.eval.whitelist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.eval.blacklist">
-     <term>
-      <parameter>suhosin.executor.eval.blacklist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.func.whitelist">
-     <term>
-      <parameter>suhosin.executor.func.whitelist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.func.blacklist">
-     <term>
-      <parameter>suhosin.executor.func.blacklist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.disable-eval">
-     <term>
-      <parameter>suhosin.executor.disable_eval</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.disable-emodifier">
-     <term>
-      <parameter>suhosin.executor.disable_emodifier</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.allow-symlink">
-     <term>
-      <parameter>suhosin.executor.allow_symlink</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.executor.max-depth">
-     <term>
-      <parameter>suhosin.executor.max_depth</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.multiheader">
-     <term>
-      <parameter>suhosin.multiheader</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.mail.protect">
-     <term>
-      <parameter>suhosin.mail.protect</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.memory-limit">
-     <term>
-      <parameter>suhosin.memory_limit</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.simulation">
-     <term>
-      <parameter>suhosin.simulation</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.filter.action">
-     <term>
-      <parameter>suhosin.filter.action</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.protectkey">
-     <term>
-      <parameter>suhosin.protectkey</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.coredump">
-     <term>
-      <parameter>suhosin.coredump</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.stealth">
-     <term>
-      <parameter>suhosin.stealth</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.apc-bug-workaround">
-     <term>
-      <parameter>suhosin.apc_bug_workaround</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.disable.display-errors">
-     <term>
-      <parameter>suhosin.disable.display_errors</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.max-vars">
-     <term>
-      <parameter>suhosin.request.max_vars</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.max-varname-length">
-     <term>
-      <parameter>suhosin.request.max_varname_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.max-value-length">
-     <term>
-      <parameter>suhosin.request.max_value_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.max-array-depth">
-     <term>
-      <parameter>suhosin.request.max_array_depth</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.max-totalname-length">
-     <term>
-      <parameter>suhosin.request.max_totalname_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.max-array-index-length">
-     <term>
-      <parameter>suhosin.request.max_array_index_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.disallow-nul">
-     <term>
-      <parameter>suhosin.request.disallow_nul</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.request.disallow-ws">
-     <term>
-      <parameter>suhosin.request.disallow_ws</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.max-vars">
-     <term>
-      <parameter>suhosin.cookie.max_vars</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.max-name-length">
-     <term>
-      <parameter>suhosin.cookie.max_name_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.max-totalname-length">
-     <term>
-      <parameter>suhosin.cookie.max_totalname_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.max-value-length">
-     <term>
-      <parameter>suhosin.cookie.max_value_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.max-array-depth">
-     <term>
-      <parameter>suhosin.cookie.max_array_depth</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.max-array-index-length">
-     <term>
-      <parameter>suhosin.cookie.max_array_index_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.disallow-nul">
-     <term>
-      <parameter>suhosin.cookie.disallow_nul</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.disallow-ws">
-     <term>
-      <parameter>suhosin.cookie.disallow_ws</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.max-vars">
-     <term>
-      <parameter>suhosin.get.max_vars</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.max-name-length">
-     <term>
-      <parameter>suhosin.get.max_name_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.max-totalname-length">
-     <term>
-      <parameter>suhosin.get.max_totalname_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.max-value-length">
-     <term>
-      <parameter>suhosin.get.max_value_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.max-array-depth">
-     <term>
-      <parameter>suhosin.get.max_array_depth</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.max-array-index-length">
-     <term>
-      <parameter>suhosin.get.max_array_index_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.disallow-nul">
-     <term>
-      <parameter>suhosin.get.disallow_nul</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.get.disallow-ws">
-     <term>
-      <parameter>suhosin.get.disallow_ws</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.max-vars">
-     <term>
-      <parameter>suhosin.post.max_vars</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.max-name-length">
-     <term>
-      <parameter>suhosin.post.max_name_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.max-totalname-length">
-     <term>
-      <parameter>suhosin.post.max_totalname_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.max-value-length">
-     <term>
-      <parameter>suhosin.post.max_value_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.max-array-depth">
-     <term>
-      <parameter>suhosin.post.max_array_depth</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.max-array-index-length">
-     <term>
-      <parameter>suhosin.post.max_array_index_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.disallow-nul">
-     <term>
-      <parameter>suhosin.post.disallow_nul</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.post.disallow-ws">
-     <term>
-      <parameter>suhosin.post.disallow_ws</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.upload.max-uploads">
-     <term>
-      <parameter>suhosin.upload.max_uploads</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.upload.disallow-elf">
-     <term>
-      <parameter>suhosin.upload.disallow_elf</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.upload.disallow-binary">
-     <term>
-      <parameter>suhosin.upload.disallow_binary</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.upload.remove-binary">
-     <term>
-      <parameter>suhosin.upload.remove_binary</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.upload.verification-script">
-     <term>
-      <parameter>suhosin.upload.verification_script</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.bailout-on-error">
-     <term>
-      <parameter>suhosin.sql.bailout_on_error</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.user-prefix">
-     <term>
-      <parameter>suhosin.sql.user_prefix</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.user-postfix">
-     <term>
-      <parameter>suhosin.sql.user_postfix</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.comment">
-     <term>
-      <parameter>suhosin.sql.comment</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.opencomment">
-     <term>
-      <parameter>suhosin.sql.opencomment</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.multiselect">
-     <term>
-      <parameter>suhosin.sql.multiselect</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.sql.union">
-     <term>
-      <parameter>suhosin.sql.union</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.encrypt">
-     <term>
-      <parameter>suhosin.session.encrypt</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.cryptkey">
-     <term>
-      <parameter>suhosin.session.cryptkey</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.cryptua">
-     <term>
-      <parameter>suhosin.session.cryptua</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.cryptdocroot">
-     <term>
-      <parameter>suhosin.session.cryptdocroot</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.cryptraddr">
-     <term>
-      <parameter>suhosin.session.cryptraddr</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.checkraddr">
-     <term>
-      <parameter>suhosin.session.checkraddr</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.session.max-id-length">
-     <term>
-      <parameter>suhosin.session.max_id_length</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.encrypt">
-     <term>
-      <parameter>suhosin.cookie.encrypt</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.cryptkey">
-     <term>
-      <parameter>suhosin.cookie.cryptkey</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.cryptua">
-     <term>
-      <parameter>suhosin.cookie.cryptua</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.cryptdocroot">
-     <term>
-      <parameter>suhosin.cookie.cryptdocroot</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.cryptraddr">
-     <term>
-      <parameter>suhosin.cookie.cryptraddr</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.checkraddr">
-     <term>
-      <parameter>suhosin.cookie.checkraddr</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.cryptlist">
-     <term>
-      <parameter>suhosin.cookie.cryptlist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.cookie.plainlist">
-     <term>
-      <parameter>suhosin.cookie.plainlist</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.server.encode">
-     <term>
-      <parameter>suhosin.server.encode</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.server.strip">
-     <term>
-      <parameter>suhosin.server.strip</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.srand.ignore">
-     <term>
-      <parameter>suhosin.srand.ignore</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.suhosin.mt-srand.ignore">
-     <term>
-      <parameter>suhosin.mt_srand.ignore</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-
-  </variablelist>
- </para>
- 
- <para>
-  There is a detailed <link
-  xlink:href="&url.suhosin.configuration;">description of configuration
-  directives</link> on the project's web.
- </para>
- 
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/reference.xml b/reference/suhosin/reference.xml
deleted file mode 100644
index 34526e9928..0000000000
--- a/reference/suhosin/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.suhosin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Suhosin &Functions;</title>
-
- &reference.suhosin.entities.functions;
-
-</reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/setup.xml b/reference/suhosin/setup.xml
deleted file mode 100644
index 5bbedd7428..0000000000
--- a/reference/suhosin/setup.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="suhosin.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="suhosin.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
-
- &reference.suhosin.configure;
- 
- &reference.suhosin.ini;
-
- <section xml:id="suhosin.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/suhosin/versions.xml b/reference/suhosin/versions.xml
deleted file mode 100644
index 9f45670a1a..0000000000
--- a/reference/suhosin/versions.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-
-<versions>
- <!-- Functions -->
- <function name='sha256' from='Suhosin &gt;= Unknown'/>
- <function name='sha256_file' from='Suhosin &gt;= Unknown'/>
- <function name='suhosin_encrypt_cookie' from='Suhosin &gt;= 0.9.9'/>
- <function name='suhosin_get_raw_cookies' from='Suhosin &gt;= 0.9.9'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/svm/book.xml b/reference/svm/book.xml
index 09217667dc..2b0949168f 100644
--- a/reference/svm/book.xml
+++ b/reference/svm/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.svm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Support Vector Machine</title>
  <titleabbrev>SVM</titleabbrev>
 
diff --git a/reference/svn/book.xml b/reference/svn/book.xml
index a8f5c0efc5..07847a7e70 100644
--- a/reference/svn/book.xml
+++ b/reference/svn/book.xml
@@ -3,6 +3,7 @@
 <!-- State: new --> 
 
 <book xml:id="book.svn" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Subversion</title>
  <titleabbrev>SVN</titleabbrev>
  
diff --git a/reference/svn/functions/svn-add.xml b/reference/svn/functions/svn-add.xml
index 23ac373ea3..13443be214 100644
--- a/reference/svn/functions/svn-add.xml
+++ b/reference/svn/functions/svn-add.xml
@@ -65,11 +65,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -134,6 +129,11 @@ svn_add('foobar.txt');
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-auth-set-parameter.xml b/reference/svn/functions/svn-auth-set-parameter.xml
index 41eba1fd40..025e812afc 100644
--- a/reference/svn/functions/svn-auth-set-parameter.xml
+++ b/reference/svn/functions/svn-auth-set-parameter.xml
@@ -54,11 +54,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -113,6 +108,11 @@ svn_auth_set_parameter(SVN_AUTH_PARAM_DEFAULT_PASSWORD, 'abc123');
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-cat.xml b/reference/svn/functions/svn-cat.xml
index 35bdde770e..0e07613552 100644
--- a/reference/svn/functions/svn-cat.xml
+++ b/reference/svn/functions/svn-cat.xml
@@ -53,11 +53,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -110,6 +105,11 @@ $contents = svn_cat('http://www.example.com/svnroot/calc/gui.c', 28)
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-checkout.xml b/reference/svn/functions/svn-checkout.xml
index 0a56e74a21..0582d3e5a0 100644
--- a/reference/svn/functions/svn-checkout.xml
+++ b/reference/svn/functions/svn-checkout.xml
@@ -71,11 +71,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -135,6 +130,11 @@ svn_checkout('http://www.example.com/svnroot/calc/trunk', dirname(__FILE__) . '/
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-cleanup.xml b/reference/svn/functions/svn-cleanup.xml
index e1eb8c7b4d..48c3fa84fe 100644
--- a/reference/svn/functions/svn-cleanup.xml
+++ b/reference/svn/functions/svn-cleanup.xml
@@ -43,11 +43,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -105,6 +100,11 @@ svn_cleanup(realpath('help-me'));
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-client-version.xml b/reference/svn/functions/svn-client-version.xml
index 7728f54287..5c4f7267a8 100644
--- a/reference/svn/functions/svn-client-version.xml
+++ b/reference/svn/functions/svn-client-version.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -24,11 +29,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -84,6 +84,11 @@ echo svn_client_version();
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <!-- Use when adding See Also links
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/svn/functions/svn-commit.xml b/reference/svn/functions/svn-commit.xml
index d393ec6df7..5c30d08e16 100644
--- a/reference/svn/functions/svn-commit.xml
+++ b/reference/svn/functions/svn-commit.xml
@@ -89,11 +89,6 @@ array(
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -160,6 +155,11 @@ array(
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-diff.xml b/reference/svn/functions/svn-diff.xml
index 9b729fbe09..6d664523ee 100644
--- a/reference/svn/functions/svn-diff.xml
+++ b/reference/svn/functions/svn-diff.xml
@@ -96,11 +96,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -215,6 +210,11 @@ function svn_diff_local($path1, $rev1, $path2, $rev2) {
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-import.xml b/reference/svn/functions/svn-import.xml
index 8611c8b56a..9c95764ba4 100644
--- a/reference/svn/functions/svn-import.xml
+++ b/reference/svn/functions/svn-import.xml
@@ -62,11 +62,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -121,6 +116,11 @@ svn_import(realpath('new-files'), 'http://www.example.com/svnroot/incoming/abc',
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-log.xml b/reference/svn/functions/svn-log.xml
index afec7dc0ab..9136f77ff1 100644
--- a/reference/svn/functions/svn-log.xml
+++ b/reference/svn/functions/svn-log.xml
@@ -150,11 +150,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -227,6 +222,11 @@ Array
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-ls.xml b/reference/svn/functions/svn-ls.xml
index c74572642a..844b2868e1 100644
--- a/reference/svn/functions/svn-ls.xml
+++ b/reference/svn/functions/svn-ls.xml
@@ -84,11 +84,6 @@
     </screen>
   </para>
  </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
  
  <refsect1 role="examples">
   &reftitle.examples;
@@ -133,6 +128,11 @@ Array
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/svn/functions/svn-status.xml b/reference/svn/functions/svn-status.xml
index 06c9aaada1..fc5b92ccc5 100644
--- a/reference/svn/functions/svn-status.xml
+++ b/reference/svn/functions/svn-status.xml
@@ -287,11 +287,6 @@ if (!defined('svn_wc_schedule_normal')) {
   </variablelist>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -369,6 +364,11 @@ Array (
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/svn/functions/svn-update.xml b/reference/svn/functions/svn-update.xml
index 999e833596..80ceb92298 100644
--- a/reference/svn/functions/svn-update.xml
+++ b/reference/svn/functions/svn-update.xml
@@ -61,11 +61,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
  <!-- Use when ERRORS exist
  <refsect1 role="errors">
   &reftitle.errors;
@@ -124,6 +119,11 @@ echo svn_update(realpath('working-copy'));
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &warn.experimental.func;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/swoole/book.xml b/reference/swoole/book.xml
index 9a4e3392bf..79a4b0c7ab 100644
--- a/reference/swoole/book.xml
+++ b/reference/swoole/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.swoole" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Swoole</title>
  
  <!-- {{{ preface -->
@@ -76,4 +77,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/swoole/constants.xml b/reference/swoole/constants.xml
index c1eae5f76f..782618020e 100644
--- a/reference/swoole/constants.xml
+++ b/reference/swoole/constants.xml
@@ -406,6 +406,90 @@
      </simpara>
     </listitem>
    </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-debug">
+    <term>
+     <constant>SWOOLE_LOG_DEBUG</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      Debug log.
+      Available as of swoole 2.1.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-trace">
+    <term>
+     <constant>SWOOLE_LOG_TRACE</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      Trace log.
+      Available as of swoole 2.1.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-info">
+    <term>
+     <constant>SWOOLE_LOG_INFO</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      Info log.
+      Available as of swoole 2.1.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-notice">
+    <term>
+     <constant>SWOOLE_LOG_NOTICE</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      Notice log.
+      Available as of swoole 2.1.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-warning">
+    <term>
+     <constant>SWOOLE_LOG_WARNING</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      Warning log.
+      Available as of swoole 2.1.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-error">
+    <term>
+     <constant>SWOOLE_LOG_ERROR</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      Error log.
+      Available as of swoole 2.1.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constant.swoole-log-none">
+    <term>
+     <constant>SWOOLE_LOG_NONE</constant>
+     (<type>int</type>)
+    </term>
+    <listitem>
+     <simpara>
+      None log.
+      Available as of swoole 4.3.2.
+     </simpara>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </para>
 </appendix>
diff --git a/reference/swoole/functions/swoole-async-readfile.xml b/reference/swoole/functions/swoole-async-readfile.xml
index 659e1b8ee2..410f9f3e0c 100644
--- a/reference/swoole/functions/swoole-async-readfile.xml
+++ b/reference/swoole/functions/swoole-async-readfile.xml
@@ -52,7 +52,7 @@
         <term><parameter>content</parameter></term>
         <listitem>
          <para>
-          The content readed from the file.
+          The content read from the file.
          </para>
         </listitem>
        </varlistentry>
diff --git a/reference/swoole/functions/swoole-async-set.xml b/reference/swoole/functions/swoole-async-set.xml
index e635cb6c40..6b7f22b6b9 100644
--- a/reference/swoole/functions/swoole-async-set.xml
+++ b/reference/swoole/functions/swoole-async-set.xml
@@ -33,6 +33,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/mysqlnd_uh/mysqlnduhpreparedstatement/construct.xml b/reference/swoole/functions/swoole-clear-error.xml
similarity index 69%
rename from reference/mysqlnd_uh/mysqlnduhpreparedstatement/construct.xml
rename to reference/swoole/functions/swoole-clear-error.xml
index 48ac04a199..59262127d3 100644
--- a/reference/mysqlnd_uh/mysqlnduhpreparedstatement/construct.xml
+++ b/reference/swoole/functions/swoole-clear-error.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="mysqlnduhpreparedstatement.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="function.swoole-clear-error" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MysqlndUhPreparedStatement::__construct</refname>
-  <refpurpose>The __construct purpose</refpurpose>
+  <refname>swoole_clear_error</refname>
+  <refpurpose>Clear errors in the socket or on the last error code</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <methodname>MysqlndUhPreparedStatement::__construct</methodname>
+   <type>void</type><methodname>swoole_clear_error</methodname>
    <void />
   </methodsynopsis>
   <para>
-
+   Clear errors in the socket or on the last error code.
   </para>
-
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,11 +26,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-
+   &return.void;
   </para>
  </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/mysqlnd_uh/mysqlnduhconnection/shutdownserver.xml b/reference/swoole/functions/swoole-error-log.xml
similarity index 54%
rename from reference/mysqlnd_uh/mysqlnduhconnection/shutdownserver.xml
rename to reference/swoole/functions/swoole-error-log.xml
index 9162b335b4..ec99fb9adf 100644
--- a/reference/mysqlnd_uh/mysqlnduhconnection/shutdownserver.xml
+++ b/reference/swoole/functions/swoole-error-log.xml
@@ -1,43 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="mysqlnduhconnection.shutdownserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="function.swoole-error-log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MysqlndUhConnection::shutdownServer</refname>
-  <refpurpose>The shutdownServer purpose</refpurpose>
+  <refname>swoole_error_log</refname>
+  <refpurpose>Output error messages to the log</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MysqlndUhConnection::shutdownServer</methodname>
-   <methodparam><type>string</type><parameter>MYSQLND_UH_RES_MYSQLND_NAME</parameter></methodparam>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
+   <type>void</type><methodname>swoole_error_log</methodname>
+   <methodparam><type>int</type><parameter>level</parameter></methodparam>
+   <methodparam><type>string</type><parameter>msg</parameter></methodparam>
   </methodsynopsis>
   <para>
-
+   Output error messages to the log.
   </para>
-
-  &warn.undocumented.func;
-
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>MYSQLND_UH_RES_MYSQLND_NAME</parameter></term>
+    <term><parameter>level</parameter></term>
     <listitem>
      <para>
-      
+      Log Level, constants can be used: <constant>SWOOLE_LOG_DEBUG</constant>,
+      <constant>SWOOLE_LOG_TRACE</constant>,
+      <constant>SWOOLE_LOG_INFO</constant>,
+      <constant>SWOOLE_LOG_NOTICE</constant>,
+      <constant>SWOOLE_LOG_WARNING</constant>,
+      <constant>SWOOLE_LOG_ERROR</constant>,
+      <constant>SWOOLE_LOG_NONE</constant>
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>level</parameter></term>
+    <term><parameter>msg</parameter></term>
     <listitem>
      <para>
-      
+      Message content to be written to the log.
      </para>
     </listitem>
    </varlistentry>
@@ -47,11 +50,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-
+   &return.void;
   </para>
  </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/swoole/swoole/process/kill.xml b/reference/swoole/swoole/process/kill.xml
index 3100228dac..dd080a5928 100644
--- a/reference/swoole/swoole/process/kill.xml
+++ b/reference/swoole/swoole/process/kill.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Process::kill</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Process::kill</methodname>
    <methodparam><type>int</type><parameter>pid</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>signal_no</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>signal_no</parameter></methodparam>
   </methodsynopsis>
   <para>
     Send signal to the child process.
@@ -27,7 +27,7 @@
     <term><parameter>pid</parameter></term>
     <listitem>
      <para>
-      
+      Process pid
      </para>
     </listitem>
    </varlistentry>
@@ -35,7 +35,7 @@
     <term><parameter>signal_no</parameter></term>
     <listitem>
      <para>
-      
+      Signal to be sent
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/swoole/swoole/process/name.xml b/reference/swoole/swoole/process/name.xml
index eac7276da3..bdd61064d1 100644
--- a/reference/swoole/swoole/process/name.xml
+++ b/reference/swoole/swoole/process/name.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Process::name</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Process::name</methodname>
    <methodparam><type>string</type><parameter>process_name</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -26,7 +26,7 @@
     <term><parameter>process_name</parameter></term>
     <listitem>
      <para>
-      
+      Set name of the process.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/swoole/swoole/server/getclientinfo.xml b/reference/swoole/swoole/server/getclientinfo.xml
index a517bfc872..39a3729e26 100644
--- a/reference/swoole/swoole/server/getclientinfo.xml
+++ b/reference/swoole/swoole/server/getclientinfo.xml
@@ -10,9 +10,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Server::getClientInfo</methodname>
+   <modifier>public</modifier> <type>array</type><methodname>Swoole\Server::getClientInfo</methodname>
    <methodparam><type>int</type><parameter>fd</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>reactor_id</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>ignore_error</parameter></methodparam>
   </methodsynopsis>
   <para>
 
@@ -27,7 +28,7 @@
     <term><parameter>fd</parameter></term>
     <listitem>
      <para>
-      
+      File descriptors.
      </para>
     </listitem>
    </varlistentry>
@@ -35,7 +36,16 @@
     <term><parameter>reactor_id</parameter></term>
     <listitem>
      <para>
-      
+      The Reactor thread ID where the connection is made.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>ignore_error</parameter></term>
+    <listitem>
+     <para>
+      Whether to ignore errors, if set to true,
+      connection information will be returned even if the connection is closed.
      </para>
     </listitem>
    </varlistentry>
@@ -45,7 +55,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   
+   Returns information about the client connection.
   </para>
  </refsect1>
 
diff --git a/reference/swoole/versions.xml b/reference/swoole/versions.xml
index 501bfcaed8..af3c5313e5 100644
--- a/reference/swoole/versions.xml
+++ b/reference/swoole/versions.xml
@@ -33,6 +33,8 @@
  <function name='swoole_strerror' from='PECL swoole &gt;= 1.9.0'/>
  <function name='swoole_errno' from='PECL swoole &gt;= 1.9.0'/>
  <function name='swoole_load_module' from='PECL swoole &gt;= 1.9.0'/>
+ <function name='swoole_clear_error' from='PECL swoole &gt;= 4.6.0'/>
+ <function name='swoole_error_log' from='PECL swoole &gt;= 4.5.8'/>
  <!-- Classes and Methods -->
 
  <function name='swoole\server' from='PECL swoole &gt;= 1.9.0'/>
diff --git a/reference/sync/book.xml b/reference/sync/book.xml
index bc25a8b854..4078c71cb3 100644
--- a/reference/sync/book.xml
+++ b/reference/sync/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.sync" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Sync</title>
  <titleabbrev>Sync</titleabbrev>
 
diff --git a/reference/sync/syncevent/construct.xml b/reference/sync/syncevent/construct.xml
index 8c614ad3cb..2ea8a15fa0 100644
--- a/reference/sync/syncevent/construct.xml
+++ b/reference/sync/syncevent/construct.xml
@@ -16,7 +16,7 @@
    <methodparam choice="opt"><type>bool</type><parameter>prefire</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
- Constructs a named or unnamed event object.
+   Constructs a named or unnamed event object.
   </para>
  </refsect1>
 
@@ -27,13 +27,13 @@
     <term><parameter>name</parameter></term>
     <listitem>
      <para>
- The name of the event if this is a named event object.
+      The name of the event if this is a named event object.
      </para>
      <note>
       <para>
- If the name already exists, it must be able to be opened by the current user
- that the process is running as or an exception will be thrown with a meaningless
- error message.
+       If the name already exists, it must be able to be opened by the current user
+       that the process is running as or an exception will be thrown with a meaningless
+       error message.
       </para>
      </note>
     </listitem>
@@ -42,12 +42,12 @@
     <term><parameter>manual</parameter></term>
     <listitem>
      <para>
- Specifies whether or not the event object must be reset manually.
+      Specifies whether or not the event object must be reset manually.
      </para>
      <note>
       <para>
- Manual reset event objects allow all waiting processes through until the
- object is reset.
+       Manual reset event objects allow all waiting processes through until the
+       object is reset.
       </para>
      </note>
     </listitem>
@@ -56,11 +56,11 @@
     <term><parameter>prefire</parameter></term>
     <listitem>
      <para>
- Specifies whether or not to prefire (signal) the event object.
+      Specifies whether or not to prefire (signal) the event object.
      </para>
      <note>
       <para>
- Only has impact if the calling process/thread is the first to create the object.
+       Only has impact if the calling process/thread is the first to create the object.
       </para>
      </note>
     </listitem>
@@ -71,8 +71,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- The new SyncEvent object.  An exception is thrown if the event object cannot
- be created or opened.
+   The new <classname>SyncEvent</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   An exception is thrown if the event object cannot be created or opened.
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncevent/fire.xml b/reference/sync/syncevent/fire.xml
index a45c0d5b7a..5b0a2e9aad 100644
--- a/reference/sync/syncevent/fire.xml
+++ b/reference/sync/syncevent/fire.xml
@@ -14,8 +14,8 @@
    <void />
   </methodsynopsis>
   <para>
- Fires/sets a SyncEvent object.  Lets multiple threads through that are waiting
- if the event object was created with a manual value of TRUE.
+   Fires/sets a <classname>SyncEvent</classname> object. Lets multiple threads through that are waiting
+   if the event object was created with a manual value of &true;.
   </para>
  </refsect1>
 
@@ -27,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the event was fired, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncevent/reset.xml b/reference/sync/syncevent/reset.xml
index 7a54b04c70..6864c209a8 100644
--- a/reference/sync/syncevent/reset.xml
+++ b/reference/sync/syncevent/reset.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
- Resets a SyncEvent object that has been fired/set.  Only valid for manual event objects.
+   Resets a <classname>SyncEvent</classname> object that has been fired/set. Only valid for manual event objects.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean value of TRUE if the object was successfully reset, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncevent/wait.xml b/reference/sync/syncevent/wait.xml
index c6ddd1ad02..2b70ca4d58 100644
--- a/reference/sync/syncevent/wait.xml
+++ b/reference/sync/syncevent/wait.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
- Waits for the SyncEvent object to be fired.
+   Waits for the <classname>SyncEvent</classname> object to be fired.
   </para>
  </refsect1>
 
@@ -25,8 +25,8 @@
     <term><parameter>wait</parameter></term>
     <listitem>
      <para>
- The number of milliseconds to wait for the event to be fired.
- A value of -1 is infinite.
+      The number of milliseconds to wait for the event to be fired.
+      A value of -1 is infinite.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the event was fired, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncmutex/construct.xml b/reference/sync/syncmutex/construct.xml
index 5ccb0e761c..972045d324 100644
--- a/reference/sync/syncmutex/construct.xml
+++ b/reference/sync/syncmutex/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <para>
- Constructs a named or unnamed countable mutex.
+   Constructs a named or unnamed countable mutex.
   </para>
  </refsect1>
 
@@ -25,13 +25,13 @@
     <term><parameter>name</parameter></term>
     <listitem>
      <para>
- The name of the mutex if this is a named mutex object.
+      The name of the mutex if this is a named mutex object.
      </para>
      <note>
       <para>
- If the name already exists, it must be able to be opened by the current user
- that the process is running as or an exception will be thrown with a meaningless
- error message.
+       If the name already exists, it must be able to be opened by the current user
+       that the process is running as or an exception will be thrown with a meaningless
+       error message.
       </para>
      </note>
     </listitem>
@@ -42,8 +42,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- The new SyncMutex object.  An exception is thrown if the mutex cannot be
- created or opened.
+   The new <classname>SyncMutex</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   An exception is thrown if the mutex cannot be created or opened.
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncmutex/lock.xml b/reference/sync/syncmutex/lock.xml
index c31d120fd0..4056875940 100644
--- a/reference/sync/syncmutex/lock.xml
+++ b/reference/sync/syncmutex/lock.xml
@@ -14,8 +14,8 @@
    <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
- Obtains an exclusive lock on a SyncMutex object.
- If the lock is already acquired, then this increments an internal counter.
+   Obtains an exclusive lock on a <classname>SyncMutex</classname> object.
+   If the lock is already acquired, then this increments an internal counter.
   </para>
  </refsect1>
 
@@ -26,8 +26,8 @@
     <term><parameter>wait</parameter></term>
     <listitem>
      <para>
- The number of milliseconds to wait for the exclusive lock.
- A value of -1 is infinite.
+      The number of milliseconds to wait for the exclusive lock.
+      A value of -1 is infinite.
      </para>
     </listitem>
    </varlistentry>
@@ -37,7 +37,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the lock was obtained, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncmutex/unlock.xml b/reference/sync/syncmutex/unlock.xml
index 6c6f304aed..025853696b 100644
--- a/reference/sync/syncmutex/unlock.xml
+++ b/reference/sync/syncmutex/unlock.xml
@@ -14,8 +14,8 @@
    <methodparam choice="opt"><type>bool</type><parameter>all</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
- Decreases the internal counter of a SyncMutex object.
- When the internal counter reaches zero, the actual lock on the object is released.
+   Decreases the internal counter of a <classname>SyncMutex</classname> object.
+   When the internal counter reaches zero, the actual lock on the object is released.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
     <term><parameter>all</parameter></term>
     <listitem>
      <para>
- Specifies whether or not to set the internal counter to zero and therefore release the lock.
+      Specifies whether or not to set the internal counter to zero and therefore release the lock.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the unlock operation was successful, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncreaderwriter/construct.xml b/reference/sync/syncreaderwriter/construct.xml
index 4bb153fb73..1b049a14bf 100644
--- a/reference/sync/syncreaderwriter/construct.xml
+++ b/reference/sync/syncreaderwriter/construct.xml
@@ -15,7 +15,7 @@
    <methodparam choice="opt"><type>bool</type><parameter>autounlock</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
- Constructs a named or unnamed reader-writer object.
+   Constructs a named or unnamed reader-writer object.
   </para>
  </refsect1>
 
@@ -26,13 +26,13 @@
     <term><parameter>name</parameter></term>
     <listitem>
      <para>
- The name of the reader-writer if this is a named reader-writer object.
+      The name of the reader-writer if this is a named reader-writer object.
      </para>
      <note>
       <para>
- If the name already exists, it must be able to be opened by the current user
- that the process is running as or an exception will be thrown with a meaningless
- error message.
+       If the name already exists, it must be able to be opened by the current user
+       that the process is running as or an exception will be thrown with a meaningless
+       error message.
       </para>
      </note>
     </listitem>
@@ -41,15 +41,15 @@
     <term><parameter>autounlock</parameter></term>
     <listitem>
      <para>
- Specifies whether or not to automatically unlock the reader-writer at the
- conclusion of the PHP script.
+      Specifies whether or not to automatically unlock the reader-writer at the
+      conclusion of the PHP script.
      </para>
      <warning>
       <para>
- If an object is:  A named reader-writer with an autounlock of FALSE, the
- object is locked for either reading or writing, and the PHP script concludes
- before the object is unlocked, then the underlying objects will end up in an
- inconsistent state.
+       If an object is:  A named reader-writer with an autounlock of FALSE, the
+       object is locked for either reading or writing, and the PHP script concludes
+       before the object is unlocked, then the underlying objects will end up in an
+       inconsistent state.
       </para>
      </warning>
     </listitem>
@@ -60,8 +60,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- The new SyncReaderWriter object.  An exception is thrown if the reader-writer
- cannot be created or opened.
+   The new <classname>SyncReaderWriter</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   An exception is thrown if the reader-writer cannot be created or opened.
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncreaderwriter/readlock.xml b/reference/sync/syncreaderwriter/readlock.xml
index cbcee0fa00..3cb436cf10 100644
--- a/reference/sync/syncreaderwriter/readlock.xml
+++ b/reference/sync/syncreaderwriter/readlock.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
- Obtains a read lock on a SyncReaderWriter object.
+   Obtains a read lock on a <classname>SyncReaderWriter</classname> object.
   </para>
  </refsect1>
 
@@ -25,8 +25,8 @@
     <term><parameter>wait</parameter></term>
     <listitem>
      <para>
- The number of milliseconds to wait for a lock.
- A value of -1 is infinite.
+      The number of milliseconds to wait for a lock.
+      A value of -1 is infinite.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the lock was obtained, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncreaderwriter/readunlock.xml b/reference/sync/syncreaderwriter/readunlock.xml
index 3e061ce9ac..02ac628672 100644
--- a/reference/sync/syncreaderwriter/readunlock.xml
+++ b/reference/sync/syncreaderwriter/readunlock.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
- Releases a read lock on a SyncReaderWriter object.
+   Releases a read lock on a <classname>SyncReaderWriter</classname> object.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the unlock operation was successful, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncreaderwriter/writelock.xml b/reference/sync/syncreaderwriter/writelock.xml
index fecdab0858..3434cdb7fb 100644
--- a/reference/sync/syncreaderwriter/writelock.xml
+++ b/reference/sync/syncreaderwriter/writelock.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
- Obtains an exclusive write lock on a SyncReaderWriter object.
+   Obtains an exclusive write lock on a <classname>SyncReaderWriter</classname> object.
   </para>
  </refsect1>
 
@@ -25,8 +25,8 @@
     <term><parameter>wait</parameter></term>
     <listitem>
      <para>
- The number of milliseconds to wait for a lock.
- A value of -1 is infinite.
+      The number of milliseconds to wait for a lock.
+      A value of -1 is infinite.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the lock was obtained, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncreaderwriter/writeunlock.xml b/reference/sync/syncreaderwriter/writeunlock.xml
index 96d3b03bc3..ec4a4eb27d 100644
--- a/reference/sync/syncreaderwriter/writeunlock.xml
+++ b/reference/sync/syncreaderwriter/writeunlock.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
- Releases a write lock on a SyncReaderWriter object.
+   Releases a write lock on a <classname>SyncReaderWriter</classname> object.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the unlock operation was successful, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsemaphore/construct.xml b/reference/sync/syncsemaphore/construct.xml
index 075a1d8b38..7e62d1af6f 100644
--- a/reference/sync/syncsemaphore/construct.xml
+++ b/reference/sync/syncsemaphore/construct.xml
@@ -16,7 +16,7 @@
    <methodparam choice="opt"><type>bool</type><parameter>autounlock</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
- Constructs a named or unnamed semaphore.
+   Constructs a named or unnamed semaphore.
   </para>
  </refsect1>
 
@@ -27,13 +27,13 @@
     <term><parameter>name</parameter></term>
     <listitem>
      <para>
- The name of the semaphore if this is a named semaphore object.
+      The name of the semaphore if this is a named semaphore object.
      </para>
      <note>
       <para>
- If the name already exists, it must be able to be opened by the current user
- that the process is running as or an exception will be thrown with a meaningless
- error message.
+       If the name already exists, it must be able to be opened by the current user
+       that the process is running as or an exception will be thrown with a meaningless
+       error message.
       </para>
      </note>
     </listitem>
@@ -42,7 +42,7 @@
     <term><parameter>initialval</parameter></term>
     <listitem>
      <para>
- The initial value of the semaphore.  This is the number of locks that may be obtained.
+      The initial value of the semaphore. This is the number of locks that may be obtained.
      </para>
     </listitem>
    </varlistentry>
@@ -50,14 +50,14 @@
     <term><parameter>autounlock</parameter></term>
     <listitem>
      <para>
- Specifies whether or not to automatically unlock the semaphore at the
- conclusion of the PHP script.
+      Specifies whether or not to automatically unlock the semaphore at the
+      conclusion of the PHP script.
      </para>
      <warning>
       <para>
- If an object is:  A named semaphore with an autounlock of FALSE, the object is
- locked, and the PHP script concludes before the object is unlocked, then the
- underlying semaphore will end up in an inconsistent state.
+       If an object is: A named semaphore with an autounlock of &false;, the object is
+       locked, and the PHP script concludes before the object is unlocked, then the
+       underlying semaphore will end up in an inconsistent state.
       </para>
      </warning>
     </listitem>
@@ -68,8 +68,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- The new SyncSemaphore object.  An exception is thrown if the semaphore cannot
- be created or opened.
+   The new <classname>SyncSemaphore</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   An exception is thrown if the semaphore cannot be created or opened.
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsemaphore/lock.xml b/reference/sync/syncsemaphore/lock.xml
index ac939c1096..a6a780918b 100644
--- a/reference/sync/syncsemaphore/lock.xml
+++ b/reference/sync/syncsemaphore/lock.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
- Decreases the count of a SyncSemaphore object or waits until the semaphore becomes non-zero.
+   Decreases the count of a <classname>SyncSemaphore</classname> object or waits until the semaphore becomes non-zero.
   </para>
  </refsect1>
 
@@ -25,8 +25,8 @@
     <term><parameter>wait</parameter></term>
     <listitem>
      <para>
- The number of milliseconds to wait for the semaphore.
- A value of -1 is infinite.
+      The number of milliseconds to wait for the semaphore.
+      A value of -1 is infinite.
      </para>
     </listitem>
    </varlistentry>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the lock operation was successful, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsemaphore/unlock.xml b/reference/sync/syncsemaphore/unlock.xml
index 5dd33ddf3c..8cd2d3a601 100644
--- a/reference/sync/syncsemaphore/unlock.xml
+++ b/reference/sync/syncsemaphore/unlock.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>int</type><parameter role="reference">prevcount</parameter></methodparam>
   </methodsynopsis>
   <para>
- Increases the count of a SyncSemaphore object.
+   Increases the count of a <classname>SyncSemaphore</classname> object.
   </para>
  </refsect1>
 
@@ -25,7 +25,7 @@
     <term><parameter>prevcount</parameter></term>
     <listitem>
      <para>
- Returns the previous count of the semaphore.
+      Returns the previous count of the semaphore.
      </para>
     </listitem>
    </varlistentry>
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the unlock operation was successful, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsharedmemory/construct.xml b/reference/sync/syncsharedmemory/construct.xml
index 7a5e6c599a..c0355b8cc8 100644
--- a/reference/sync/syncsharedmemory/construct.xml
+++ b/reference/sync/syncsharedmemory/construct.xml
@@ -15,7 +15,7 @@
    <methodparam><type>int</type><parameter>size</parameter></methodparam>
   </methodsynopsis>
   <para>
- Constructs a named shared memory object.
+   Constructs a named shared memory object.
   </para>
  </refsect1>
 
@@ -26,13 +26,13 @@
     <term><parameter>name</parameter></term>
     <listitem>
      <para>
- The name of the shared memory object.
+      The name of the shared memory object.
      </para>
      <note>
       <para>
- If the name already exists, it must be able to be opened by the current user
- that the process is running as or an exception will be thrown with a meaningless
- error message.
+       If the name already exists, it must be able to be opened by the current user
+       that the process is running as or an exception will be thrown with a meaningless
+       error message.
       </para>
      </note>
     </listitem>
@@ -41,11 +41,11 @@
     <term><parameter>size</parameter></term>
     <listitem>
      <para>
- The size, in bytes, of shared memory to reserve.
+      The size, in bytes, of shared memory to reserve.
      </para>
      <note>
       <para>
- The amount of memory cannot be resized later.  Request sufficient storage up front.
+       The amount of memory cannot be resized later.  Request sufficient storage up front.
       </para>
      </note>
     </listitem>
@@ -56,8 +56,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- The new SyncSharedMemory object.  An exception is thrown if the shared memory
- object cannot be created or opened.
+   The new <classname>SyncSharedMemory</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   An exception is thrown if the shared memory object cannot be created or opened.
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsharedmemory/first.xml b/reference/sync/syncsharedmemory/first.xml
index eb9ce13f2f..333e2d034a 100644
--- a/reference/sync/syncsharedmemory/first.xml
+++ b/reference/sync/syncsharedmemory/first.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
- Retrieves the system-wide first instance status of a SyncSharedMemory object.
+   Retrieves the system-wide first instance status of a <classname>SyncSharedMemory</classname> object.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- A boolean of TRUE if the object is the first instance system-wide, FALSE otherwise.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsharedmemory/size.xml b/reference/sync/syncsharedmemory/size.xml
index cf741f5ff7..ab572f0739 100644
--- a/reference/sync/syncsharedmemory/size.xml
+++ b/reference/sync/syncsharedmemory/size.xml
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
- Retrieves the shared memory size of a SyncSharedMemory object.
+   Retrieves the shared memory size of a <classname>SyncSharedMemory</classname> object.
   </para>
  </refsect1>
 
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- An integer containing the size of the shared memory.  This will be the same size that was passed to the constructor.
+   An integer containing the size of the shared memory. This will be the same size that was passed to the constructor.
   </para>
  </refsect1>
 
diff --git a/reference/sync/syncsharedmemory/write.xml b/reference/sync/syncsharedmemory/write.xml
index 52e529cc87..eee4cd4ae6 100644
--- a/reference/sync/syncsharedmemory/write.xml
+++ b/reference/sync/syncsharedmemory/write.xml
@@ -15,7 +15,7 @@
    <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
- Copies data to named shared memory.
+   Copies data to named shared memory.
   </para>
  </refsect1>
 
@@ -26,12 +26,12 @@
     <term><parameter>string</parameter></term>
     <listitem>
      <para>
- The data to write to shared memoy.
+      The data to write to shared memory.
      </para>
      <note>
       <para>
- If the size of the data exceeds the size of the shared memory, the number of
- bytes written returned will be less than the length of the input.
+       If the size of the data exceeds the size of the shared memory, the number of
+       bytes written returned will be less than the length of the input.
       </para>
      </note>
     </listitem>
@@ -40,12 +40,12 @@
     <term><parameter>start</parameter></term>
     <listitem>
      <para>
- The start/offset, in bytes, to begin writing.
+      The start/offset, in bytes, to begin writing.
      </para>
      <note>
       <para>
- If the value is negative, the starting position will begin at the specified
- number of bytes from the end of the shared memory segment.
+       If the value is negative, the starting position will begin at the specified
+       number of bytes from the end of the shared memory segment.
       </para>
      </note>
     </listitem>
@@ -56,7 +56,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
- An integer containing the number of bytes written to shared memory.
+   An integer containing the number of bytes written to shared memory.
   </para>
  </refsect1>
 
diff --git a/reference/taint/book.xml b/reference/taint/book.xml
index 9359b17a60..ef5fb3a784 100644
--- a/reference/taint/book.xml
+++ b/reference/taint/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ --> 
 
 <book xml:id="book.taint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Taint</title>
  <titleabbrev>Taint</titleabbrev>
 
diff --git a/reference/tcpwrap/book.xml b/reference/tcpwrap/book.xml
index cb3f55dec4..79a58c999f 100644
--- a/reference/tcpwrap/book.xml
+++ b/reference/tcpwrap/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.tcpwrap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>TCP Wrappers</title>
  <titleabbrev>TCP</titleabbrev>
  
diff --git a/reference/tidy/configure.xml b/reference/tidy/configure.xml
index 7326a2fa47..2792a98ac3 100644
--- a/reference/tidy/configure.xml
+++ b/reference/tidy/configure.xml
@@ -3,7 +3,7 @@
 <section xml:id="tidy.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  This extension is bundled with PHP 5 and greater, and is installed
+  This extension is bundled with PHP, and is installed
   using the <option role="configure">--with-tidy</option> configure option.
  </para>
 </section>
diff --git a/reference/tidy/ini.xml b/reference/tidy/ini.xml
index 0f05beb349..d3c70a1903 100644
--- a/reference/tidy/ini.xml
+++ b/reference/tidy/ini.xml
@@ -26,7 +26,7 @@
       <entry><link linkend="ini.tidy.clean-output">tidy.clean_output</link></entry>
       <entry>"0"</entry>
       <entry>PHP_INI_USER</entry>
-      <entry>PHP_INI_PERDIR prior to PHP 5.4.0</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/tidy/tidy/getrelease.xml b/reference/tidy/tidy/getrelease.xml
index 57c9524837..733503c56e 100644
--- a/reference/tidy/tidy/getrelease.xml
+++ b/reference/tidy/tidy/getrelease.xml
@@ -23,6 +23,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/tidy/tidynode.xml b/reference/tidy/tidynode.xml
index 6439e59120..72df0b3ad4 100644
--- a/reference/tidy/tidynode.xml
+++ b/reference/tidy/tidynode.xml
@@ -122,26 +122,6 @@
     </varlistentry>
    </variablelist>
 
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.1.0</entry>
-       <entry><varname>line</varname>, <varname>column</varname>
-       and <varname>proprietary</varname> were added</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
-
  </section>
 <!-- }}} -->
  </partintro>
diff --git a/reference/tidy/tidynode/getparent.xml b/reference/tidy/tidynode/getparent.xml
index 29f5e1e93e..e7c70a461e 100644
--- a/reference/tidy/tidynode/getparent.xml
+++ b/reference/tidy/tidynode/getparent.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+ 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/tidy/tidynode/haschildren.xml b/reference/tidy/tidynode/haschildren.xml
index afbadb700d..7cfadd189a 100644
--- a/reference/tidy/tidynode/haschildren.xml
+++ b/reference/tidy/tidynode/haschildren.xml
@@ -15,6 +15,11 @@
    Tells if the node has children.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/hassiblings.xml b/reference/tidy/tidynode/hassiblings.xml
index 7fbba5aa34..33db32b91d 100644
--- a/reference/tidy/tidynode/hassiblings.xml
+++ b/reference/tidy/tidynode/hassiblings.xml
@@ -15,6 +15,11 @@
    Tells if the node has siblings.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/isasp.xml b/reference/tidy/tidynode/isasp.xml
index 1186557d7c..5d63bc2d68 100644
--- a/reference/tidy/tidynode/isasp.xml
+++ b/reference/tidy/tidynode/isasp.xml
@@ -15,6 +15,11 @@
    Tells whether the current node is ASP.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/iscomment.xml b/reference/tidy/tidynode/iscomment.xml
index cb5f337d01..b61de8ca29 100644
--- a/reference/tidy/tidynode/iscomment.xml
+++ b/reference/tidy/tidynode/iscomment.xml
@@ -15,6 +15,11 @@
    Tells if the node is a comment.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/ishtml.xml b/reference/tidy/tidynode/ishtml.xml
index 01cad60a05..e0db096f25 100644
--- a/reference/tidy/tidynode/ishtml.xml
+++ b/reference/tidy/tidynode/ishtml.xml
@@ -15,6 +15,11 @@
    Tells if the node is an element node, but not the root node of the document.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/isjste.xml b/reference/tidy/tidynode/isjste.xml
index 597f326d47..a76fa3d796 100644
--- a/reference/tidy/tidynode/isjste.xml
+++ b/reference/tidy/tidynode/isjste.xml
@@ -15,6 +15,11 @@
    Tells if the node is JSTE.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/isphp.xml b/reference/tidy/tidynode/isphp.xml
index 72f875973c..7a2291fd7d 100644
--- a/reference/tidy/tidynode/isphp.xml
+++ b/reference/tidy/tidynode/isphp.xml
@@ -15,6 +15,11 @@
    Tells if the node is PHP.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tidy/tidynode/istext.xml b/reference/tidy/tidynode/istext.xml
index 1ac6631aa8..ac1c9223ff 100644
--- a/reference/tidy/tidynode/istext.xml
+++ b/reference/tidy/tidynode/istext.xml
@@ -15,6 +15,11 @@
    Tells if the node represents a text (without any markup).
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
diff --git a/reference/tokenizer/functions/token-name.xml b/reference/tokenizer/functions/token-name.xml
index 82e8aa7e18..5e4bb8b670 100644
--- a/reference/tokenizer/functions/token-name.xml
+++ b/reference/tokenizer/functions/token-name.xml
@@ -56,18 +56,11 @@ echo token_name(T_FUNCTION); // -> "T_FUNCTION"
    </example>
   </para>
  </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link linkend="tokens">List of Parser Tokens</link></member>
-   </simplelist>
-  </para>
- </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
+   <member><link linkend="tokens">List of Parser Tokens</link></member>
    <member><function>PhpToken::getTokenName</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/tokyo_tyrant/book.xml b/reference/tokyo_tyrant/book.xml
deleted file mode 100644
index 370fa2b68f..0000000000
--- a/reference/tokyo_tyrant/book.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.tokyo-tyrant" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>tokyo_tyrant</title>
- <titleabbrev>tokyo_tyrant</titleabbrev>
-
- <preface xml:id="intro.tokyo-tyrant">
-  &reftitle.intro;
-  <para>
-   tokyo_tyrant extension provides a wrapper for Tokyo Tyrant client libraries. The extension
-   contains the normal key-value API and the table API.
-  </para>
-  <para>
-   <literal>
-    "Tokyo Tyrant is a package of network interface to the DBM called Tokyo Cabinet. Though the DBM has high performance, you might bother in case that multiple processes share the same database, or remote processes access the database. Thus, Tokyo Tyrant is provided for concurrent and remote connections to Tokyo Cabinet. It is composed of the server process managing a database and its access library for client applications." --Tokyo Tyrant documentation
-   </literal>
-  </para>
-  <para>
-   Tokyo Tyrant is written by Mikio Hirabayashi and is licensed under GNU Lesser General Public License.
-  </para>
- </preface>
-
- &reference.tokyo-tyrant.setup;
- &reference.tokyo-tyrant.constants;
- &reference.tokyo-tyrant.examples;
-
- &reference.tokyo-tyrant.tokyotyrant;
- &reference.tokyo-tyrant.tokyotyranttable;
- &reference.tokyo-tyrant.tokyotyrantquery;
- &reference.tokyo-tyrant.tokyotyrantiterator;
- &reference.tokyo-tyrant.tokyotyrantexception;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/tokyo_tyrant/configure.xml b/reference/tokyo_tyrant/configure.xml
deleted file mode 100644
index a8e21bb018..0000000000
--- a/reference/tokyo_tyrant/configure.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="tokyo-tyrant.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;tokyo_tyrant">&url.pecl.package;tokyo_tyrant</link>
- </para>
-
- <section xml:id="tokyo-tyrant.configure-options">
-  <title>Configure options</title>
-  <simplelist>
-   <member><literal>--with-tokyo-tyrant[=DIR]</literal> DIR is the prefix to the Tokyo Tyrant installation</member>
-   <member><literal>--with-tokyo-cabinet-dir[=DIR]</literal> DIR is the prefix to the Tokyo Cabinet installation</member>
-   <member><literal>--disable-tokyo-tyrant-session</literal> Disable Tokyo Tyrant session handler support</member>
-  </simplelist>
- </section>
-
- <section xml:id="tokyo-tyrant.enabling-the-extension">
-  <title>Enabling the extension</title>
-  <para>
-   The extension can be enabled by adding <literal>extension=tokyo_tyrant.so</literal> to the INI-configuration
-  </para>
- </section>
-
- <section xml:id="tokyo-tyrant.session-running">
-  <title>Running Tokyo Tyrant for the session handler</title>
-  <para>
-   <literal>ttserver -port 2000 -ext /path/to/expire.lua -extpc expire 30.0 '/tmp/sessions.tct#idx=ts:dec'</literal>
-  </para>
-  <note>
-   <simpara>
-    expire.lua is included in the tokyo_tyrant extension source distribution
-   </simpara>
-  </note>
- </section>
-
- <section xml:id="tokyo-tyrant.configuring-session-handler">
-  <title>Configuring session handler</title>
-  <para>
-    <simplelist>
-     <member>tokyo_tyrant.session_salt="randomlongstring"</member>
-     <member>session.save_handler=tokyo_tyrant</member>
-     <member>session.save_path="tcp://hostname1:2000,tcp://hostname2:2000"</member>
-    </simplelist>
-  </para>
-  <note>
-   <simpara>
-    It is important to make sure that <link linkend="ini.tokyo-tyrant.session-salt">tokyo_tyrant.session_salt</link> matches on all servers.
-   </simpara>
-  </note>
- </section>
-
- <section xml:id="tokyo-tyrant.how-session-handler-works">
-  <title>How it works?</title>
-  <para>
-    The session handler creates a session id like the following:
-    8b0e27a823fa4a6cf7246945b82c1d51-a5eadbbed1f2075952900628456bfd6830541629-0-5460
-  </para>
-
-  <para>
-   The parts from left to right:
-  </para>
-   
-    <simplelist>
-     <member><literal>Session id</literal> - Generated session id</member>
-     <member><literal>Checksum</literal> - Checksum of session salt, session id, node id and primary key</member>
-     <member><literal>Node id</literal> - The id of the node where the session maps to</member>
-     <member><literal>Primary key</literal> - The primary key of the row where the session is stored</member>
-    </simplelist>
-
-   <para>
-    The checksum contains SHA1 sum of the node id, primary key, session id and the salt which is known only on the server side. This allows quick mapping of session id to node and primary key since there is no need to do an additional search. During session id regeneration only the parts 1 and 2 change but the mapping to the node and primary key stays constant.
-  </para>
-  <para>
-   In case some of the nodes fail <link linkend="ini.tokyo-tyrant.allow-failover">tokyo_tyrant.allow_failover</link>, <link linkend="ini.tokyo-tyrant.fail-threshold">tokyo_tyrant.fail_threshold</link> and <link linkend="ini.tokyo-tyrant.health-check-divisor">tokyo_tyrant.health_check_divisor</link> INI-settings control the behavior during failover. If failover is allowed the session handler will map the session to a healthy node and creates a new empty session.
-  </para>
- </section>
-
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/constants.xml b/reference/tokyo_tyrant/constants.xml
deleted file mode 100644
index b83851af8c..0000000000
--- a/reference/tokyo_tyrant/constants.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="tokyo-tyrant.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- <para>
-  <link linkend="tokyotyrant.constants.types">TokyoTyrant constants</link>
- </para>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/tokyo_tyrant/examples.xml b/reference/tokyo_tyrant/examples.xml
deleted file mode 100644
index 35c2a54bc9..0000000000
--- a/reference/tokyo_tyrant/examples.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="tokyo-tyrant.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  Basic usage
- </para>
- <example>
-  <title>Putting and getting a key-value pair</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost");
-$tt->put("key", "value");
-echo $tt->get("key");
-?>
-]]>
-  </programlisting>
-  &example.outputs;
-  <screen>
-<![CDATA[
-value
-]]>
-  </screen>
- </example>
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/tokyo_tyrant/ini.xml b/reference/tokyo_tyrant/ini.xml
deleted file mode 100644
index 18cebc40bd..0000000000
--- a/reference/tokyo_tyrant/ini.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="tokyo-tyrant.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>tokyo_tyrant &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.default-timeout">tokyo_tyrant.default_timeout</link></entry>
-      <entry>2.0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.session-salt">tokyo_tyrant.session_salt</link></entry>
-      <entry>&null;</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.key-prefix">tokyo_tyrant.key_prefix</link></entry>
-      <entry>&null;</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.allow-failover">tokyo_tyrant.allow_failover</link></entry>
-      <entry>1</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.fail-threshold">tokyo_tyrant.fail_threshold</link></entry>
-      <entry>5</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.health-check-divisor">tokyo_tyrant.health_check_divisor</link></entry>
-      <entry>1000</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.tokyo-tyrant.php-expiration">tokyo_tyrant.php_expiration</link></entry>
-      <entry>0</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-</tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.tokyo-tyrant.default-timeout">
-     <term>
-      <parameter>tokyo_tyrant.default_timeout</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Default timeout when connecting to databases
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.tokyo-tyrant.session-salt">
-     <term>
-      <parameter>tokyo_tyrant.session_salt</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The secret that is used to salt session id
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.tokyo-tyrant.key-prefix">
-     <term>
-      <parameter>tokyo_tyrant.key_prefix</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Prefix all keys with this string. The prefix is transparent
-       to the developer but helps making sure that keys won't collide if multiple
-       applications are using the same database.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.tokyo-tyrant.allow-failover">
-     <term>
-      <parameter>tokyo_tyrant.allow_failover</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Whether to allow session failover in case a server dies.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.tokyo-tyrant.fail-threshold">
-     <term>
-      <parameter>tokyo_tyrant.fail_threshold</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       How many read/write or connection failures is allowed
-       before server is marked as failed.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.tokyo-tyrant.health-check-divisor">
-     <term>
-      <parameter>tokyo_tyrant.health_check_divisor</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Defines the divisor for the health check probability. If there are failed
-       servers and the probability matches, the servers are health checked and
-       in case the server seems healthy, it will be added back to the pool.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.tokyo-tyrant.php-expiration">
-     <term>
-      <parameter>tokyo_tyrant.php_expiration</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Whether to use built in session expiration mechanism or delegate 
-       the expiration to a lua-script on the server-side.
-      </para>
-     </listitem>
-    </varlistentry>
-
-  </variablelist>
- </para>
-</section>
diff --git a/reference/tokyo_tyrant/setup.xml b/reference/tokyo_tyrant/setup.xml
deleted file mode 100644
index 24fac25b52..0000000000
--- a/reference/tokyo_tyrant/setup.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="tokyo-tyrant.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="tokyo-tyrant.requirements">
-  &reftitle.required;
-  <!-- Use &no.requirement; if there no requirement -->
-  <para>
-   Before using this extension Tokyo Cabinet and Tokyo Tyrant must be installed.
-  </para>
- </section>
-
- <!-- {{{ Installation -->
-  &reference.tokyo-tyrant.configure;
- <!-- or &reference.tokyo-tyrant.configure; -->
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.tokyo-tyrant.ini;
- <!-- or  -->
- <!-- }}} -->
-
- <section xml:id="tokyo-tyrant.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/tokyo_tyrant/tokyotyrant.xml b/reference/tokyo_tyrant/tokyotyrant.xml
deleted file mode 100644
index 43ae609cb0..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant.xml
+++ /dev/null
@@ -1,690 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.tokyotyrant" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The TokyoTyrant class</title>
- <titleabbrev>TokyoTyrant</titleabbrev>
-
- <partintro>
-
-<!-- {{{ tokyotyrant intro -->
-  <section xml:id="tokyotyrant.intro">
-   &reftitle.intro;
-   <para>
-    The main Tokyo Tyrant class
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="tokyotyrant.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>TokyoTyrant</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>TokyoTyrant</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbdef-port">TokyoTyrant::RDBDEF_PORT</varname>
-     <initializer>1978</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-streq">TokyoTyrant::RDBQC_STREQ</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-strinc">TokyoTyrant::RDBQC_STRINC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-strbw">TokyoTyrant::RDBQC_STRBW</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-strew">TokyoTyrant::RDBQC_STREW</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-strand">TokyoTyrant::RDBQC_STRAND</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-stror">TokyoTyrant::RDBQC_STROR</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-stroreq">TokyoTyrant::RDBQC_STROREQ</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-strrx">TokyoTyrant::RDBQC_STRRX</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numeq">TokyoTyrant::RDBQC_NUMEQ</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numgt">TokyoTyrant::RDBQC_NUMGT</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numge">TokyoTyrant::RDBQC_NUMGE</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numlt">TokyoTyrant::RDBQC_NUMLT</varname>
-     <initializer>11</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numle">TokyoTyrant::RDBQC_NUMLE</varname>
-     <initializer>12</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numbt">TokyoTyrant::RDBQC_NUMBT</varname>
-     <initializer>13</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-numoreq">TokyoTyrant::RDBQC_NUMOREQ</varname>
-     <initializer>14</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-negate">TokyoTyrant::RDBQC_NEGATE</varname>
-     <initializer>16777216</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqc-noidx">TokyoTyrant::RDBQC_NOIDX</varname>
-     <initializer>33554432</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqo-strasc">TokyoTyrant::RDBQO_STRASC</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqo-strdesc">TokyoTyrant::RDBQO_STRDESC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqo-numasc">TokyoTyrant::RDBQO_NUMASC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqo-numdesc">TokyoTyrant::RDBQO_NUMDESC</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-lexical">TokyoTyrant::RDBIT_LEXICAL</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-decimal">TokyoTyrant::RDBIT_DECIMAL</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-token">TokyoTyrant::RDBIT_TOKEN</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-qgram">TokyoTyrant::RDBIT_QGRAM</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-opt">TokyoTyrant::RDBIT_OPT</varname>
-     <initializer>9998</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-void">TokyoTyrant::RDBIT_VOID</varname>
-     <initializer>9999</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbit-keep">TokyoTyrant::RDBIT_KEEP</varname>
-     <initializer>16777216</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqcfts-ph">TokyoTyrant::RDBQCFTS_PH</varname>
-     <initializer>15</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqcfts-and">TokyoTyrant::RDBQCFTS_AND</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqcfts-or">TokyoTyrant::RDBQCFTS_OR</varname>
-     <initializer>17</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbqcfts-ex">TokyoTyrant::RDBQCFTS_EX</varname>
-     <initializer>18</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbxolck-rec">TokyoTyrant::RDBXO_LCKREC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbxolck-glb">TokyoTyrant::RDBXOLCK_GLB</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbrec-int">TokyoTyrant::RDBREC_INT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbrec-dbl">TokyoTyrant::RDBREC_DBL</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbms-union">TokyoTyrant::RDBMS_UNION</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbms-isect">TokyoTyrant::RDBMS_ISECT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbms-diff">TokyoTyrant::RDBMS_DIFF</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrant.constants.rdbt-recon">TokyoTyrant::RDBT_RECON</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tokyotyrant')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ tokyotyrant constants -->
-  <section xml:id="tokyotyrant.constants">
-   &reftitle.constants;
-   <section xml:id="tokyotyrant.constants.types">
-    <title>TokyoTyrant Constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbdef-port">
-      <term><constant>TokyoTyrant::RDBDEF_PORT</constant></term>
-      <listitem>
-       <para>The default port of the Tokyo Tyrant database</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-streq">
-      <term><constant>TokyoTyrant::RDBQC_STREQ</constant></term>
-      <listitem>
-       <para>string is equal to</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-strinc">
-      <term><constant>TokyoTyrant::RDBQC_STRINC</constant></term>
-      <listitem>
-       <para>string is included in</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-strbw">
-      <term><constant>TokyoTyrant::RDBQC_STRBW</constant></term>
-      <listitem>
-       <para>string begins with</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-strew">
-      <term><constant>TokyoTyrant::RDBQC_STREW</constant></term>
-      <listitem>
-       <para>string ends with</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-strand">
-      <term><constant>TokyoTyrant::RDBQC_STRAND</constant></term>
-      <listitem>
-       <para>string includes all tokens in</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-stror">
-      <term><constant>TokyoTyrant::RDBQC_STROR</constant></term>
-      <listitem>
-       <para>string includes at least one token in</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-stroreq">
-      <term><constant>TokyoTyrant::RDBQC_STROREQ</constant></term>
-      <listitem>
-       <para>string is equal to at least one token in</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-strrx">
-      <term><constant>TokyoTyrant::RDBQC_STRRX</constant></term>
-      <listitem>
-       <para>string matches regular expressions of</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numeq">
-      <term><constant>TokyoTyrant::RDBQC_NUMEQ</constant></term>
-      <listitem>
-       <para>number is equal to</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numgt">
-      <term><constant>TokyoTyrant::RDBQC_NUMGT</constant></term>
-      <listitem>
-       <para>number is greater than</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numge">
-      <term><constant>TokyoTyrant::RDBQC_NUMGE</constant></term>
-      <listitem>
-       <para>number is greater than or equal to</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numlt">
-      <term><constant>TokyoTyrant::RDBQC_NUMLT</constant></term>
-      <listitem>
-       <para>number is less than</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numle">
-      <term><constant>TokyoTyrant::RDBQC_NUMLE</constant></term>
-      <listitem>
-       <para>number is less than or equal to</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numbt">
-      <term><constant>TokyoTyrant::RDBQC_NUMBT</constant></term>
-      <listitem>
-       <para>number is between two tokens of</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-numoreq">
-      <term><constant>TokyoTyrant::RDBQC_NUMOREQ</constant></term>
-      <listitem>
-       <para>number is equal to at least one token in</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-negate">
-      <term><constant>TokyoTyrant::RDBQC_NEGATE</constant></term>
-      <listitem>
-       <para>negation flag</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqc-noidx">
-      <term><constant>TokyoTyrant::RDBQC_NOIDX</constant></term>
-      <listitem>
-       <para>no index flag</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqo-strasc">
-      <term><constant>TokyoTyrant::RDBQO_STRASC</constant></term>
-      <listitem>
-       <para>string ascending</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqo-strdesc">
-      <term><constant>TokyoTyrant::RDBQO_STRDESC</constant></term>
-      <listitem>
-       <para>string descending</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqo-numasc">
-      <term><constant>TokyoTyrant::RDBQO_NUMASC</constant></term>
-      <listitem>
-       <para>number ascending</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqo-numdesc">
-      <term><constant>TokyoTyrant::RDBQO_NUMDESC</constant></term>
-      <listitem>
-       <para>number descending</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-lexical">
-      <term><constant>TokyoTyrant::RDBIT_LEXICAL</constant></term>
-      <listitem>
-       <para>lexical string</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-decimal">
-      <term><constant>TokyoTyrant::RDBIT_DECIMAL</constant></term>
-      <listitem>
-       <para>decimal string</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-token">
-      <term><constant>TokyoTyrant::RDBIT_TOKEN</constant></term>
-      <listitem>
-       <para>token inverted index (Tokyo Tyrant &gt;= 1.1.29)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-qgram">
-      <term><constant>TokyoTyrant::RDBIT_QGRAM</constant></term>
-      <listitem>
-       <para>QGRAM inverted index (Tokyo Tyrant &gt;= 1.1.29)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-opt">
-      <term><constant>TokyoTyrant::RDBIT_OPT</constant></term>
-      <listitem>
-       <para>optimize</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-void">
-      <term><constant>TokyoTyrant::RDBIT_VOID</constant></term>
-      <listitem>
-       <para>void</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbit-keep">
-      <term><constant>TokyoTyrant::RDBIT_KEEP</constant></term>
-      <listitem>
-       <para>keep existing index</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqcfts-ph">
-      <term><constant>TokyoTyrant::RDBQCFTS_PH</constant></term>
-      <listitem>
-       <para>full-text search with the phrase of (Tokyo Tyrant &gt;= 1.1.29)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqcfts-and">
-      <term><constant>TokyoTyrant::RDBQCFTS_AND</constant></term>
-      <listitem>
-       <para>full-text search with all tokens in (Tokyo Tyrant &gt;= 1.1.29)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqcfts-or">
-      <term><constant>TokyoTyrant::RDBQCFTS_OR</constant></term>
-      <listitem>
-       <para>full-text search with at least one token in (Tokyo Tyrant &gt;= 1.1.29)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbqcfts-ex">
-      <term><constant>TokyoTyrant::RDBQCFTS_EX</constant></term>
-      <listitem>
-       <para>full-text search with the compound expression of (Tokyo Tyrant &gt;= 1.1.29)</para>
-      </listitem>
-     </varlistentry>
-
-    <varlistentry xml:id="tokyotyrant.constants.rdbms-union">
-     <term><constant>TokyoTyrant::RDBQCFTS_AND</constant></term>
-     <listitem>
-      <para>Metasearch union between records (Tokyo Tyrant &gt;= 1.1.33)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="tokyotyrant.constants.rdbms-isect">
-     <term><constant>TokyoTyrant::RDBQCFTS_OR</constant></term>
-     <listitem>
-      <para>Metasearch intersection between records (Tokyo Tyrant &gt;= 1.1.33)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="tokyotyrant.constants.rdbms-diff">
-     <term><constant>TokyoTyrant::RDBQCFTS_EX</constant></term>
-     <listitem>
-      <para>Metasearch difference between records (Tokyo Tyrant &gt;= 1.1.33)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="tokyotyrant.constants.rdbt-recon">
-     <term><constant>TokyoTyrant::RDBT_RECON</constant></term>
-     <listitem>
-      <para>Whether to reconnect on connection failure. 
-            It is recommended to have this parameter on for persistent connections</para>
-     </listitem>
-    </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbxolck-rec">
-      <term><constant>TokyoTyrant::RDBXOLCK_REC</constant></term>
-      <listitem>
-       <para>record locking</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbxolck-glb">
-      <term><constant>TokyoTyrant::RDBXOLCK_GLB</constant></term>
-      <listitem>
-       <para>global locking</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbrec-int">
-      <term><constant>TokyoTyrant::RDBREC_INT</constant></term>
-      <listitem>
-       <para>record type int</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.rdbrec-dbl">
-      <term><constant>TokyoTyrant::RDBREC_DBL</constant></term>
-      <listitem>
-       <para>record type float (double)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-success">
-      <term><constant>TokyoTyrant::TTE_SUCCESS</constant></term>
-      <listitem>
-       <para>success</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-invalid">
-      <term><constant>TokyoTyrant::TTE_INVALID</constant></term>
-      <listitem>
-       <para>invalid operation</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-nohost">
-      <term><constant>TokyoTyrant::TTE_NOHOST</constant></term>
-      <listitem>
-       <para>host not found</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-refused">
-      <term><constant>TokyoTyrant::TTE_REFUSED</constant></term>
-      <listitem>
-       <para>connection refused</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-send">
-      <term><constant>TokyoTyrant::TTE_SEND</constant></term>
-      <listitem>
-       <para>send error</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-recv">
-      <term><constant>TokyoTyrant::TTE_RECV</constant></term>
-      <listitem>
-       <para>recv error</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-keep">
-      <term><constant>TokyoTyrant::TTE_KEEP</constant></term>
-      <listitem>
-       <para>record exist</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-norec">
-      <term><constant>TokyoTyrant::TTE_NOREC</constant></term>
-      <listitem>
-       <para>no record found</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="tokyotyrant.constants.tte-misc">
-      <term><constant>TokyoTyrant::TTE_MISC</constant></term>
-      <listitem>
-       <para>miscellaneous error</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.tokyo-tyrant.entities.tokyotyrant;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/add.xml b/reference/tokyo_tyrant/tokyotyrant/add.xml
deleted file mode 100644
index 2c8132647a..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/add.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::add</refname>
-  <refpurpose>Adds to a numeric key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>TokyoTyrant::add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>float</type></type><parameter>increment</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds to an int or double value. This increments the value by the given amount
-   and returns the new value. If the key does not exist a new key is created with
-   initial value of the increment parameter.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The string key
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>increment</parameter></term>
-     <listitem>
-      <para>
-       The amount to increment
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       <constant>TokyoTyrant::RDBREC_INT</constant> or <constant>TokyoTyrant::RDBREC_DBL</constant> constant.
-       If this parameter is omitted the type is guessed from the <parameter>increment</parameter>
-       parameters type.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the new value on success
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::add</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost", TokyoTyrant::RDBDEF_PORT);
-/* Adds integer 3 to key and creates a new key */
-$tt->add("test", 3);
-
-/* String value is converted to double */
-echo $tt->add("test", "3.5", TokyoTyrant::RDBREC_DBL);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-6.5
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-    <member><methodname>TokyoTyrant::putcat</methodname></member>
-    <member><methodname>TokyoTyrant::putkeep</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/connect.xml b/reference/tokyo_tyrant/tokyotyrant/connect.xml
deleted file mode 100644
index fcbe9ce872..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/connect.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::connect</refname>
-  <refpurpose>Connect to a database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>TokyoTyrant::RDBDEF_PORT</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects to a remote database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>host</parameter></term>
-     <listitem>
-      <para>
-       The hostname
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>port</parameter></term>
-     <listitem>
-      <para>
-       The port. Default: 1978
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       Connection options: timeout (default: 5.0), reconnect (default: &true;) and persistent (default: &true;)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::connect</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant();
-$tt->connect("localhost", TokyoTyrant::RDBDEF_PORT)->put("test", "value");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::connectUri</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/connecturi.xml b/reference/tokyo_tyrant/tokyotyrant/connecturi.xml
deleted file mode 100644
index 9458e11161..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/connecturi.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.connecturi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::connectUri</refname>
-  <refpurpose>Connects to a database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::connectUri</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects to a database using an uri
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>uri</parameter></term>
-     <listitem>
-      <para>
-       An URI to the database. For example <literal>tcp://localhost:1979/</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::connectUri</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant();
-$tt->connectUri("tcp://localhost:1978/")->put("test", "hi");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::connect</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/construct.xml b/reference/tokyo_tyrant/tokyotyrant/construct.xml
deleted file mode 100644
index 4287059c8b..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/construct.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::__construct</refname>
-  <refpurpose>Construct a new TokyoTyrant object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>TokyoTyrant::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>TokyoTyrant::RDBDEF_PORT</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a new TokyoTyrant object and optionally connects to the database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>host</parameter></term>
-     <listitem>
-      <para>
-       The hostname. Default: &null;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>port</parameter></term>
-     <listitem>
-      <para>
-       port number. Default: 1978
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       Connection options: timeout (default: 5.0), reconnect (default: &true;) and persistent (default: &true;)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Throws TokyoTyrantException if connection to database fails
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::connect</methodname></member>
-    <member><methodname>TokyoTyrant::connectUri</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/copy.xml b/reference/tokyo_tyrant/tokyotyrant/copy.xml
deleted file mode 100644
index 69a5f77a54..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/copy.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::copy</refname>
-  <refpurpose>Copies the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::copy</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a copy of the current database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>path</parameter></term>
-     <listitem>
-      <para>
-       Path to where to copy the database. The user running the remote 
-       database must have a write access to the directory.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::copy</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost", 1978);
-$tt->copy("/tmp/foobar.tct");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::restore</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/ext.xml b/reference/tokyo_tyrant/tokyotyrant/ext.xml
deleted file mode 100644
index 56ee571a43..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/ext.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.ext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::ext</refname>
-  <refpurpose>Execute a remote script</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>TokyoTyrant::ext</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>options</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Executes a remote script extension. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of the function to execute
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       Either <constant>TokyoTyrant::RDBXO_LCKREC</constant> for record locking and
-       <constant>TokyoTyrant::RDBXO_LCKGLB</constant> for global locking.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key to pass to the function
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value to pass to the function
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the result of the script function
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::ext</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost", 1978);
-echo $tt->ext("somefunc", TokyoTyrant::RDBXO_LCKREC, "some_key", "some_value");
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/fwmkeys.xml b/reference/tokyo_tyrant/tokyotyrant/fwmkeys.xml
deleted file mode 100644
index 7062446e19..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/fwmkeys.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.fwmkeys" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::fwmKeys</refname>
-  <refpurpose>Returns the forward matching keys</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrant::fwmKeys</methodname>
-   <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_recs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the forward matching keys from the database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>prefix</parameter></term>
-     <listitem>
-      <para>
-       Prefix of the keys
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>max_recs</parameter></term>
-     <listitem>
-      <para>
-       Maximum records to return
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of matching keys. The values are not returned
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::fwmKeys</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$tt = new TokyoTyrant("localhost");
-
-/* Create 20 macthing keys */
-for ($i = 0; $i < 20; $i++) {
-    $tt->put("key_" . $i, "value_" . $i);
-}
-
-/* Create 20 non-macthing keys */
-for ($i = 0; $i < 20; $i++) {
-    $tt->put("something_" . $i, "data_" . $i);
-}
-
-/* Get five matching keys */
-var_dump($tt->fwmKeys("key_", 5));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(5) {
-  [0]=>
-  string(5) "key_5"
-  [1]=>
-  string(6) "key_14"
-  [2]=>
-  string(5) "key_6"
-  [3]=>
-  string(6) "key_15"
-  [4]=>
-  string(5) "key_7"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/get.xml b/reference/tokyo_tyrant/tokyotyrant/get.xml
deleted file mode 100644
index 6758a9d387..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/get.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::get</refname>
-  <refpurpose>The get purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrant::get</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is used to return a value or multiple values. This method accepts a <type>string</type>
-   or an <type>array</type> as a value. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A <type>string</type> key or an <type>array</type> of <type>string</type> keys
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string or an array based on the given parameters. Throws a TokyoTyrantException
-   on error. If string is passed null is returned if the key is not found. In case an array
-   is given as an parameter only existing keys will be returned. It is not an error to pass 
-   a key that does not exist.
-   </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::get</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost", 1978);
-$tt->put("key1", "value1");
-$tt->put("key2", "value2");
-var_dump($tt->get(array("key1", "key2")));
-var_dump($tt->get("key1"));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["key1"]=>
-  string(6) "value1"
-  ["key2"]=>
-  string(6) "value2"
-}
-string(6) "value1"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/getiterator.xml b/reference/tokyo_tyrant/tokyotyrant/getiterator.xml
deleted file mode 100644
index db912e8ee0..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/getiterator.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.getiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::getIterator</refname>
-  <refpurpose>Get an iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrantIterator</type><methodname>TokyoTyrant::getIterator</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets an iterator for iterating all keys / values in the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns TokyoTyrantIterator object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::getIterator</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost");
-$it = $tt->getIterator();
-
-foreach ($it as $k => $v) {
-
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::getQuery</methodname></member>
-    <member><methodname>TokyoTyrantTable::getIterator</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/num.xml b/reference/tokyo_tyrant/tokyotyrant/num.xml
deleted file mode 100644
index 3d55bd5277..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/num.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.num" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::num</refname>
-  <refpurpose>Number of records in the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>TokyoTyrant::num</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the number of records in the database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns number of records in the database
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::num</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-/* Echo the number of records */
-echo $tt->num();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-1234
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::stat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/out.xml b/reference/tokyo_tyrant/tokyotyrant/out.xml
deleted file mode 100644
index 0c993c7ab6..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/out.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.out" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::out</refname>
-  <refpurpose>Removes records</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::out</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <!-- <methodparam choice="opt"><type>string</type><parameter>value</parameter><initializer>NULL</initializer></methodparam> -->
-  </methodsynopsis>
-  <para>
-   Removes a record or multiple records. This method accepts a <type>string</type> for a single key
-   or an array of keys for multiple records.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A <type>string</type> key or an <type>array</type> of <type>string</type> keys
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::out</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-$tt->put("test1", "value1");
-$tt->put("test2", "value2");
-
-$tt->out(array("test1", "test2"));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/put.xml b/reference/tokyo_tyrant/tokyotyrant/put.xml
deleted file mode 100644
index 17be9df0ef..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/put.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.put" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::put</refname>
-  <refpurpose>Puts values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::put</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Puts a key-value pair into the database or multiple key-value pairs. If <parameter>keys</parameter> is
-   string then the second parameter value defines the value. 
-   The second parameter is mandatory if <parameter>keys</parameter> is a string. If the key exists the value
-   will be replaced with new value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A string key or an array of key-value pairs
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value in case a string key is used
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    This method returns a reference to the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::put</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-/* Put single key-value pair */
-$tt->put("key", "value");
-
-/* Put key-value pairs, new value overwrites the old */
-$tt->put(array("key1" => "value1", "key" => "value2"));
-
-/* Get back one key */
-echo $tt->get("key");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-value2
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::putKeep</methodname></member>
-    <member><methodname>TokyoTyrant::putCat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/putcat.xml b/reference/tokyo_tyrant/tokyotyrant/putcat.xml
deleted file mode 100644
index 14067ec0e3..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/putcat.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.putcat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::putCat</refname>
-  <refpurpose>Concatenates to a record</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::putCat</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Appends a value into existing key or multiple values if <parameter>keys</parameter> is an array.
-   The second parameter is mandatory if <parameter>keys</parameter> is a string. If the record does 
-   not exist a new record is created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A <type>string</type> key or an <type>array</type> of key-value pairs
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value in case a string key is used
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a reference to the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::putCat</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-/* Create a new key */
-$tt->put("key", "value");
-
-/* Concatenate single key-value pair */
-$tt->putCat("key", " has more data");
-
-/* Echo the key */
-echo $tt->get("key");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-value has more data
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-    <member><methodname>TokyoTyrant::putKeep</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/putkeep.xml b/reference/tokyo_tyrant/tokyotyrant/putkeep.xml
deleted file mode 100644
index 0743193016..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/putkeep.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.putkeep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::putKeep</refname>
-  <refpurpose>Puts a record</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::putKeep</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Puts a key-value pair into the database or multiple key-value pairs. If <parameter>keys</parameter> is
-   string then the second parameter value defines the value. 
-   The second parameter is mandatory if <parameter>keys</parameter> is a string. If the key already 
-   exists this method throws an exception indicating that the records exists.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A <type>string</type> key or an <type>array</type> of key-value pairs
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The <type>string</type> value
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a reference to the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>tokyotyrant::putKeep</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-/* Create a new key */
-$tt->put("key", "value");
-
-try {
-    $tt->putKeep("key", "new value");
-} catch (TokyoTyrantException $e) {
-    if ($e->getCode() === TokyoTyrant::TTE_KEEP) {
-        echo "Existing record! Not modified\n";
-    } else {
-        echo "Error: " , $e->getMessage() , "\n"; 
-    }
-}
-echo $tt->get("key");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Existing record! Not modified
-value
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-    <member><methodname>TokyoTyrant::putCat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/putnr.xml b/reference/tokyo_tyrant/tokyotyrant/putnr.xml
deleted file mode 100644
index 8336a7ecfe..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/putnr.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.putnr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::putNr</refname>
-  <refpurpose>Puts value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::putNr</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Puts a key-value pair into the database or multiple key-value pairs. If <parameter>keys</parameter> is
-   string then the second parameter value defines the value. 
-   The second parameter is mandatory if <parameter>keys</parameter> is a string. This method does not wait
-   for the response from the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A string key or an array of key-value pairs
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value in case a string key is used
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    This method returns a reference to the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::putNr</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-/* Put single key-value pair */
-$tt->putNr("key", "value");
-
-/* Put key-value pairs */
-$tt->putNr(array("key1" => "value1", "key2" => "value2"));
-
-/* Get back one key */
-echo $tt->get("key1");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-value1
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::putNr</methodname></member>
-    <member><methodname>TokyoTyrant::putKeep</methodname></member>
-    <member><methodname>TokyoTyrant::putCat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/putshl.xml b/reference/tokyo_tyrant/tokyotyrant/putshl.xml
deleted file mode 100644
index a19e4734cd..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/putshl.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.putshl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::putShl</refname>
-  <refpurpose>Concatenates to a record</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrant::putShl</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Concatenate to a record and shift to left. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       A string key
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value to concatenate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the record
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns a reference to the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::putShl</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database on default port */
-$tt = new TokyoTyrant("localhost");
-
-/* Create a new key */
-$tt->put("key", "just a long piece of data");
-
-/* Concatenate and shift to left */
-$tt->putShl("key", " and string", 15);
-
-/* Echo the key */
-echo $tt->get("key");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-data and string
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-    <member><methodname>TokyoTyrant::putKeep</methodname></member>
-    <member><methodname>TokyoTyrant::putCat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/restore.xml b/reference/tokyo_tyrant/tokyotyrant/restore.xml
deleted file mode 100644
index 48183dc900..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/restore.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.restore" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::restore</refname>
-  <refpurpose>Restore the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrant::restore</methodname>
-   <methodparam><type>string</type><parameter>log_dir</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>check_consistency</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Restore the database from the update log.
-  </para>
-  <warning>
-   <simpara>
-    This method is not supported on 32bit platforms.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>log_dir</parameter></term>
-     <listitem>
-      <para>
-       Directory where the log is
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>timestamp</parameter></term>
-     <listitem>
-      <para>
-       Beginning timestamp with microseconds
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>check_consistency</parameter></term>
-     <listitem>
-      <para>
-       Whether to check consistency: Default: &true;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/setmaster.xml b/reference/tokyo_tyrant/tokyotyrant/setmaster.xml
deleted file mode 100644
index db36b06b49..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/setmaster.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.setmaster" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::setMaster</refname>
-  <refpurpose>Set the replication master</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrant::setMaster</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>check_consistency</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the replication master of the database
-  </para>
-  <warning>
-   <simpara>
-    This method is not supported on 32bit platforms.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>host</parameter></term>
-     <listitem>
-      <para>
-       Hostname of the replication master. If &null; the replication is disabled.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>port</parameter></term>
-     <listitem>
-      <para>
-       Port of the replication master
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>timestamp</parameter></term>
-     <listitem>
-      <para>
-       Beginning timestamp with microseconds
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>check_consistency</parameter></term>
-     <listitem>
-      <para>
-       Whether to check consistency.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::setMaster</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a database */
-$tt = new TokyoTyrant("tokyotyrant.example.com");
-
-/* Disable the replication */
-$tt->setMaster(NULL, 0, 0);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Classname::Method</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/size.xml b/reference/tokyo_tyrant/tokyotyrant/size.xml
deleted file mode 100644
index 027ad96380..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/size.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.size" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::size</refname>
-  <refpurpose>Returns the size of the value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>TokyoTyrant::size</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the size of a value by key
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of which size to fetch
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the size of the key or throw TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::size</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost");
-
-$tt->put("test_key", "12345");
-
-echo $tt->size("test_key");
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-5
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/stat.xml b/reference/tokyo_tyrant/tokyotyrant/stat.xml
deleted file mode 100644
index 6cc733d28d..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/stat.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.stat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::stat</refname>
-  <refpurpose>Get statistics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrant::stat</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns statistics of the remote database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of key value pairs describing the statistics
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::stat</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost");
-
-var_dump($tt->stat());
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(19) {
-  ["version"]=>
-  string(6) "1.1.28"
-  ["libver"]=>
-  string(3) "311"
-  ["protver"]=>
-  string(4) "0.91"
-  ["os"]=>
-  string(5) "Linux"
-  ["time"]=>
-  string(17) "1247358357.665630"
-  ["pid"]=>
-  string(5) "14348"
-  ["sid"]=>
-  string(8) "59025947"
-  ["type"]=>
-  string(9) "on-memory"
-  ["path"]=>
-  string(1) "*"
-  ["rnum"]=>
-  string(1) "4"
-  ["size"]=>
-  string(6) "262856"
-  ["bigend"]=>
-  string(1) "0"
-  ["fd"]=>
-  string(1) "5"
-  ["loadavg"]=>
-  string(8) "0.000000"
-  ["memsize"]=>
-  string(8) "77328384"
-  ["memrss"]=>
-  string(7) "1183744"
-  ["ru_real"]=>
-  string(13) "162776.042152"
-  ["ru_user"]=>
-  string(8) "0.476029"
-  ["ru_sys"]=>
-  string(8) "8.652540"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Classname::Method</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/sync.xml b/reference/tokyo_tyrant/tokyotyrant/sync.xml
deleted file mode 100644
index c0dd19c56d..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/sync.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.sync" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::sync</refname>
-  <refpurpose>Synchronize the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrant::sync</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Synchronizes the database on to the physical device
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/tune.xml b/reference/tokyo_tyrant/tokyotyrant/tune.xml
deleted file mode 100644
index d69817c766..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/tune.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.tune" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::tune</refname>
-  <refpurpose>Tunes connection values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrant</type><methodname>TokyoTyrant::tune</methodname>
-   <methodparam><type>float</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>TokyoTyrant::RDBT_RECON</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Tunes database connection options. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>timeout</parameter></term>
-     <listitem>
-      <para>
-       The objects timeout value (default: 5.0)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       Bitmask of options to tune. This can be either 0 or <constant>TokyoTyrant::RDBT_RECON</constant>. 
-       It is recommended not to change the second parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    This method returns a reference to the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrant/vanish.xml b/reference/tokyo_tyrant/tokyotyrant/vanish.xml
deleted file mode 100644
index 07278fe1d9..0000000000
--- a/reference/tokyo_tyrant/tokyotyrant/vanish.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrant.vanish" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrant::vanish</refname>
-  <refpurpose>Empties the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrant::vanish</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Empties a remote database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrant::vanish</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrant("localhost");
-$tt->vanish();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::out</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantexception.xml b/reference/tokyo_tyrant/tokyotyrantexception.xml
deleted file mode 100644
index 829bf7389e..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantexception.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.tokyotyrantexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The TokyoTyrantException class</title>
- <titleabbrev>TokyoTyrantException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ tokyotyrantexception intro -->
-  <section xml:id="tokyotyrantexception.intro">
-   &reftitle.intro;
-   <para>
-    TokyoTyrantException
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="tokyotyrantexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>tokyotyrantexception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>tokyotyrantexception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>int</type>
-     <varname linkend="tokyotyrantexception.props.code">code</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ tokyotyrantexception properties -->
-  <section xml:id="tokyotyrantexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="tokyotyrantexception.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para>The exception code. This can be compared to <constant>TokyoTyrant::TTE_*</constant> constants</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator.xml b/reference/tokyo_tyrant/tokyotyrantiterator.xml
deleted file mode 100644
index 4c64a5b852..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.tokyotyrantiterator" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The TokyoTyrantIterator class</title>
- <titleabbrev>TokyoTyrantIterator</titleabbrev>
-
- <partintro>
-
-<!-- {{{ tokyotyrantiterator intro -->
-  <section xml:id="tokyotyrantiterator.intro">
-   &reftitle.intro;
-   <para>
-    Provides an iterator for TokyoTyrant and TokyoTyrantTable objects. The iterator iterates over
-    all keys and values in the database. TokyoTyrantIterator was added in version 0.2.0.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="tokyotyrantiterator.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>TokyoTyrantIterator</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>TokyoTyrantIterator</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tokyotyrantiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">Inherited methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tokyotyrant')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.tokyo-tyrant.entities.tokyotyrantiterator;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator/construct.xml b/reference/tokyo_tyrant/tokyotyrantiterator/construct.xml
deleted file mode 100644
index 1c7e7cc189..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator/construct.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantiterator.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantIterator::__construct</refname>
-  <refpurpose>Construct an iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>TokyoTyrantIterator::__construct</methodname>
-   <methodparam><type>mixed</type><parameter>object</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Construct a new TokyoTyrantIterator object. One connection can have multiple iterators but it is not quaranteed
-   that all items are traversed in that case. <parameter>object</parameter> parameter can be either an of instance 
-   TokyoTyrant or TokyoTyrantTable.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Throws an exception if iterator initialization fails.
-  </para>
- </refsect1>
-
-  <refsect1 role="examples">
-   &reftitle.examples;
-   <para>
-    <example>
-     <title><methodname>TokyoTyrantIterator::__construct</methodname> example</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Passing null to put generates a new uid */
-$index = $tt->put(null, array("column1" => "some data", "column2" => "more data"));
-
-/* Construct an iterator */
-$it = new TokyoTyrantIterator($tt);
-
-foreach ($it as $value) {
-    var_dump($value);
-}
-?>
-]]>
-     </programlisting>
-     &example.outputs;
-     <screen>
-<![CDATA[
-array(2) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-}
-]]>
-     </screen>
-    </example>
-   </para>
-  </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantIterator::key</methodname></member>
-     <member><methodname>TokyoTyrantIterator::current</methodname></member>
-     <member><methodname>TokyoTyrantIterator::next</methodname></member>
-     <member><methodname>TokyoTyrantIterator::rewind</methodname></member>
-     <member><methodname>TokyoTyrantIterator::key</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator/current.xml b/reference/tokyo_tyrant/tokyotyrantiterator/current.xml
deleted file mode 100644
index 6ec67871fa..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator/current.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantiterator.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantIterator::current</refname>
-  <refpurpose>Get the current value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantIterator::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current value during iteration.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current value on success and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantIterator::valid</methodname></member>
-     <member><methodname>TokyoTyrantIterator::key</methodname></member>
-     <member><methodname>TokyoTyrantIterator::next</methodname></member>
-     <member><methodname>TokyoTyrantIterator::rewind</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator/key.xml b/reference/tokyo_tyrant/tokyotyrantiterator/key.xml
deleted file mode 100644
index 1bb96bc645..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator/key.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantiterator.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantIterator::key</refname>
-  <refpurpose>Returns the current key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantIterator::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current key on success and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantIterator::valid</methodname></member>
-     <member><methodname>TokyoTyrantIterator::current</methodname></member>
-     <member><methodname>TokyoTyrantIterator::next</methodname></member>
-     <member><methodname>TokyoTyrantIterator::rewind</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator/next.xml b/reference/tokyo_tyrant/tokyotyrantiterator/next.xml
deleted file mode 100644
index fa7fc6ab47..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator/next.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantiterator.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantIterator::next</refname>
-  <refpurpose>Move to next key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantIterator::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Move to next key during iteration and return it's value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the next value on success and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantIterator::valid</methodname></member>
-     <member><methodname>TokyoTyrantIterator::key</methodname></member>
-     <member><methodname>TokyoTyrantIterator::current</methodname></member>
-     <member><methodname>TokyoTyrantIterator::rewind</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator/rewind.xml b/reference/tokyo_tyrant/tokyotyrantiterator/rewind.xml
deleted file mode 100644
index 220d54d0a6..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator/rewind.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantiterator.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantIterator::rewind</refname>
-  <refpurpose>Rewinds the iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantIterator::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Rewinds the iterator for new iteration. Called automatically at the beginning of foreach.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Throws TokyoTyrantException if iterator initialization fails.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantIterator::valid</methodname></member>
-     <member><methodname>TokyoTyrantIterator::current</methodname></member>
-     <member><methodname>TokyoTyrantIterator::next</methodname></member>
-     <member><methodname>TokyoTyrantIterator::rewind</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantiterator/valid.xml b/reference/tokyo_tyrant/tokyotyrantiterator/valid.xml
deleted file mode 100644
index edbb27adf7..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantiterator/valid.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantiterator.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantIterator::valid</refname>
-  <refpurpose>Rewinds the iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>TokyoTyrantIterator::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks whether the internal pointer points to valid element.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the current item is valid and &false; if not.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantIterator::key</methodname></member>
-     <member><methodname>TokyoTyrantIterator::current</methodname></member>
-     <member><methodname>TokyoTyrantIterator::next</methodname></member>
-     <member><methodname>TokyoTyrantIterator::rewind</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery.xml b/reference/tokyo_tyrant/tokyotyrantquery.xml
deleted file mode 100644
index 42d34af223..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.tokyotyrantquery" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The TokyoTyrantQuery class</title>
- <titleabbrev>TokyoTyrantQuery</titleabbrev>
-
- <partintro>
-
-<!-- {{{ tokyotyrantquery intro -->
-  <section xml:id="tokyotyrantquery.intro">
-   &reftitle.intro;
-   <para>
-    This class is used to query the table databases
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="tokyotyrantquery.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>TokyoTyrantQuery</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>TokyoTyrantQuery</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tokyotyrantquery')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.tokyo-tyrant.entities.tokyotyrantquery;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/addcond.xml b/reference/tokyo_tyrant/tokyotyrantquery/addcond.xml
deleted file mode 100644
index 6cf293ddd6..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/addcond.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.addcond" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::addCond</refname>
-  <refpurpose>Adds a condition to the query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantQuery::addCond</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>op</parameter></methodparam>
-   <methodparam><type>string</type><parameter>expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a condition to the query. Condition can be something like: get all keys which value
-   matches expr. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of the column in the condition
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>op</parameter></term>
-     <listitem>
-      <para>
-       The operator. One of the <constant>TokyoTyrant::RDBQC_*</constant> constants
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expr</parameter></term>
-     <listitem>
-      <para>
-       The expression
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantQuery::addCond</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "not here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Dump the search results */
-var_dump($query->search());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [1]=>
-  array(2) {
-    ["column1"]=>
-    string(9) "some data"
-    ["column2"]=>
-    string(14) "something here"
-  }
-  [4]=>
-  array(2) {
-    ["column45"]=>
-    string(11) "random data"
-    ["column2"]=>
-    string(25) "something along the lines"
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Classname::Method</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/construct.xml b/reference/tokyo_tyrant/tokyotyrantquery/construct.xml
deleted file mode 100644
index e6fd0a1eb2..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/construct.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::__construct</refname>
-  <refpurpose>Construct a new query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>TokyoTyrantQuery::__construct</methodname>
-   <methodparam><type>TokyoTyrantTable</type><parameter>table</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Construct a new query object
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>table</parameter></term>
-     <listitem>
-      <para>
-       TokyoTyrantTable object with active database connection
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new TokyoTyrantQuery object and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantQuery::__construct</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-$query = new TokyoTyrantQuery($tt);
-
-/* Work with $query */
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::getQuery</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/count.xml b/reference/tokyo_tyrant/tokyotyrantquery/count.xml
deleted file mode 100644
index d6b4c9a465..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/count.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::count</refname>
-  <refpurpose>Counts records</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>TokyoTyrantQuery::count</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a count of how many records a query returns.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a count of matching rows and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantQuery::count</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "not here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Count the results */
-var_dump($query->count());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(2)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::out</methodname></member>
-    <member><methodname>TokyoTyrantQuery::search</methodname></member>
-    <member><methodname>TokyoTyrantQuery::metaSearch</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/current.xml b/reference/tokyo_tyrant/tokyotyrantquery/current.xml
deleted file mode 100644
index f8c11871eb..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/current.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::current</refname>
-  <refpurpose>Returns the current element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrantQuery::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current element. Part of Iterator interface
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current row
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>TokyoTyrantQuery iterator example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "foobar here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Iterate the results */
-foreach ($query as $key => $value) {
-    echo "pk: $key, columns: ", count($value) ,"\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-pk: 1, columns: 2
-pk: 4, columns: 2
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/hint.xml b/reference/tokyo_tyrant/tokyotyrantquery/hint.xml
deleted file mode 100644
index 1424c1fc36..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/hint.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.hint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::hint</refname>
-  <refpurpose>Get the hint string of the query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>TokyoTyrantQuery::hint</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the hint string of the query. The hint string contains information about an executed query and
-   it could be compared to for example MySQL EXPLAIN statement.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method always returns a string
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>TokyoTyrantQuery::hint example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrantTable("localhost", 1979);
-$tt->vanish();
-
-for ($i = 0; $i < 11; $i++) {
-     $tt->put(null, array('a_col' => 'a' . $i, 'b_col' => 'b' . $i));
-}
-
-$query = $tt->getQuery();
-$query->addCond('a_col', TokyoTyrant::RDBQC_STRBW, 'a');
-
-$query->search();
-var_dump($query->hint());
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-string(72) "
-scanning the whole table
-result set size: 11
-leaving the natural order
-"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/key.xml b/reference/tokyo_tyrant/tokyotyrantquery/key.xml
deleted file mode 100644
index c0c0be0a72..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/key.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::key</refname>
-  <refpurpose>Returns the current key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>TokyoTyrantQuery::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current key. Part of the Iterator interface
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current key and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>TokyoTyrantQuery iterator example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "foobar here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Iterate the results */
-foreach ($query as $key => $value) {
-    echo "pk: $key, columns: ", count($value) ,"\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-pk: 1, columns: 2
-pk: 4, columns: 2
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/metasearch.xml b/reference/tokyo_tyrant/tokyotyrantquery/metasearch.xml
deleted file mode 100644
index 8456d6d377..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/metasearch.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.metasearch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::metaSearch</refname>
-  <refpurpose>Retrieve records with multiple queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrantQuery::metaSearch</methodname>
-   <methodparam><type>array</type><parameter>queries</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Executes multiple queries on a database and returns matching records. The current object
-   is always the left most object in the search.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>queries</parameter></term>
-     <listitem>
-      <para>
-       Array of TokyoTyrantQuery objects
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       One of the <constant>TokyoTyrant::RDBMS_*</constant> constants
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the matching rows and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantQuery::metaSearch</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add test data */
-$tt->put('cherry',     array('color' => 'red'));
-$tt->put('strawberry', array('color' => 'red'));
-$tt->put('apple',      array('color' => 'green'));
-$tt->put('lemon',      array('color' => 'yellow'));
-
-/* First query */
-$query = $tt->getQuery();
-$query->addCond('color', TokyoTyrant::RDBQC_STREQ, 'red')->setOrder('color', TokyoTyrant::RDBQO_STRASC);
-
-/* Second query */
-$query1 = $tt->getQuery();
-$query1->addCond('color', TokyoTyrant::RDBQC_STREQ, 'yellow');
-
-/* Get union between the queries */
-var_dump($query->metaSearch(array($query1), TokyoTyrant::RDBMS_UNION));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  ["cherry"]=>
-  array(1) {
-    ["color"]=>
-    string(3) "red"
-  }
-  ["strawberry"]=>
-  array(1) {
-    ["color"]=>
-    string(3) "red"
-  }
-  ["lemon"]=>
-  array(1) {
-    ["color"]=>
-    string(6) "yellow"
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::search</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/next.xml b/reference/tokyo_tyrant/tokyotyrantquery/next.xml
deleted file mode 100644
index e56795b62e..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/next.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::next</refname>
-  <refpurpose>Moves the iterator to next entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrantQuery::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the next result in the resultset. Part of the Iterator interface.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the next row and throws TokyoTyrantException on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>TokyoTyrantQuery iterator example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "foobar here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Iterate the results */
-foreach ($query as $key => $value) {
-    echo "pk: $key, columns: ", count($value) ,"\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-pk: 1, columns: 2
-pk: 4, columns: 2
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/out.xml b/reference/tokyo_tyrant/tokyotyrantquery/out.xml
deleted file mode 100644
index d93c2397bb..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/out.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.out" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::out</refname>
-  <refpurpose>Removes records based on query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrantQuery</type><methodname>TokyoTyrantQuery::out</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Removes all records that match the query. Works exactly like search but removes the records instead
-   of returning them.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantQuery::out</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "foobar here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Remove matching records */
-$query->out();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/rewind.xml b/reference/tokyo_tyrant/tokyotyrantquery/rewind.xml
deleted file mode 100644
index d8bf0f006e..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/rewind.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::rewind</refname>
-  <refpurpose>Rewinds the iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>TokyoTyrantQuery::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Rewind the resultset and executes the query if it has not been executed. Part of the Iterator interface.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>TokyoTyrantQuery iterator example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "foobar here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Iterate the results */
-foreach ($query as $key => $value) {
-    echo "pk: $key, columns: ", count($value) ,"\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-pk: 1, columns: 2
-pk: 4, columns: 2
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/search.xml b/reference/tokyo_tyrant/tokyotyrantquery/search.xml
deleted file mode 100644
index d2a361a8be..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/search.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.search" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::search</refname>
-  <refpurpose>Searches records</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrantQuery::search</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Executes a search on the table database. Returns an array of arrays containing the matching records.
-   In the returned array the first level is the primary key of the data and the second level is the row data.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the matching rows and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantQuery::search</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "not here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Dump the search results */
-var_dump($query->search());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [1]=>
-  array(2) {
-    ["column1"]=>
-    string(9) "some data"
-    ["column2"]=>
-    string(14) "something here"
-  }
-  [4]=>
-  array(2) {
-    ["column45"]=>
-    string(11) "random data"
-    ["column2"]=>
-    string(25) "something along the lines"
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::out</methodname></member>
-    <member><methodname>TokyoTyrantQuery::metaSearch</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/setlimit.xml b/reference/tokyo_tyrant/tokyotyrantquery/setlimit.xml
deleted file mode 100644
index 8c32e7c4fc..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/setlimit.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.setlimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::setLimit</refname>
-  <refpurpose>Limit results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantQuery::setLimit</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>max</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>skip</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the maximum amount of records to return on a query.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>max</parameter></term>
-     <listitem>
-      <para>
-       Maximum amount of records. Default: -1
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>skip</parameter></term>
-     <listitem>
-      <para>
-       How many records to skip from the start. Default: -1
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/setorder.xml b/reference/tokyo_tyrant/tokyotyrantquery/setorder.xml
deleted file mode 100644
index 00138c4ca1..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/setorder.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.setorder" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::setOrder</refname>
-  <refpurpose>Orders results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantQuery::setOrder</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the order of a query
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The column name to apply the ordering on.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>type</parameter> can be one of the following 
-       constants:
-      </para>
-      <itemizedlist>
-       <listitem>
-        <simpara>
-         <constant>TokyoTyrant::RDBQO_STRASC</constant> - String ascending
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>TokyoTyrant::RDBQO_STRDESC</constant> - String descending
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>TokyoTyrant::RDBQO_NUMASC</constant> - Numberic ascending
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <constant>TokyoTyrant::RDBQO_NUMDESC</constant> - String descending
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyrantquery/valid.xml b/reference/tokyo_tyrant/tokyotyrantquery/valid.xml
deleted file mode 100644
index 7728e02335..0000000000
--- a/reference/tokyo_tyrant/tokyotyrantquery/valid.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyrantquery.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantQuery::valid</refname>
-  <refpurpose>Checks the validity of current item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>TokyoTyrantQuery::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the current item is valid. Part of the Iterator interface
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the current item is valid and &false; if not.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>TokyoTyrantQuery iterator example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Add rows */
-$tt->put(null, array("column1" => "some data", "column2" => "something here"));
-$tt->put(null, array("column1" => "more data", "column2" => "best data this far"));
-$tt->put(null, array("column1" => "again data", "column3" => "foobar here"));
-$tt->put(null, array("column45" => "random data", "column2" => "something along the lines"));
-$tt->put(null, array("column21" => "test data", "column2" => "generating.."));
-$tt->put(null, array("column1" => "foobar data", "column2" => "value here"));
-
-/* Get a new query object */
-$query = $tt->getQuery();
-
-/* Add a search condition */
-$query->addCond("column2", TokyoTyrant::RDBQC_STROR, "something");
-
-/* Iterate the results */
-foreach ($query as $key => $value) {
-    echo "pk: $key, columns: ", count($value) ,"\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-pk: 1, columns: 2
-pk: 4, columns: 2
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::addCond</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable.xml b/reference/tokyo_tyrant/tokyotyranttable.xml
deleted file mode 100644
index 2f8b10d599..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<phpdoc:classref xml:id="class.tokyotyranttable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The TokyoTyrantTable class</title>
- <titleabbrev>TokyoTyrantTable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ tokyotyranttable intro -->
-  <section xml:id="tokyotyranttable.intro">
-   &reftitle.intro;
-   <para>
-    Provides an API to the table databases. A table database can be create using the following
-    command: <literal>ttserver -port 1979 /tmp/tt_table.tct</literal>. In Tokyo Tyrant the table
-    API is a schemaless database which can store arbitrary amount of key-value pairs under a single
-    primary key.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="tokyotyranttable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>TokyoTyrantTable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>TokyoTyrantTable</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>TokyoTyrant</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tokyotyranttable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tokyotyrant')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.tokyo-tyrant.entities.tokyotyranttable;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/add.xml b/reference/tokyo_tyrant/tokyotyranttable/add.xml
deleted file mode 100644
index 50b52031a7..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/add.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::add</refname>
-  <refpurpose>Adds a record</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantTable::add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>increment</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is not supported with table databases.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The string key
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>increment</parameter></term>
-     <listitem>
-      <para>
-       The amount to increment
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       <constant>TokyoTyrant::RDB_RECINT</constant> or <constant>TokyoTyrant::RDB_RECDBL</constant> constant.
-       If this parameter is omitted the type is guessed from the <parameter>increment</parameter>
-       parameters type.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method throws an TokyoTyrantException if used through this class.
-  </para>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::add</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/genuid.xml b/reference/tokyo_tyrant/tokyotyranttable/genuid.xml
deleted file mode 100644
index a8d8bb08c9..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/genuid.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.genuid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::genUid</refname>
-  <refpurpose>Generate unique id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>TokyoTyrantTable::genUid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Generates an unique id inside the table database. In table databases rows are referenced
-   using a numeric primary key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an unique id or throws TokyoTyrantException on error 
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::genUid</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrantTable("localhost", 1122);
-
-echo $tt->genUid();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-4
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/get.xml b/reference/tokyo_tyrant/tokyotyranttable/get.xml
deleted file mode 100644
index 918c391754..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/get.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::get</refname>
-  <refpurpose>Get a row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>TokyoTyrantTable::get</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a row from table database. <parameter>keys</parameter> is a single integer for 
-   the primary key of the row or an array of integers for multiple rows.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       The primary key, can be a string or an integer
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the row as an array
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::get</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Passing null to put generates a new uid */
-$index = $tt->put(null, array("column1" => "some data", "column2" => "more data"));
-
-/* Get the row back */
-var_dump($tt->get($index));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Starting from version 0.3.0 this method accepts array as parameter. Please note
-    that multi-get on tables is not binary-safe.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/getiterator.xml b/reference/tokyo_tyrant/tokyotyranttable/getiterator.xml
deleted file mode 100644
index 8097449462..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/getiterator.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.getiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::getIterator</refname>
-  <refpurpose>Get an iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrantIterator</type><methodname>TokyoTyrantTable::getIterator</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets an iterator for iterating all keys / values in the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns TokyoTyrantIterator object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
-  <refsect1 role="examples">
-   &reftitle.examples;
-   <para>
-    <example>
-     <title><methodname>TokyoTyrantTable::getIterator</methodname> example</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$tt = new TokyoTyrantTable("localhost");
-$it = $tt->getIterator();
-
-foreach ($it as $k => $v) {
-  var_dump($k, $v);
-}
-?>
-]]>
-     </programlisting>
-    </example>
-   </para>
-  </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-     <member><methodname>TokyoTyrantTable::getQuery</methodname></member>
-     <member><methodname>TokyoTyrant::getIterator</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/getquery.xml b/reference/tokyo_tyrant/tokyotyranttable/getquery.xml
deleted file mode 100644
index ef907a96f2..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/getquery.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.getquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::getQuery</refname>
-  <refpurpose>Get a query object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>TokyoTyrantQuery</type><methodname>TokyoTyrantTable::getQuery</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get a query object to execute searches on the database
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns TokyoTyrantQuery on success and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::getQuery</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$table = new TokyoTyrantTable("localhost", 1979);
-
-/* Put a few rows */
-$table->put(null, array("column1" => "some data", "column2" => "more data"));
-$table->put(null, array("something" => "value", "data" => "good data"));
-
-/* Get query object */
-$query = $table->getQuery();
-
-/* Add condition to query */
-$query->addCond('data', TokyoTyrant::RDBQC_STREQ, 'good data');
-
-/* Get matching rows */
-var_dump($query->search());
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(1) {
-  [11]=>
-  array(2) {
-    ["something"]=>
-    string(5) "value"
-    ["data"]=>
-    string(9) "good data"
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantQuery::search</methodname></member>
-    <member><methodname>TokyoTyrantQuery::out</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/out.xml b/reference/tokyo_tyrant/tokyotyranttable/out.xml
deleted file mode 100644
index b666a008a5..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/out.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.out" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::out</refname>
-  <refpurpose>Remove records</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantTable::out</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <!-- <methodparam choice="opt"><type>string</type><parameter>value</parameter><initializer>NULL</initializer></methodparam> -->
-  </methodsynopsis>
-  <para>
-   Removes records from a table database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A single integer key or an array of integers
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::out</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Passing null to put generates a new uid */
-$index = $tt->put(null, array("column1" => "some data", "column2" => "more data"));
-
-/* Delete the row */
-$tt->out($index);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/put.xml b/reference/tokyo_tyrant/tokyotyranttable/put.xml
deleted file mode 100644
index d9881530eb..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/put.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.put" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::put</refname>
-  <refpurpose>Store a row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>TokyoTyrantTable::put</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>columns</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Puts a new row into the database. This method parameters are <parameter>key</parameter> which is 
-   the primary key of the row, passing &null; will generate a new unique id. <parameter>value</parameter>
-   is an array containing the row contents which is usually key value pairs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The primary key of the row
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       The row contents
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the primary key on success and throws TokyoTyrantException on error
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::put</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Passing null to put generates a new uid */
-$index = $tt->put(null, array("column1" => "some data", "column2" => "more data"));
-
-/* Get the row back */
-var_dump($tt->get($index));
-
-/* Modify an existing row */
-$tt->put($index, array("column1" => "other data", "column2" => "better data"));
-
-/* Get the row back */
-var_dump($tt->get($index));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-}
-array(2) {
-  ["column1"]=>
-  string(10) "other data"
-  ["column2"]=>
-  string(11) "better data"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::get</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/putcat.xml b/reference/tokyo_tyrant/tokyotyranttable/putcat.xml
deleted file mode 100644
index 869fb92550..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/putcat.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.putcat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::putCat</refname>
-  <refpurpose>Concatenates to a row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantTable::putCat</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>columns</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method can be used to add new columns to existing records. Existing keys will be left unmodified
-   but any new columns will be appended to the row. Passing null as key will generate a new row.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The primary key of the row or &null;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       Array of row contents
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the primary key and throws TokyoTyrantException on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::putCat</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Passing null to put generates a new uid */
-$index = $tt->put(null, array("column1" => "some data", "column2" => "more data"));
-
-/* Get the row back */
-var_dump($tt->get($index));
-
-/* Modify an existing row */
-$tt->putcat($index, array("column1" => "something new", "new_column" => "other data"));
-
-/* Get the row back */
-var_dump($tt->get($index));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-}
-array(3) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-  ["new_column"]=>
-  string(10) "other data"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/putkeep.xml b/reference/tokyo_tyrant/tokyotyranttable/putkeep.xml
deleted file mode 100644
index 17b1da437a..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/putkeep.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.putkeep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::putKeep</refname>
-  <refpurpose>Put a new record</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantTable::putKeep</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>columns</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Puts a new record into the database. If the key already exists this method throws an exception
-   indicating that the records exists.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The primary key of the row or &null;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       Array of the row contents
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the primary key and throws TokyoTyrantException on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>TokyoTyrantTable::putKeep</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Connect to a table database */
-$tt = new TokyoTyrantTable("localhost", 1979);
-
-/* Passing null to put generates a new uid */
-$index = $tt->put(null, array("column1" => "some data", "column2" => "more data"));
-
-/* Get the row back */
-var_dump($tt->get($index));
-
-try {
-    $tt->putKeep($index, array("column1" => "something new", "new_column" => "other data"));
-} catch (TokyoTyrantException $e) {
-    if ($e->getCode() === TokyoTyrant::TTE_KEEP) {
-        echo "Existing record! Not modified\n";
-    } else {
-        echo "Error: " , $e->getMessage() , "\n"; 
-    }
-}
-
-/* Get the row back */
-var_dump($tt->get($index));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-}
-Existing record! Not modified
-array(2) {
-  ["column1"]=>
-  string(9) "some data"
-  ["column2"]=>
-  string(9) "more data"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrantTable::put</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/putnr.xml b/reference/tokyo_tyrant/tokyotyranttable/putnr.xml
deleted file mode 100644
index 194721cb61..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/putnr.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.putnr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::putNr</refname>
-  <refpurpose>Puts value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantTable::putNr</methodname>
-   <methodparam><type>mixed</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is not supported on table databases. Calling this method through TokyoTyrantTable 
-   is considered an error and an TokyoTyrantException will be thrown.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       A string key or an array of key-value pairs
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value in case a string key is used
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    This method is not supported on table databases. Calling this method through TokyoTyrantTable 
-    is considered an error and an TokyoTyrantException will be thrown.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::putNr</methodname></member>
-    <member><methodname>TokyoTyrant::putKeep</methodname></member>
-    <member><methodname>TokyoTyrant::putCat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/putshl.xml b/reference/tokyo_tyrant/tokyotyranttable/putshl.xml
deleted file mode 100644
index 166f2482c0..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/putshl.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.putshl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::putShl</refname>
-  <refpurpose>Concatenates to a record</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>TokyoTyrantTable::putShl</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is not supported on table databases. Calling this method through TokyoTyrantTable 
-   is considered an error and an TokyoTyrantException will be thrown.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       A string key
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value to concatenate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the record
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method is not supported on table databases.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>TokyoTyrant::put</methodname></member>
-    <member><methodname>TokyoTyrant::putKeep</methodname></member>
-    <member><methodname>TokyoTyrant::putCat</methodname></member>
-    <member><methodname>TokyoTyrantTable::put</methodname></member>
-    <member><methodname>TokyoTyrantTable::putKeep</methodname></member>
-    <member><methodname>TokyoTyrantTable::putCat</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/tokyotyranttable/setindex.xml b/reference/tokyo_tyrant/tokyotyranttable/setindex.xml
deleted file mode 100644
index 69b233dcfd..0000000000
--- a/reference/tokyo_tyrant/tokyotyranttable/setindex.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="tokyotyranttable.setindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TokyoTyrantTable::setIndex</refname>
-  <refpurpose>Sets index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>TokyoTyrantTable::setIndex</methodname>
-   <methodparam><type>string</type><parameter>column</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets an index on a specified column. The index type is one of the <constant>TokyoTyrant::RDBIT_*</constant> constants.
-   Passing <constant>TokyoTyrant::RDBIT_VOID</constant> removes the index.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>column</parameter></term>
-     <listitem>
-      <para>
-       The name of the column
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The index type
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the current object and throws TokyoTyrantException on failure.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tokyo_tyrant/versions.xml b/reference/tokyo_tyrant/versions.xml
deleted file mode 100644
index a0df1b535c..0000000000
--- a/reference/tokyo_tyrant/versions.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<!--
-Example entries:
- <function name='classname::methodname' from='PECL extname &gt;= 1.1'/>
- <function name='functionname' from='PHP &gt;= 5.3.0'/>
- <function name='functionname' from='PHP 5'/>
--->
-<versions>
-  <!-- Methods -->
-
- <function name='tokyotyrant' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::__construct' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::connect' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::connecturi' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::vanish' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::stat' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::fwmkeys' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::size' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::num' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::sync' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::ext' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::copy' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::restore' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::setmaster' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::put' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::putkeep' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::putcat' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::putnr' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::putshl' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::get' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::out' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::add' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrant::tune' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
-
- <function name='tokyotyranttable' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::put' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::putkeep' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::putcat' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::putnr' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::putshl' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::get' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::out' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::add' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::setindex' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::getquery' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::genuid' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::__construct' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::connect' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::connecturi' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::vanish' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::stat' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::fwmkeys' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::size' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::num' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::sync' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::ext' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::copy' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::restore' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyranttable::setmaster' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
-
- <function name='tokyotyrantquery' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::__construct' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::addcond' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::setlimit' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::setorder' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::search' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::out' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::key' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::next' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::rewind' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::current' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantquery::valid' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
-
- <function name='tokyotyrantexception' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::__clone' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::__construct' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::getmessage' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::getcode' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::getfile' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::getline' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::gettrace' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::gettraceasstring' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
- <function name='tokyotyrantexception::__tostring' from='PECL tokyo_tyrant &gt;= 0.1.0'/>
-
- <function name='tokyotyrantiterator' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
- <function name='tokyotyrantiterator::__construct' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
- <function name='tokyotyrantiterator::next' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
- <function name='tokyotyrantiterator::valid' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
- <function name='tokyotyrantiterator::rewind' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
- <function name='tokyotyrantiterator::key' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
- <function name='tokyotyrantiterator::current' from='PECL tokyo_tyrant &gt;= 0.2.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/trader/book.xml b/reference/trader/book.xml
index d3dd4c95bb..c4e96d51f1 100644
--- a/reference/trader/book.xml
+++ b/reference/trader/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.trader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Technical Analysis for Traders</title>
  <titleabbrev>Trader</titleabbrev>
 
diff --git a/reference/trader/functions/trader-errno.xml b/reference/trader/functions/trader-errno.xml
index 9eb380cc3a..e1cfc4da3c 100644
--- a/reference/trader/functions/trader-errno.xml
+++ b/reference/trader/functions/trader-errno.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <refentry xml:id="function.trader-errno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>trader_errno</refname>
@@ -17,14 +15,18 @@
    Get error code of the last operation. 
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>Returns the error code identified by one of the <link xmlns="http://docbook.org/ns/docbook" linkend="trader.constants">TRADER_ERR_*</link> constants.</para>
  </refsect1>
 
-
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/trader/functions/trader-get-compat.xml b/reference/trader/functions/trader-get-compat.xml
index 1240dc7c39..05512ee73a 100644
--- a/reference/trader/functions/trader-get-compat.xml
+++ b/reference/trader/functions/trader-get-compat.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
 <refentry xml:id="function.trader-get-compat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>trader_get_compat</refname>
@@ -17,15 +15,19 @@
    Get compatibility mode which affects the way calculations are done by all the extension functions.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>Returns the compatibility mode id which can be identified by <link xmlns="http://docbook.org/ns/docbook" linkend="trader.constants">TRADER_COMPATIBILITY_*</link> series of constants.
   </para>
  </refsect1>
 
-
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ui/book.xml b/reference/ui/book.xml
index 30cb421490..224a80a7f9 100644
--- a/reference/ui/book.xml
+++ b/reference/ui/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.ui" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>UI</title>
  <titleabbrev>UI</titleabbrev>
 
diff --git a/reference/ui/functions/ui.draw.text.font.fontfamilies.xml b/reference/ui/functions/ui.draw.text.font.fontfamilies.xml
index a167424b23..db95341fc9 100644
--- a/reference/ui/functions/ui.draw.text.font.fontfamilies.xml
+++ b/reference/ui/functions/ui.draw.text.font.fontfamilies.xml
@@ -24,6 +24,13 @@
   &no.function.parameters;
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an &array; of valid font families for the current system.
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/uodbc/configure.xml b/reference/uodbc/configure.xml
index 4863da611a..0b684f3652 100644
--- a/reference/uodbc/configure.xml
+++ b/reference/uodbc/configure.xml
@@ -160,9 +160,8 @@
    </varlistentry>
   </variablelist>
  </para>
- &windows.builtin;
  <simpara>
-  As of PHP 7.0.0, however, Windows users must enable
+  Windows users must enable
   <filename>php_odbc.dll</filename> in order to use this extension.
  </simpara>
 </section>
diff --git a/reference/uodbc/ini.xml b/reference/uodbc/ini.xml
index 4d3fc38409..bc15fe4fc2 100644
--- a/reference/uodbc/ini.xml
+++ b/reference/uodbc/ini.xml
@@ -74,7 +74,7 @@
       <entry><link linkend="ini.uodbc.defaultcursortype">odbc.default_cursortype</link></entry>
       <entry>"3"</entry>
       <entry>PHP_INI_ALL</entry>
-      <entry>Available as of PHP 5.3.0</entry>
+      <entry></entry>
      </row>
     </tbody>
    </tgroup>
diff --git a/reference/uopz/book.xml b/reference/uopz/book.xml
index a276ff75cc..c69a2ce9d6 100644
--- a/reference/uopz/book.xml
+++ b/reference/uopz/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.uopz" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>User Operations for Zend</title>
  <titleabbrev>uopz</titleabbrev>
 
diff --git a/reference/uopz/functions/uopz-set-mock.xml b/reference/uopz/functions/uopz-set-mock.xml
index 51785beabc..f1880af321 100644
--- a/reference/uopz/functions/uopz-set-mock.xml
+++ b/reference/uopz/functions/uopz-set-mock.xml
@@ -51,6 +51,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -178,13 +185,13 @@ mockA
   </example>
  </refsect1>
 
- <refsect1 role="seealso"><!-- {{{ -->
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
    <member><function>uopz_get_mock</function></member>
    <member><function>uopz_unset_mock</function></member>
   </simplelist>
- </refsect1><!-- }}} -->
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/uopz/functions/uopz-unset-mock.xml b/reference/uopz/functions/uopz-unset-mock.xml
index 1a73810173..c5a0f739d4 100644
--- a/reference/uopz/functions/uopz-unset-mock.xml
+++ b/reference/uopz/functions/uopz-unset-mock.xml
@@ -32,13 +32,20 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="errors"><!-- {{{ -->
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
   &reftitle.errors;
   <para>
    A <classname>RuntimeException</classname> is thrown, if no mock was previously
    set for <parameter>class</parameter>.
   </para>
- </refsect1><!-- }}} -->
+ </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
@@ -74,13 +81,13 @@ A
   </example>
  </refsect1>
 
- <refsect1 role="seealso"><!-- {{{ -->
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
    <member><function>uopz_set_mock</function></member>
    <member><function>uopz_get_mock</function></member>
   </simplelist>
- </refsect1><!-- }}} -->
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/uopz/setup.xml b/reference/uopz/setup.xml
index befbbf4b6c..97b71631c6 100644
--- a/reference/uopz/setup.xml
+++ b/reference/uopz/setup.xml
@@ -7,7 +7,7 @@
  <section xml:id="uopz.requirements">
   &reftitle.required;
   <para>
-   uopz 2 requires PHP 5.4+. uopz 5.0 requires PHP 7. As of uopz 5.1, PHP 7.1+ is required.
+   As of uopz 5.0 PHP 7.0 is required. As of uopz 5.1, PHP 7.1+ is required.
   </para>
  </section>
 
diff --git a/reference/uopz/versions.xml b/reference/uopz/versions.xml
index cd7b13ccfe..d90bfeacd6 100644
--- a/reference/uopz/versions.xml
+++ b/reference/uopz/versions.xml
@@ -9,33 +9,33 @@
  <function name='uopz_overload' from='PECL uopz 1, PECL uopz 2' deprecated='PECL uopz 5'/>
  <function name='uopz_rename' from='PECL uopz 1, PECL uopz 2' deprecated='PECL uopz 5'/>
  <function name='uopz_delete' from='PECL uopz 1, PECL uopz 2' deprecated='PECL uopz 5'/>
- <function name='uopz_redefine' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_undefine' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6'/>
+ <function name='uopz_redefine' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_undefine' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
  <function name='uopz_function' from='PECL uopz 1, PECL uopz 2' deprecated='PECL uopz 5'/>
- <function name='uopz_implement' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_extend' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6'/>
+ <function name='uopz_implement' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6, PECL uopz 7 &lt; 7.1.0'/>
+ <function name='uopz_extend' from='PECL uopz 1, PECL uopz 2, PECL uopz 5, PECL uopz 6, PECL uopz 7 &lt; 7.1.0'/>
  <function name='uopz_compose' from='PECL uopz 1, PECL uopz 2'/>
  <function name='uopz_backup' from='PECL uopz 1 &gt;= 1.0.3, PECL uopz 2' deprecated='PECL uopz 5'/>
  <function name='uopz_restore' from='PECL uopz 1 &gt;= 1.0.3, PECL uopz 2' deprecated='PECL uopz 5'/>
  <function name='uopz_copy' from='PECL uopz 1 &gt;= 1.0.4, PECL uopz 2' deprecated='PECL uopz 5'/>
- <function name='uopz_flags' from='PECL uopz 2 &gt;= 2.0.2, PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_allow_exit' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_get_exit_status' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_get_return' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_set_return' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_unset_return' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_set_mock' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_get_mock' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_unset_mock' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_get_static' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_set_static' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_set_hook' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_get_hook' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_unset_hook' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_add_function' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_del_function' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_set_property' from='PECL uopz 5, PECL uopz 6'/>
- <function name='uopz_get_property' from='PECL uopz 5, PECL uopz 6'/>
+ <function name='uopz_flags' from='PECL uopz 2 &gt;= 2.0.2, PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_allow_exit' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_get_exit_status' from='PECL uopz 5, PECL uopz , PECL uopz 7'/>
+ <function name='uopz_get_return' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_set_return' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_unset_return' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_set_mock' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_get_mock' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_unset_mock' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_get_static' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_set_static' from='PECL uopz 5, PECL uopz , PECL uopz 7'/>
+ <function name='uopz_set_hook' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_get_hook' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_unset_hook' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_add_function' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_del_function' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_set_property' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
+ <function name='uopz_get_property' from='PECL uopz 5, PECL uopz 6, PECL uopz 7'/>
 </versions>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/url/constants.xml b/reference/url/constants.xml
index 4ef80e0e0c..e329954204 100644
--- a/reference/url/constants.xml
+++ b/reference/url/constants.xml
@@ -5,7 +5,7 @@
  &extension.constants;
  <para>
   The following constants are meant to be used with
-  <function>parse_url</function> and are available since PHP 5.1.2.
+  <function>parse_url</function>.
  </para>
  <variablelist>
   <varlistentry xml:id="constant.php-url-scheme">
diff --git a/reference/url/functions/get-headers.xml b/reference/url/functions/get-headers.xml
index fbbf223af7..1b0ee8c163 100644
--- a/reference/url/functions/get-headers.xml
+++ b/reference/url/functions/get-headers.xml
@@ -9,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>get_headers</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>get_headers</methodname>
    <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>format</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>associative</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>get_headers</function> returns an array with the headers sent
@@ -33,10 +33,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>format</parameter></term>
+     <term><parameter>associative</parameter></term>
      <listitem>
       <para>
-       If the optional <parameter>format</parameter> parameter is set to non-zero,
+       If the optional <parameter>associative</parameter> parameter is set to true,
        <function>get_headers</function> parses the response and sets the 
        array's keys.
       </para>
@@ -75,6 +75,12 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>8.0.0</entry>
+       <entry>
+        The <parameter>associative</parameter> has been changed from <type>int</type> to <type>bool</type>.
+       </entry>
+      </row>
       <row>
        <entry>7.1.0</entry>
        <entry>
diff --git a/reference/url/functions/parse-url.xml b/reference/url/functions/parse-url.xml
index 26d58904b5..e7766550c9 100644
--- a/reference/url/functions/parse-url.xml
+++ b/reference/url/functions/parse-url.xml
@@ -20,7 +20,7 @@
   </para>
   <para>
    This function is <emphasis role="strong">not</emphasis> meant to validate
-   the given URL, it only breaks it up into the above listed parts. Partial
+   the given URL, it only breaks it up into the above listed parts. Partial and invalid
    URLs are also accepted, <function>parse_url</function> tries its best to
    parse them correctly.
   </para>
diff --git a/reference/url/functions/rawurlencode.xml b/reference/url/functions/rawurlencode.xml
index b971559147..1286d81ca7 100644
--- a/reference/url/functions/rawurlencode.xml
+++ b/reference/url/functions/rawurlencode.xml
@@ -44,12 +44,6 @@
    protecting literal characters from being interpreted as special URL
    delimiters, and for protecting URLs from being mangled by transmission
    media with character conversions (like some email systems).
-   <note>
-    <para>
-     Prior to PHP 5.3.0, rawurlencode encoded tildes (<literal>~</literal>) as per
-     <link xlink:href="&url.rfc;1738">RFC 1738</link>.
-    </para>
-   </note>
   </para>
  </refsect1>
 
diff --git a/reference/v8js/book.xml b/reference/v8js/book.xml
index 93cb624953..7bc3c086f5 100644
--- a/reference/v8js/book.xml
+++ b/reference/v8js/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.v8js" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>V8 Javascript Engine Integration</title>
  <titleabbrev>V8js</titleabbrev>
 
diff --git a/reference/v8js/setup.xml b/reference/v8js/setup.xml
index 262c0be7f6..3e184b2396 100644
--- a/reference/v8js/setup.xml
+++ b/reference/v8js/setup.xml
@@ -7,7 +7,7 @@
  <section xml:id="v8js.requirements">
   &reftitle.required;
   <para>
-   PHP 5.3.3+ and V8 library and headers installed in proper paths.
+   PHP and V8 library and headers installed in proper paths.
   </para>
  </section>
 
diff --git a/reference/var/functions/empty.xml b/reference/var/functions/empty.xml
index abaaab4ed9..7f8317c188 100644
--- a/reference/var/functions/empty.xml
+++ b/reference/var/functions/empty.xml
@@ -25,14 +25,6 @@
       <para>
        Variable to be checked
       </para>
-      <note>
-       <para>
-        Prior to PHP 5.5, <function>empty</function> only supports variables;
-        anything else will result in a parse error. In other words, the
-        following will not work: <command>empty(trim($name))</command>.
-        Instead, use <command>trim($name) == false</command>.
-       </para>
-      </note>
       <para>
        No warning is generated if the variable does not exist.
        That means <function>empty</function> is essentially the
@@ -80,10 +72,6 @@ if (isset($var)) {
   </para>
   <example>
    <title><function>empty</function> on String Offsets</title>
-   <para>
-    PHP 5.4 changes how <function>empty</function> behaves
-    when passed string offsets.
-   </para>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -97,18 +85,7 @@ var_dump(empty($expected_array_got_string['0 Mostel']));
 ?>
 ]]>
    </programlisting>
-   &example.outputs.53;
-   <screen>
-<![CDATA[
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-]]>
-   </screen>
-   &example.outputs.54;
+   &example.outputs;
    <screen>
 <![CDATA[
 bool(true)
diff --git a/reference/var/functions/get-debug-type.xml b/reference/var/functions/get-debug-type.xml
new file mode 100644
index 0000000000..1e004f5615
--- /dev/null
+++ b/reference/var/functions/get-debug-type.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+<refentry xml:id="function.get-debug-type" xmlns="http://docbook.org/ns/docbook">
+ <refnamediv>
+  <refname>get_debug_type</refname>
+  <refpurpose>Gets the type name of a variable in a way that is suitable for debugging</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>get_debug_type</methodname>
+   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  <para>
+   Returns the resolved name of the PHP variable <parameter>value</parameter>.
+   This function will resolve objects to their class name, resources to their
+   resource type name, and scalar values to their common name as would be used in type
+   declarations.
+  </para>
+  <para>
+   This function differs from <function>gettype</function> in that it returns type names
+   that are more consistent with actual usage, rather than those present for historical reasons.
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>value</parameter></term>
+     <listitem>
+      <para>
+       The variable being type checked.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+     Possible values for the returned string are:
+
+     <informaltable>
+      <tgroup cols="2">
+       <thead>
+        <row>
+         <entry>Type + State</entry>
+         <entry>Return Value</entry>
+         <entry>Notes</entry>
+        </row>
+       </thead>
+       <tbody>
+        <row>
+         <entry>null</entry>
+         <entry>
+          <literal>"null"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Booleans (true or false)</entry>
+         <entry>
+          <literal>"bool"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Integers</entry>
+         <entry>
+          <literal>"int"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Floats</entry>
+         <entry>
+          <literal>"float"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Strings</entry>
+         <entry>
+          <literal>"string"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Arrays</entry>
+         <entry>
+          <literal>"array"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Resources</entry>
+         <entry>
+          <literal>"resource (resourcename)"</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Resources (Closed)</entry>
+         <entry>
+          <literal>"resource (closed)"</literal>
+         </entry>
+         <entry>Example: A file stream after being closed with fclose.</entry>
+        </row>
+        <row>
+         <entry>Objects from Named Classes</entry>
+         <entry>
+          The full name of the class including its namespace e.g. <literal>Foo\Bar</literal>
+         </entry>
+         <entry>-</entry>
+        </row>
+        <row>
+         <entry>Objects from Anonymous Classes</entry>
+         <entry>
+          <literal>"class@anonymous"</literal>
+         </entry>
+         <entry>
+          Anonymous classes are those created through the $x = new class { ... } syntax
+         </entry>
+        </row>
+       </tbody>
+      </tgroup>
+     </informaltable>
+  </para>
+ </refsect1>
+
+
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>get_debug_type</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+echo get_debug_type(null) . PHP_EOL;
+echo get_debug_type(true) . PHP_EOL;
+echo get_debug_type(1) . PHP_EOL;
+echo get_debug_type(0.1) . PHP_EOL;
+echo get_debug_type("foo") . PHP_EOL;
+echo get_debug_type([]) . PHP_EOL;
+
+$fp = fopen(__FILE__, 'rb');
+echo get_debug_type($fp) . PHP_EOL;
+
+fclose($fp);
+echo get_debug_type($fp) . PHP_EOL;
+
+echo get_debug_type(new stdClass) . PHP_EOL;
+echo get_debug_type(new class {}) . PHP_EOL;
+?>
+]]>
+    </programlisting>
+    &example.outputs.similar;
+    <screen>
+<![CDATA[
+null
+bool
+int
+float
+string
+array
+resource (stream)
+resource (closed)
+stdClass
+class@anonymous
+]]>
+    </screen>
+   </example>
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>gettype</function></member>
+    <member><function>get_class</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+</refentry>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/var/functions/get-defined-vars.xml b/reference/var/functions/get-defined-vars.xml
index bc309dd73e..f181170973 100644
--- a/reference/var/functions/get-defined-vars.xml
+++ b/reference/var/functions/get-defined-vars.xml
@@ -20,6 +20,10 @@
    called. 
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/var/functions/get-resource-id.xml b/reference/var/functions/get-resource-id.xml
index 10bd990b23..408c8ed76c 100644
--- a/reference/var/functions/get-resource-id.xml
+++ b/reference/var/functions/get-resource-id.xml
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>get_resource_id</methodname>
-   <methodparam><type>resource</type><parameter>res</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>resource</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function provides a type-safe way for generating the integer identifier
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>res</parameter></term>
+     <term><parameter>resource</parameter></term>
      <listitem>
       <para>
        The evaluated resource handle.
@@ -39,11 +39,11 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The <type>int</type> identifier for the given <parameter>res</parameter>.
+   The <type>int</type> identifier for the given <parameter>resource</parameter>.
   </para>
   <para>
    This function is essentially an <type>int</type> cast of
-   <parameter>res</parameter> to make it easier to retrieve the resource ID.
+   <parameter>resource</parameter> to make it easier to retrieve the resource ID.
   </para>
  </refsect1>
 
@@ -85,7 +85,6 @@ echo get_resource_id($handle);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/var/functions/get-resource-type.xml b/reference/var/functions/get-resource-type.xml
index e68509599a..d8f6f1573e 100644
--- a/reference/var/functions/get-resource-type.xml
+++ b/reference/var/functions/get-resource-type.xml
@@ -13,7 +13,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>get_resource_type</methodname>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>resource</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function gets the type of the given resource.
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>resource</parameter></term>
      <listitem>
       <para>
        The evaluated resource handle.
@@ -39,14 +39,14 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   If the given <parameter>handle</parameter> is a resource, this function
+   If the given <parameter>resource</parameter> is a resource, this function
    will return a string representing its type. If the type is not identified
    by this function, the return value will be the string 
    <literal>Unknown</literal>.
   </para>
   <para>
    This function will return &null; and generate an error if 
-   <parameter>handle</parameter> is not a <type>resource</type>.
+   <parameter>resource</parameter> is not a <type>resource</type>.
   </para>
  </refsect1>
 
@@ -81,7 +81,6 @@ echo get_resource_type($c) . "\n"; // works prior to PHP 8.0.0 as since 8.0 curl
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/var/functions/gettype.xml b/reference/var/functions/gettype.xml
index 6e7813437b..c245732c16 100644
--- a/reference/var/functions/gettype.xml
+++ b/reference/var/functions/gettype.xml
@@ -75,6 +75,31 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>7.2.0</entry>
+       <entry>
+        Closed resources are now reported as <literal>'resource (closed)'</literal>.
+        Previously the returned value for closed resources were <literal>'unknown type'</literal>.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -107,35 +132,11 @@ string
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.2.0</entry>
-       <entry>
-        Closed resources are now reported as <literal>'resource (closed)'</literal>. 
-        Previously the returned value for closed resources were <literal>'unknown type'</literal>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>get_debug_type</function></member>
     <member><function>settype</function></member>
     <member><function>get_class</function></member>
     <member><function>is_array</function></member>
diff --git a/reference/var/functions/is-callable.xml b/reference/var/functions/is-callable.xml
index 176e84c3ed..b3291b67e4 100644
--- a/reference/var/functions/is-callable.xml
+++ b/reference/var/functions/is-callable.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>is_callable</refname>
   <refpurpose>
-   Verify that the contents of a variable can be called as a function
+   Verify that a value can be called as a function from the current scope.
   </refpurpose>
  </refnamediv>
 
@@ -121,11 +121,8 @@ echo $callable_name, "\n";  //  someClass::someMethod
    <example>
     <title><function>is_callable</function> and constructors</title>
     <simpara>
-     As of PHP 5.3.0 <function>is_callable</function> reports constructors as
-     not being callable. This affects PHP 5 style constructors
-     (<literal>__construct</literal>) as well as PHP 4 style constructors (i.e.
-     methods with the same name as the class). Formerly, both cases have been
-     considered callable.
+     <function>is_callable</function> reports constructors as
+     not being callable.
     </simpara>
     <programlisting role="php">
 <![CDATA[
@@ -154,6 +151,26 @@ bool(false)
   </para>   
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <simplelist>
+   <member>
+    An object is always callable if it implements <link linkend="object.invoke">__invoke()</link>,
+    and that method is visible in the current scope.
+   </member>
+   <member>
+    A class name is callable if it implements <link linkend="object.callstatic">__callStatic()</link>.
+   </member>
+   <member>
+    If an object implements <link linkend="object.call">__call()</link>, then this function will
+    return &true; for any method on that object, even if the method is not defined.
+   </member>
+   <member>
+    This function may trigger autoloading if called with the name of a class.
+   </member>
+  </simplelist>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/var/functions/is-numeric.xml b/reference/var/functions/is-numeric.xml
index f9d8235bd7..9ec8eb36d3 100644
--- a/reference/var/functions/is-numeric.xml
+++ b/reference/var/functions/is-numeric.xml
@@ -67,7 +67,8 @@ $tests = array(
     "not numeric",
     array(),
     9.1,
-    null
+    null,
+    '',
 );
 
 foreach ($tests as $element) {
@@ -98,6 +99,7 @@ array (
 ) is NOT numeric
 9.1 is numeric
 NULL is NOT numeric
+'' is NOT numeric
 ]]>
     </screen>
    </example>
diff --git a/reference/var/functions/is-object.xml b/reference/var/functions/is-object.xml
index c2abb35610..55b23525cf 100644
--- a/reference/var/functions/is-object.xml
+++ b/reference/var/functions/is-object.xml
@@ -41,6 +41,32 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>7.2.0</entry>
+       <entry>
+        <function>is_object</function> now returns &true; for unserialized objects without 
+        a class definition (class of <classname>__PHP_Incomplete_Class</classname>). Previously 
+        &false; was returned.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -74,32 +100,6 @@ var_dump(get_students($obj));
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.2.0</entry>
-       <entry>
-        <function>is_object</function> now returns &true; for unserialized objects without 
-        a class definition (class of <classname>__PHP_Incomplete_Class</classname>). Previously 
-        &false; was returned.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/var/functions/isset.xml b/reference/var/functions/isset.xml
index 716d4916e4..290890212d 100644
--- a/reference/var/functions/isset.xml
+++ b/reference/var/functions/isset.xml
@@ -134,10 +134,6 @@ var_dump(isset($a['cake']['a']['b']));  // FALSE
   </para>
   <example>
    <title><function>isset</function> on String Offsets</title>
-   <para>
-    PHP 5.4 changes how <function>isset</function> behaves
-    when passed string offsets.
-   </para>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -151,18 +147,7 @@ var_dump(isset($expected_array_got_string['0 Mostel']));
 ?>
 ]]>
    </programlisting>
-   &example.outputs.53;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-]]>
-   </screen>
-   &example.outputs.54;
+   &example.outputs;
    <screen>
 <![CDATA[
 bool(false)
diff --git a/reference/var/functions/print-r.xml b/reference/var/functions/print-r.xml
index cbb3bbdfde..3b8b1a54e4 100644
--- a/reference/var/functions/print-r.xml
+++ b/reference/var/functions/print-r.xml
@@ -67,11 +67,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.uses-ob-php70;
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -122,6 +117,11 @@ $results = print_r($b, true); // $results now contains output from print_r
   </para>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  &note.uses-ob-php70;
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/var/functions/serialize.xml b/reference/var/functions/serialize.xml
index 65bff31eb1..d1ac09621f 100644
--- a/reference/var/functions/serialize.xml
+++ b/reference/var/functions/serialize.xml
@@ -119,8 +119,7 @@ if (!odbc_execute($stmt, $sqldata)) {
    </para>
    <para>
     There are some historical exceptions to the above rule, where some internal objects 
-    could be serialized without implementing the interface or exposing the methods. Notably, 
-    the <classname>ArrayObject</classname> prior to PHP 5.2.0.
+    could be serialized without implementing the interface or exposing the methods.
    </para>
   </note>
   <warning>
diff --git a/reference/var/functions/strval.xml b/reference/var/functions/strval.xml
index 934ace2d42..5207e2b01e 100644
--- a/reference/var/functions/strval.xml
+++ b/reference/var/functions/strval.xml
@@ -59,7 +59,7 @@
   <para>
    <example>
     <title>
-     <function>strval</function> example using PHP 5's magic
+     <function>strval</function> example using PHP magic
      <link linkend="object.tostring">__toString()</link> method.
     </title>
     <programlisting role="php">
diff --git a/reference/var/functions/unserialize.xml b/reference/var/functions/unserialize.xml
index 5576b300bb..a447486502 100644
--- a/reference/var/functions/unserialize.xml
+++ b/reference/var/functions/unserialize.xml
@@ -155,20 +155,6 @@
         <constant>E_WARNING</constant>.
        </entry>
       </row>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        The <parameter>options</parameter> parameter has been added.
-       </entry>
-      </row>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        Manipulating the serialised data by replacing <literal>C:</literal>
-        with <literal>O:</literal> to force object instantiation without
-        calling the constructor will now fail.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/var/functions/var-dump.xml b/reference/var/functions/var-dump.xml
index 31065afbb0..894add5b13 100644
--- a/reference/var/functions/var-dump.xml
+++ b/reference/var/functions/var-dump.xml
@@ -22,8 +22,7 @@
   <simpara>
    All public, private and protected properties of objects will be returned in
    the output unless the object implements a
-   <link linkend="language.oop5.magic.debuginfo">__debugInfo()</link> method
-   (implemented in PHP 5.6.0).
+   <link linkend="language.oop5.magic.debuginfo">__debugInfo()</link> method.
   </simpara>
   &tip.ob-capture;
  </refsect1>
diff --git a/reference/var/functions/var-export.xml b/reference/var/functions/var-export.xml
index 0863bbb130..c5880c116d 100644
--- a/reference/var/functions/var-export.xml
+++ b/reference/var/functions/var-export.xml
@@ -157,7 +157,7 @@ var_export($person);
   </para>
   <para>
    <example>
-    <title>Exporting classes (since PHP 5.1.0)</title>
+    <title>Exporting classes</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -180,7 +180,7 @@ A::__set_state(array(
   </para>
   <para>
    <example>
-    <title>Using <link linkend="object.set-state">__set_state()</link> (since PHP 5.1.0)</title>
+    <title>Using <link linkend="object.set-state">__set_state()</link></title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/var/versions.xml b/reference/var/versions.xml
index 0144700269..d61e3f393e 100644
--- a/reference/var/versions.xml
+++ b/reference/var/versions.xml
@@ -13,6 +13,7 @@
  <function name='get_defined_vars' from='PHP 4 &gt;= 4.0.4, PHP 5, PHP 7, PHP 8'/>
  <function name='get_resource_id' from='PHP 8'/>
  <function name='get_resource_type' from='PHP 4 &gt;= 4.0.2, PHP 5, PHP 7, PHP 8'/>
+ <function name='get_debug_type' from='PHP 8'/>
  <function name='gettype' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
  <function name='intval' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
  <function name='is_array' from='PHP 4, PHP 5, PHP 7, PHP 8'/>
diff --git a/reference/varnish/book.xml b/reference/varnish/book.xml
index 42dade48e6..a564451431 100644
--- a/reference/varnish/book.xml
+++ b/reference/varnish/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.varnish" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Varnish</title>
  <titleabbrev>Varnish</titleabbrev>
 
diff --git a/reference/wddx/book.xml b/reference/wddx/book.xml
index 06b2c0bbfd..31e56c32d6 100644
--- a/reference/wddx/book.xml
+++ b/reference/wddx/book.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
- 
+<!-- State: deprecated -->
 <book xml:id="book.wddx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
  <title>WDDX</title>
@@ -36,7 +35,6 @@
  &reference.wddx.reference;
 
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/weakref/book.xml b/reference/weakref/book.xml
deleted file mode 100644
index 1f297d33d8..0000000000
--- a/reference/weakref/book.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.weakref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Weak References</title>
- <titleabbrev>Weakref</titleabbrev>
- 
- <preface xml:id="intro.weakref">
-  &reftitle.intro;
-  <para>
-   Weak references provide a non-intrusive gateway to ephemeral objects. Unlike
-   normal (strong) references, weak references do not prevent the garbage
-   collector from freeing that object. For this reason, an object may be
-   destroyed even though a weak reference to that object still exists. In such
-   conditions, the weak reference seamlessly becomes invalid.
-  </para>
-
-  <para>
-   <example>
-    <title><classname>Weakref</classname> usage example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class MyClass {
-    public function __destruct() {
-        echo "Destroying object!\n";
-    }
-}
-
-$o1 = new MyClass;
-
-$r1 = new Weakref($o1);
-
-if ($r1->valid()) {
-    echo "Object still exists!\n";
-    var_dump($r1->get());
-} else {
-    echo "Object is dead!\n";
-}
-
-unset($o1);
-
-if ($r1->valid()) {
-    echo "Object still exists!\n";
-    var_dump($r1->get());
-} else {
-    echo "Object is dead!\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Object still exists!
-object(MyClass)#1 (0) {
-}
-Destroying object!
-Object is dead!
-]]>
-     </screen>
-    </example>
-   </para>
- </preface>
-
- &reference.weakref.setup;
- &reference.weakref.weakref;
- &reference.weakref.weakmap;
-
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/weakref/setup.xml b/reference/weakref/setup.xml
deleted file mode 100644
index acd55dcd16..0000000000
--- a/reference/weakref/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="weakref.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="weakref.requirements">
-  &reftitle.required;
-  &no.requirement;
- </section>
-
- <section xml:id="weakref.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;weakref">&url.pecl.package;weakref</link>.
-  </para>
-  <para>
-   &pecl.windows.download;
-  </para>
- </section>
-
- <section xml:id="weakref.resources">
-  &reftitle.resources;
-  &no.resource;
- </section>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/weakref/versions.xml b/reference/weakref/versions.xml
deleted file mode 100644
index 2fee18ecf7..0000000000
--- a/reference/weakref/versions.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!--
-  Do NOT translate this file
--->
-<versions> 
- <function name='weakref' from='PECL weakref &gt;= 0.1.0'/>
- <function name='weakref::__construct' from='PECL weakref &gt;= 0.1.0'/>
- <function name='weakref::acquire' from='PECL weakref &gt;= 0.1.0'/>
- <function name='weakref::get' from='PECL weakref &gt;= 0.1.0'/>
- <function name='weakref::release' from='PECL weakref &gt;= 0.1.0'/>
- <function name='weakref::valid' from='PECL weakref &gt;= 0.1.0'/>
-
- <function name='weakmap' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::__construct' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::count' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::offsetExists' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::offsetGet' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::offsetSet' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::offsetUnset' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::rewind' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::valid' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::key' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::current' from='PECL weakref &gt;= 0.2.0'/>
- <function name='weakmap::next' from='PECL weakref &gt;= 0.2.0'/>
-</versions>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakmap.xml b/reference/weakref/weakmap.xml
deleted file mode 100644
index c0728a80a9..0000000000
--- a/reference/weakref/weakmap.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<phpdoc:classref xml:id="class.weakmap" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The WeakMap class</title>
- <titleabbrev>WeakMap</titleabbrev>
-
- <partintro>
-
-<!-- {{{ WeakMap intro -->
-  <section xml:id="weakmap.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="weakmap.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>WeakMap</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>WeakMap</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.weakmap')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-<!-- {{{ weakmap examples -->
-  <section xml:id="weakmap.examples">
-   &reftitle.examples;
-   <para>
-    <example>
-     <title><classname>Weakmap</classname> usage example</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$wm = new WeakMap();
-
-$o = new StdClass;
-
-class A {
-    public function __destruct() {
-        echo "Dead!\n";
-    }
-}
-
-$wm[$o] = new A;
-
-var_dump(count($wm));
-echo "Unsetting...\n";
-unset($o);
-echo "Done\n";
-var_dump(count($wm));
-]]>
-     </programlisting>
-     &example.outputs;
-     <screen>
-<![CDATA[
-int(1)
-Unsetting...
-Dead!
-Done
-int(0)
-]]>
-     </screen>
-    </example>
-   </para>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.weakref.entities.weakmap;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakmap/current.xml b/reference/weakref/weakmap/current.xml
deleted file mode 100644
index f9e3e6ba44..0000000000
--- a/reference/weakref/weakmap/current.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="weakmap.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>WeakMap::current</refname>
-  <refpurpose>Returns the current value under iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>WeakMap::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current value being iterated on in the map.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The value currently being iterated on.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakmap/key.xml b/reference/weakref/weakmap/key.xml
deleted file mode 100644
index 2c9649dbe6..0000000000
--- a/reference/weakref/weakmap/key.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="weakmap.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>WeakMap::key</refname>
-  <refpurpose>Returns the current key under iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>object</type><methodname>WeakMap::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the object serving as key in the map, at the current iterating
-   position.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The object key currently being iterated.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakmap/next.xml b/reference/weakref/weakmap/next.xml
deleted file mode 100644
index df2baeb5d5..0000000000
--- a/reference/weakref/weakmap/next.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="weakmap.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>WeakMap::next</refname>
-  <refpurpose>Advances to the next map element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>WeakMap::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Advances to the next map element.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakmap/rewind.xml b/reference/weakref/weakmap/rewind.xml
deleted file mode 100644
index d4b3d214dd..0000000000
--- a/reference/weakref/weakmap/rewind.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="weakmap.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>WeakMap::rewind</refname>
-  <refpurpose>Rewinds the iterator to the beginning of the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>WeakMap::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Rewinds the iterator to the beginning of the map.  
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakmap/valid.xml b/reference/weakref/weakmap/valid.xml
deleted file mode 100644
index f923d57ef2..0000000000
--- a/reference/weakref/weakmap/valid.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="weakmap.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>WeakMap::valid</refname>
-  <refpurpose>Returns whether the iterator is still on a valid map element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>WeakMap::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether the iterator is still on a valid map element.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the iterator is on a valid element that can be
-    accessed, &false; otherwise.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakref.xml b/reference/weakref/weakref.xml
deleted file mode 100644
index 6f8c2b6de8..0000000000
--- a/reference/weakref/weakref.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.weakref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The WeakRef class</title>
- <titleabbrev>WeakRef</titleabbrev>
-
- <partintro>
-
-<!-- {{{ weakref intro -->
-  <section xml:id="weakref.intro">
-   &reftitle.intro;
-   <para>
-    The WeakRef class provides a gateway to objects without preventing the garbage collector from freeing those objects.
-    It also provides a way to turn a weak reference into a strong one.
-   </para>
-   <note>
-    <para>
-     The class <classname>WeakRef</classname> is not to be confused with the class
-     <classname>WeakReference</classname>.
-    </para>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="weakref.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>WeakRef</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>WeakRef</classname>
-     </ooclass>
-
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.weakref')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.weakref')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-  </section>
-<!-- {{{ weakref examples -->
-  <section xml:id="weakref.examples">
-   &reftitle.examples;
-   <para>
-    <example>
-     <title><classname>WeakRef</classname> usage example</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-class MyClass {
-    public function __destruct() {
-        echo "Destroying object!\n";
-    }
-}
-
-$o1 = new MyClass;
-
-$r1 = new WeakRef($o1);
-
-if ($r1->valid()) {
-    echo "Object still exists!\n";
-    var_dump($r1->get());
-} else {
-    echo "Object is dead!\n";
-}
-
-unset($o1);
-
-if ($r1->valid()) {
-    echo "Object still exists!\n";
-    var_dump($r1->get());
-} else {
-    echo "Object is dead!\n";
-}
-?>
-]]>
-     </programlisting>
-     &example.outputs;
-     <screen>
-<![CDATA[
-Object still exists!
-object(MyClass)#1 (0) {
-}
-Destroying object!
-Object is dead!
-]]>
-     </screen>
-    </example>
-   </para>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.weakref.entities.weakref;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/weakref/weakref/acquire.xml b/reference/weakref/weakref/acquire.xml
deleted file mode 100644
index 0224a6d700..0000000000
--- a/reference/weakref/weakref/acquire.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="weakref.acquire" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Weakref::acquire</refname>
-  <refpurpose>Acquires a strong reference on that object</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Weakref::acquire</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Acquires a strong reference on that object, virtually turning the weak
-   reference into a strong one.
-  </para>
-  <para>
-   The <classname>Weakref</classname> instance maintains an internal acquired
-   counter to track outstanding strong references. If the call to 
-   <methodname>Weakref::acquire</methodname> is successful, this counter 
-   will be incremented by one.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the reference was valid and could be turned into a strong
-   reference, &false; otherwise.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>Weakref::acquire</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class MyClass {
-    public function __destruct() {
-        echo "Destroying object!\n";
-    }
-}
-
-$o1 = new MyClass;
-
-$r1 = new Weakref($o1);
-
-$r1->acquire();
-
-echo "Unsetting o1...\n";
-unset($o1);
-
-$o2 = $r1->get();
-
-$r1->release();
-
-echo "Unsetting o2...\n";
-unset($o2);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Unsetting o1...
-Unsetting o2...
-Destroying object!
-]]>
-    </screen>
-   </example>
-  </para>
-  
-  <para>
-   <example>
-    <title>Nested acquire/release example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class MyClass {
-    public function __destruct() {
-        echo "Destroying object!\n";
-    }
-}
-
-$o1 = new MyClass;
-
-$r1 = new Weakref($o1);
-
-echo "Acquiring...\n";
-$r1->acquire();
-
-echo "  Unsetting...\n";
-unset($o1);
-
-echo "  Acquiring...\n";
-$r1->acquire();
-
-echo "    Acquiring...\n";
-$r1->acquire();
-
-echo "    Releasing...\n";
-$r1->release();
-
-echo "  Releasing...\n";
-$r1->release();
-
-echo "Releasing...\n";
-$r1->release();
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Acquiring...
-  Unsetting...
-  Acquiring...
-    Acquiring...
-    Releasing...
-  Releasing...
-Releasing...
-Destroying object!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Weakref::release</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakref/construct.xml b/reference/weakref/weakref/construct.xml
deleted file mode 100644
index 967de94054..0000000000
--- a/reference/weakref/weakref/construct.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="weakref.construct" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Weakref::__construct</refname>
-  <refpurpose>Constructs a new weak reference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Weakref::__construct</methodname>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructs a new weak reference.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>object</parameter></term>
-     <listitem>
-      <para>
-       The object to reference.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>Weakref::__construct</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class MyClass {
-    public function __destruct() {
-        echo "Destroying object!\n";
-    }
-}
-
-$o1 = new MyClass;
-
-$r1 = new Weakref($o1);
-
-if ($r1->valid()) {
-    echo "Object still exists!\n";
-    var_dump($r1->get());
-} else {
-    echo "Object is dead!\n";
-}
-
-unset($o1);
-
-if ($r1->valid()) {
-    echo "Object still exists!\n";
-    var_dump($r1->get());
-} else {
-    echo "Object is dead!\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Object still exists!
-object(MyClass)#1 (0) {
-}
-Destroying object!
-Object is dead!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakref/get.xml b/reference/weakref/weakref/get.xml
deleted file mode 100644
index 34c4e8834b..0000000000
--- a/reference/weakref/weakref/get.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="weakref.get" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Weakref::get</refname>
-  <refpurpose>Returns the object pointed to by the weak reference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>object</type><methodname>Weakref::get</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the object pointed to by the weak reference.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the object if the reference is still valid, &null; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Weakref::valid</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakref/release.xml b/reference/weakref/weakref/release.xml
deleted file mode 100644
index d22a47030e..0000000000
--- a/reference/weakref/weakref/release.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="weakref.release" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Weakref::release</refname>
-  <refpurpose>Releases a previously acquired reference</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Weakref::release</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Releases a previously acquired reference, potentially turning a strong
-   reference back into a weak reference.
-  </para>
-  <para>
-   The <classname>Weakref</classname> instance maintains an internal acquired
-   counter to track outstanding strong references. If the call to 
-   <methodname>Weakref::release</methodname> is successful, this counter 
-   will be decremented by one. Once this counter reaches zero, the strong
-   reference is turned back into a weak reference.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the reference was previously acquired and thus could be
-   released, &false; otherwise.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>Weakref::release</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class MyClass {
-    public function __destruct() {
-        echo "Destroying object!\n";
-    }
-}
-
-$o1 = new MyClass;
-
-$r1 = new Weakref($o1);
-
-$r1->acquire();
-
-echo "Unsetting o1...\n";
-unset($o1);
-
-$o2 = $r1->get();
-
-$r1->release();
-
-echo "Unsetting o2...\n";
-unset($o2);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Unsetting o1...
-Unsetting o2...
-Destroying object!
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Weakref::acquire</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/weakref/weakref/valid.xml b/reference/weakref/weakref/valid.xml
deleted file mode 100644
index 261eda270a..0000000000
--- a/reference/weakref/weakref/valid.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="weakref.valid" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Weakref::valid</refname>
-  <refpurpose>Checks whether the object referenced still exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Weakref::valid</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Checks whether the object referenced still exists.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the object still exists and is thus still accessible via
-   <methodname>Weakref::get</methodname>, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Weakref::get</methodname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/win32service/book.xml b/reference/win32service/book.xml
index d6a9cef710..824f939994 100644
--- a/reference/win32service/book.xml
+++ b/reference/win32service/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.win32service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>win32service</title>
  
  <!-- {{{ preface -->
diff --git a/reference/win32service/functions/win32-create-service.xml b/reference/win32service/functions/win32-create-service.xml
index bdf4cb3ca1..b88150086f 100644
--- a/reference/win32service/functions/win32-create-service.xml
+++ b/reference/win32service/functions/win32-create-service.xml
@@ -6,6 +6,7 @@
   <refname>win32_create_service</refname>
   <refpurpose>Creates a new service entry in the SCM database</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -18,6 +19,7 @@
    privileges are required for this to succeed.
   </para>
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -300,60 +302,108 @@
   </para>
  </refsect1>
 
- <refsect1 role="errors"><!-- {{{ -->
+ <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>path</parameter> parameter is missing or empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>svc_type</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>start_type</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>error_control</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>base_priority</parameter> parameter  is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>recovery_delay</parameter> parameter is not between 
    0 and PHP_INT_MAX.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>recovery_action_1</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>recovery_action_2</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>recovery_action_3</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the; 
+   A <classname>ValueError</classname> is thrown if the
    value of <parameter>recovery_reset_period</parameter> parameter is not 
    between 0 and PHP_INT_MAX.
   </para>
   <para>
    A <classname>Win32ServiceException</classname> is thrown on error.
   </para>
- </refsect1><!-- }}} -->
-
+ </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>PECL win32service 1.0.0</entry>
+       <entry>
+        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        previously &false; was returned.
+       </entry>
+      </row>
+      <row>
+       <entry>PECL win32service 1.0.0</entry>
+       <entry>
+        Throws a <classname>Win32ServiceException</classname> on error,
+        previously a 
+        <link xmlns="http://docbook.org/ns/docbook" linkend="win32service.constants.errors">Win32 Error Code</link>
+        was returned.
+       </entry>
+      </row>
+      <row>
+       <entry>PECL win32service 1.0.0</entry>
+       <entry>
+        The return type is now <type>void</type>, previously it was <type>mixed</type>.
+       </entry>
+      </row>
+      <row>
+       <entry>PECL win32service 0.4.0</entry>
+       <entry>
+        The <parameter>dependencies</parameter>, <parameter>recovery_delay</parameter>,
+        <parameter>recovery_action_1</parameter>, <parameter>recovery_action_2</parameter>,
+        <parameter>recovery_action_3</parameter>, <parameter>recovery_reset_period</parameter>,
+        <parameter>recovery_enabled</parameter>, <parameter>recovery_reboot_msg</parameter>
+        and <parameter>recovery_command</parameter> parameters have been added.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
@@ -431,57 +481,6 @@ debug_zval_dump($x);
   </para>
  </refsect1>
 
-
- <refsect1 role="changelog"><!-- {{{ -->
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL win32service 1.0.0</entry>
-       <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
-        previously &false; was returned.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL win32service 1.0.0</entry>
-       <entry>
-        Throws a <classname>Win32ServiceException</classname> on error,
-        previously a 
-        <link xmlns="http://docbook.org/ns/docbook" linkend="win32service.constants.errors">Win32 Error Code</link>
-        was returned.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL win32service 1.0.0</entry>
-       <entry>
-        The return type is now <type>void</type>, previously it was <type>mixed</type>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL win32service 0.4.0</entry>
-       <entry>
-        The <parameter>dependencies</parameter>, <parameter>recovery_delay</parameter>,
-        <parameter>recovery_action_1</parameter>, <parameter>recovery_action_2</parameter>,
-        <parameter>recovery_action_3</parameter>, <parameter>recovery_reset_period</parameter>,
-        <parameter>recovery_enabled</parameter>, <parameter>recovery_reboot_msg</parameter>
-        and <parameter>recovery_command</parameter> parameters have been added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/win32service/functions/win32-delete-service.xml b/reference/win32service/functions/win32-delete-service.xml
index 57151b82f5..e61db7d01f 100644
--- a/reference/win32service/functions/win32-delete-service.xml
+++ b/reference/win32service/functions/win32-delete-service.xml
@@ -27,6 +27,7 @@
   </para>
 
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -61,39 +62,19 @@
   </para>
  </refsect1>
 
-
- <refsect1 role="errors"><!-- {{{ -->
+ <refsect1 role="errors">
   &reftitle.errors;
   <para>
-    A <classname>ValueError</classname> is thrown if the; 
+    A <classname>ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
 
    <para>
     A <classname>Win32ServiceException</classname> is thrown on error.
    </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>win32_delete_service</function> example</title>
-    <para>
-     Deletes the dummyphp service.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-win32_delete_service('dummyphp');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
  </refsect1>
 
- <refsect1 role="changelog"><!-- {{{ -->
+ <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
    <informaltable>
@@ -131,7 +112,26 @@ win32_delete_service('dummyphp');
     </tgroup>
    </informaltable>
   </para>
- </refsect1><!-- }}} -->
+ </refsect1>
+
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>A <function>win32_delete_service</function> example</title>
+    <para>
+     Deletes the dummyphp service.
+    </para>
+    <programlisting role="php">
+<![CDATA[
+<?php
+win32_delete_service('dummyphp');
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/win32service/functions/win32-get-last-control-message.xml b/reference/win32service/functions/win32-get-last-control-message.xml
index 735f0f1404..473d8945e7 100644
--- a/reference/win32service/functions/win32-get-last-control-message.xml
+++ b/reference/win32service/functions/win32-get-last-control-message.xml
@@ -26,6 +26,12 @@
   </caution>
   
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -52,7 +58,7 @@
   </para>
  </refsect1>
 
- <refsect1 role="errors"><!-- {{{ -->
+ <refsect1 role="errors">
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
@@ -63,9 +69,9 @@
     <classname>Win32ServiceException</classname> if SAPI is not 
     <literal>"cli"</literal>
    </para>
- </refsect1><!-- }}} -->
+ </refsect1>
  
- <refsect1 role="changelog"><!-- {{{ -->
+ <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
    <informaltable>
@@ -103,7 +109,7 @@
     </tgroup>
    </informaltable>
   </para>
- </refsect1><!-- }}} -->
+ </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/win32service/functions/win32-pause-service.xml b/reference/win32service/functions/win32-pause-service.xml
index 962f0ac0ab..be00cdefd4 100644
--- a/reference/win32service/functions/win32-pause-service.xml
+++ b/reference/win32service/functions/win32-pause-service.xml
@@ -58,7 +58,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-    A <classname>ValueError</classname> is thrown if the; 
+    A <classname>ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
 
diff --git a/reference/win32service/functions/win32-query-service-status.xml b/reference/win32service/functions/win32-query-service-status.xml
index 0c12cd4661..8507757a96 100644
--- a/reference/win32service/functions/win32-query-service-status.xml
+++ b/reference/win32service/functions/win32-query-service-status.xml
@@ -133,7 +133,7 @@
      <term><parameter>ServiceFlags</parameter></term>
      <listitem>
       <para>
-       The dwServiceFlags. See <link linkend="win32service.constants.serviceflag">Win32Service Service Service Flag Constants</link>.
+       The dwServiceFlags. See <link linkend="win32service.constants.serviceflag">Win32Service Service Flag Constants</link>.
       </para>
      </listitem>
     </varlistentry>
@@ -146,7 +146,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-    A <classname>ValueError</classname> is thrown if the; 
+    A <classname>ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
  </refsect1><!-- }}} -->
diff --git a/reference/win32service/functions/win32-send-custom-control.xml b/reference/win32service/functions/win32-send-custom-control.xml
index 0cc0d2da67..6ce9a17aea 100644
--- a/reference/win32service/functions/win32-send-custom-control.xml
+++ b/reference/win32service/functions/win32-send-custom-control.xml
@@ -69,11 +69,11 @@
    <constant>E_ERROR</constant> level error.
   </para>
   <para>
-    A <classname>ValueError</classname> is thrown if the; 
+    A <classname>ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
   <para>
-    A <classname>ValueError</classname> is thrown if the; 
+    A <classname>ValueError</classname> is thrown if the
     value of <parameter>control</parameter> parameter is not between 128 and 255.
   </para>
    <para>
diff --git a/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml b/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
index 2d26a17bf9..8110a9ee10 100644
--- a/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
+++ b/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
@@ -41,6 +41,7 @@
    </para>
   </caution>
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -77,7 +78,7 @@
   </para>
  </refsect1>
 
- <refsect1 role="errors"><!-- {{{ -->
+ <refsect1 role="errors">
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
@@ -88,41 +89,9 @@
     <classname>Win32ServiceException</classname> if SAPI is not 
     <literal>"cli"</literal>
    </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>win32_start_service_ctrl_dispatcher</function> example</title>
-    <para>
-     Check if the service is runnig under the SCM.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if (!win32_start_service_ctrl_dispatcher('dummyphp')) {
-  die("I'm probably not running under the service control manager");
-}
-
-win32_set_service_status(WIN32_SERVICE_START_PENDING);
-
-// Some lengthy process to get this service up and running.
-
-win32_set_service_status(WIN32_SERVICE_RUNNING);
-
-while (WIN32_SERVICE_CONTROL_STOP != win32_get_last_control_message()) {
-  # do some work here, trying not to take more than around 30 seconds
-  # before coming back into the loop again
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
  </refsect1>
 
- <refsect1 role="changelog"><!-- {{{ -->
+ <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
    <informaltable>
@@ -172,7 +141,39 @@ while (WIN32_SERVICE_CONTROL_STOP != win32_get_last_control_message()) {
     </tgroup>
    </informaltable>
   </para>
- </refsect1><!-- }}} -->
+ </refsect1>
+
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>A <function>win32_start_service_ctrl_dispatcher</function> example</title>
+    <para>
+     Check if the service is runnig under the SCM.
+    </para>
+    <programlisting role="php">
+<![CDATA[
+<?php
+if (!win32_start_service_ctrl_dispatcher('dummyphp')) {
+  die("I'm probably not running under the service control manager");
+}
+
+win32_set_service_status(WIN32_SERVICE_START_PENDING);
+
+// Some lengthy process to get this service up and running.
+
+win32_set_service_status(WIN32_SERVICE_RUNNING);
+
+while (WIN32_SERVICE_CONTROL_STOP != win32_get_last_control_message()) {
+  # do some work here, trying not to take more than around 30 seconds
+  # before coming back into the loop again
+}
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/wincache/book.xml b/reference/wincache/book.xml
index 7c9ce4c084..5077707ba2 100644
--- a/reference/wincache/book.xml
+++ b/reference/wincache/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.wincache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Windows Cache for PHP</title>
  <titleabbrev>WinCache</titleabbrev>
 
@@ -32,7 +33,7 @@
     <para>
      Support for opcode caching was removed in <literal>Wincache 2.0.0</literal>, all users who 
      wish to have an opcache should use the <link linkend="book.opcache">OPcache</link> extension 
-     that is included with PHP as of PHP 5.5.0.
+     that is included with PHP.
     </para>
    </listitem>
    <listitem>
diff --git a/reference/wincache/functions/wincache-fcache-meminfo.xml b/reference/wincache/functions/wincache-fcache-meminfo.xml
index cdeb01e71f..3af238a713 100644
--- a/reference/wincache/functions/wincache-fcache-meminfo.xml
+++ b/reference/wincache/functions/wincache-fcache-meminfo.xml
@@ -17,6 +17,12 @@
    Retrieves information about memory usage by file cache.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/wincache/functions/wincache-ocache-meminfo.xml b/reference/wincache/functions/wincache-ocache-meminfo.xml
index 4fba4f666d..0406a32ba9 100644
--- a/reference/wincache/functions/wincache-ocache-meminfo.xml
+++ b/reference/wincache/functions/wincache-ocache-meminfo.xml
@@ -17,6 +17,12 @@
    Retrieves information about memory usage by opcode cache.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/wincache/functions/wincache-rplist-fileinfo.xml b/reference/wincache/functions/wincache-rplist-fileinfo.xml
index 2c1d87ff41..3bf66a9ac2 100644
--- a/reference/wincache/functions/wincache-rplist-fileinfo.xml
+++ b/reference/wincache/functions/wincache-rplist-fileinfo.xml
@@ -18,6 +18,23 @@
    and corresponding absolute file paths.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>summaryonly</parameter></term>
+     <listitem>
+      <para>
+
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -53,6 +70,7 @@
    </itemizedlist>
   </para>
  </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/wincache/functions/wincache-rplist-meminfo.xml b/reference/wincache/functions/wincache-rplist-meminfo.xml
index f93b9246ef..6e7d276f19 100644
--- a/reference/wincache/functions/wincache-rplist-meminfo.xml
+++ b/reference/wincache/functions/wincache-rplist-meminfo.xml
@@ -17,6 +17,12 @@
    Retrieves information about memory usage by resolve file path cache.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/wincache/functions/wincache-scache-meminfo.xml b/reference/wincache/functions/wincache-scache-meminfo.xml
index 1a797c366d..b54d622d4e 100644
--- a/reference/wincache/functions/wincache-scache-meminfo.xml
+++ b/reference/wincache/functions/wincache-scache-meminfo.xml
@@ -17,6 +17,12 @@
    Retrieves information about memory usage by session cache.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/wincache/functions/wincache-ucache-clear.xml b/reference/wincache/functions/wincache-ucache-clear.xml
index 6216bb2ed0..1a3826a556 100644
--- a/reference/wincache/functions/wincache-ucache-clear.xml
+++ b/reference/wincache/functions/wincache-ucache-clear.xml
@@ -17,12 +17,19 @@
    Clears/deletes all the values stored in the user cache.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/wincache/functions/wincache-ucache-meminfo.xml b/reference/wincache/functions/wincache-ucache-meminfo.xml
index 8b68a7a981..82d406c2a6 100644
--- a/reference/wincache/functions/wincache-ucache-meminfo.xml
+++ b/reference/wincache/functions/wincache-ucache-meminfo.xml
@@ -17,6 +17,12 @@
    Retrieves information about memory usage by user cache.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/wkhtmltox/book.xml b/reference/wkhtmltox/book.xml
index ab9edc59f3..4a79d0cc5f 100644
--- a/reference/wkhtmltox/book.xml
+++ b/reference/wkhtmltox/book.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
 
 <book xml:id="book.wkhtmltox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- This has an entry on PECL but no releases -->
+ <?phpdoc extension-membership="pecl" ?>
  <title>wkhtmltox</title>
  <titleabbrev>wkhtmltox</titleabbrev>
 
@@ -20,7 +21,6 @@
 
  &reference.wkhtmltox.wkhtmltox.image.converter;
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/xattr/book.xml b/reference/xattr/book.xml
index 23f36aae32..90c90de50f 100644
--- a/reference/xattr/book.xml
+++ b/reference/xattr/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.xattr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>xattr</title>
  
  <!-- {{{ preface -->
diff --git a/reference/xdiff/book.xml b/reference/xdiff/book.xml
index 1c50f463b6..f2e785bb0d 100644
--- a/reference/xdiff/book.xml
+++ b/reference/xdiff/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.xdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>xdiff</title>
  
  <!-- {{{ preface -->
diff --git a/reference/xhprof/book.xml b/reference/xhprof/book.xml
index f05e59d16b..3dd17a123f 100644
--- a/reference/xhprof/book.xml
+++ b/reference/xhprof/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.xhprof" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Hierarchical Profiler</title>
  <titleabbrev>Xhprof</titleabbrev>
 
diff --git a/reference/xlswriter/book.xml b/reference/xlswriter/book.xml
index 20dbe0a81a..2a30d78a15 100644
--- a/reference/xlswriter/book.xml
+++ b/reference/xlswriter/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.xlswriter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>XLSWriter</title>
  
  <!-- {{{ preface -->
diff --git a/reference/xml/functions/xml-get-current-byte-index.xml b/reference/xml/functions/xml-get-current-byte-index.xml
index 814f9a9a5d..0eea0b67d8 100644
--- a/reference/xml/functions/xml-get-current-byte-index.xml
+++ b/reference/xml/functions/xml-get-current-byte-index.xml
@@ -42,16 +42,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    This function returns byte index according to UTF-8 encoded text
-    disregarding if input is in another encoding.
-   </para>
-  </warning>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -69,6 +59,16 @@
   </informaltable>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <warning>
+   <para>
+    This function returns byte index according to UTF-8 encoded text
+    disregarding if input is in another encoding.
+   </para>
+  </warning>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/xml/functions/xml-parse-into-struct.xml b/reference/xml/functions/xml-parse-into-struct.xml
index 8844cbb046..faac6b47a6 100644
--- a/reference/xml/functions/xml-parse-into-struct.xml
+++ b/reference/xml/functions/xml-parse-into-struct.xml
@@ -168,7 +168,7 @@ Array
    Event-driven parsing (based on the expat library) can get
    complicated when you have an XML document that is complex.
    This function does not produce a DOM style object, but it
-   generates structures amenable of being transversed in a tree
+   generates structures amenable of being traversed in a tree
    fashion. Thus, we can create objects representing the data
    in the XML file easily. Let's consider the following XML file
    representing a small database of aminoacids information:
@@ -224,7 +224,7 @@ class AminoAcid {
 function readDatabase($filename) 
 {
     // read the XML database of aminoacids
-    $data = implode("", file($filename));
+    $data = file_get_contents($filename);
     $parser = xml_parser_create();
     xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
     xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
diff --git a/reference/xml/functions/xml-parser-create-ns.xml b/reference/xml/functions/xml-parser-create-ns.xml
index f3e00e2dbd..c2a4d447c1 100644
--- a/reference/xml/functions/xml-parser-create-ns.xml
+++ b/reference/xml/functions/xml-parser-create-ns.xml
@@ -30,8 +30,7 @@
       <para>
        The input encoding is automatically detected, so that the
        <parameter>encoding</parameter> parameter specifies only the output
-       encoding. In PHP 5.0.0 and 5.0.1, the default output charset is
-       ISO-8859-1, while in PHP 5.0.2 and upper is UTF-8. The supported
+       encoding. The default output charset is UTF-8. The supported
        encodings are <literal>ISO-8859-1</literal>, <literal>UTF-8</literal> and
        <literal>US-ASCII</literal>.
       </para>
diff --git a/reference/xml/functions/xml-parser-create.xml b/reference/xml/functions/xml-parser-create.xml
index 858e39a32c..57e3fb8734 100644
--- a/reference/xml/functions/xml-parser-create.xml
+++ b/reference/xml/functions/xml-parser-create.xml
@@ -27,15 +27,12 @@
      <term><parameter>encoding</parameter></term>
      <listitem>
       <para>
-       The optional <parameter>encoding</parameter> specifies the character
-       encoding for the input/output in PHP 4. Starting from PHP 5, the input
+       The input
        encoding is automatically detected, so that the
        <parameter>encoding</parameter> parameter specifies only the output
-       encoding. In PHP 4, the default output encoding is the same as the
-       input charset. If empty string is passed, the parser attempts to identify
+       encoding. If empty string is passed, the parser attempts to identify
        which encoding the document is encoded in by looking at the heading 3 or
-       4 bytes. In PHP 5.0.0 and 5.0.1, the default output charset is
-       ISO-8859-1, while in PHP 5.0.2 and upper is UTF-8. The supported
+       4 bytes. The default output charset is UTF-8. The supported
        encodings are <literal>ISO-8859-1</literal>, <literal>UTF-8</literal> and
        <literal>US-ASCII</literal>.
       </para>
diff --git a/reference/xml/functions/xml-set-default-handler.xml b/reference/xml/functions/xml-set-default-handler.xml
index 9c50e61c1e..04acbae0f2 100644
--- a/reference/xml/functions/xml-set-default-handler.xml
+++ b/reference/xml/functions/xml-set-default-handler.xml
@@ -85,6 +85,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -102,13 +109,6 @@
   </informaltable>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmldiff/book.xml b/reference/xmldiff/book.xml
index cd9a440269..0cba52ef23 100644
--- a/reference/xmldiff/book.xml
+++ b/reference/xmldiff/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.xmldiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>XML diff and merge</title>
  <titleabbrev>XMLDiff</titleabbrev>
 
diff --git a/reference/xmlreader/constants.xml b/reference/xmlreader/constants.xml
index ee8f033f72..a8895d7381 100644
--- a/reference/xmlreader/constants.xml
+++ b/reference/xmlreader/constants.xml
@@ -3,12 +3,6 @@
 <appendix xml:id="xmlreader.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
-  <warning>
-   <para>
-    XMLReader uses class constants since PHP 5.1. Prior releases use global
-    constants in the form <constant>XMLREADER_ELEMENT</constant>.
-   </para>
-  </warning>
   <table>
    <title>XMLReader Node Types</title>
    <tgroup cols="3">
diff --git a/reference/xmlreader/setup.xml b/reference/xmlreader/setup.xml
index 40dc82304e..111b8f0f19 100644
--- a/reference/xmlreader/setup.xml
+++ b/reference/xmlreader/setup.xml
@@ -15,11 +15,7 @@
  <section xml:id="xmlreader.installation">
   &reftitle.install;
   <para>
-   The XMLReader extension was initially a PECL extension for PHP 5. It was later
-   moved to the PHP source (bundled) as of PHP 5.1.0, and later enabled by default 
-   as of PHP 5.1.2.
-  </para>
-  <para>
+   The XMLReader ships with PHP source.
    &installation.enabled.disable;
    <option role="configure">--disable-xmlreader</option>
   </para>
diff --git a/reference/xmlreader/xmlreader/close.xml b/reference/xmlreader/xmlreader/close.xml
index 3ccad17bcc..3117cb5209 100644
--- a/reference/xmlreader/xmlreader/close.xml
+++ b/reference/xmlreader/xmlreader/close.xml
@@ -15,6 +15,10 @@
    Closes the input the XMLReader object is currently parsing.
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/xmlreader/xmlreader/getattribute.xml b/reference/xmlreader/xmlreader/getattribute.xml
index 047a6e4fa1..d29bf17304 100644
--- a/reference/xmlreader/xmlreader/getattribute.xml
+++ b/reference/xmlreader/xmlreader/getattribute.xml
@@ -32,6 +32,14 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   The value of the attribute, or &null; if no attribute with the given
+   <parameter>name</parameter> is found or not positioned on an element node.
+  </para>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -54,14 +62,6 @@
   </informaltable>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The value of the attribute, or &null; if no attribute with the given
-   <parameter>name</parameter> is found or not positioned on an element node.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/xmlreader/xmlreader/getattributeno.xml b/reference/xmlreader/xmlreader/getattributeno.xml
index 6ebc141bbb..ec9ec2de7d 100644
--- a/reference/xmlreader/xmlreader/getattributeno.xml
+++ b/reference/xmlreader/xmlreader/getattributeno.xml
@@ -37,37 +37,11 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The value of the attribute, or an empty string (before PHP 5.6) or &null;
-   (from PHP 5.6 onwards) if no attribute exists at
+   The value of the attribute, or &null; if no attribute exists at
    <parameter>index</parameter> or is not positioned on the element.
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        <methodname>XMLReader::getAttributeNo</methodname> now returns &null;
-        if the attribute doesn't exist.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/xmlreader/xmlreader/getattributens.xml b/reference/xmlreader/xmlreader/getattributens.xml
index 630212c022..db4b4ab8bf 100644
--- a/reference/xmlreader/xmlreader/getattributens.xml
+++ b/reference/xmlreader/xmlreader/getattributens.xml
@@ -45,8 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The value of the attribute, or an empty string (before PHP 5.6) or &null;
-   (from PHP 5.6 onwards) if no attribute with the given
+   The value of the attribute, or &null; if no attribute with the given
    <parameter>name</parameter> and <parameter>namespace</parameter> is
    found or not positioned of element.
   </para>
@@ -70,13 +69,6 @@
         This function can no longer return &false;.
        </entry>
       </row>
-      <row>
-       <entry>5.6.0</entry>
-       <entry>
-        <methodname>XMLReader::getAttributeNS</methodname> now returns &null;
-        if the attribute doesn't exist.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/xmlreader/xmlreader/isvalid.xml b/reference/xmlreader/xmlreader/isvalid.xml
index 16bb9f59f1..841ca7aab9 100644
--- a/reference/xmlreader/xmlreader/isvalid.xml
+++ b/reference/xmlreader/xmlreader/isvalid.xml
@@ -15,6 +15,10 @@
    Returns a boolean indicating if the document being parsed is currently valid.
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/xmlreader/xmlreader/movetoelement.xml b/reference/xmlreader/xmlreader/movetoelement.xml
index 09e2d4a96e..5926b81ae4 100644
--- a/reference/xmlreader/xmlreader/movetoelement.xml
+++ b/reference/xmlreader/xmlreader/movetoelement.xml
@@ -15,6 +15,10 @@
    Moves cursor to the parent Element of current Attribute. 
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/xmlreader/xmlreader/movetofirstattribute.xml b/reference/xmlreader/xmlreader/movetofirstattribute.xml
index a14c1659b7..036c4e207c 100644
--- a/reference/xmlreader/xmlreader/movetofirstattribute.xml
+++ b/reference/xmlreader/xmlreader/movetofirstattribute.xml
@@ -15,6 +15,10 @@
    Moves cursor to the first Attribute.
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/xmlreader/xmlreader/movetonextattribute.xml b/reference/xmlreader/xmlreader/movetonextattribute.xml
index 9bd5c14b36..61a23f75fb 100644
--- a/reference/xmlreader/xmlreader/movetonextattribute.xml
+++ b/reference/xmlreader/xmlreader/movetonextattribute.xml
@@ -16,6 +16,10 @@
    moves to first attribute if positioned on an Element.
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/xmlreader/xmlreader/read.xml b/reference/xmlreader/xmlreader/read.xml
index a05cdef1b4..c5462a6378 100644
--- a/reference/xmlreader/xmlreader/read.xml
+++ b/reference/xmlreader/xmlreader/read.xml
@@ -15,6 +15,10 @@
    Moves cursor to the next node in the document.
   </para>
  </refsect1>
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/xmlrpc/book.xml b/reference/xmlrpc/book.xml
index 10db5e7f04..83c78204cc 100644
--- a/reference/xmlrpc/book.xml
+++ b/reference/xmlrpc/book.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- State: deprecated -->
 <!-- State: experimental -->
  
 <book xml:id="book.xmlrpc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundled" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>XML-RPC</title>
  
  <!-- {{{ preface -->
diff --git a/reference/xmlrpc/functions/xmlrpc-set-type.xml b/reference/xmlrpc/functions/xmlrpc-set-type.xml
index 16f87b2fd9..c64a2b512b 100644
--- a/reference/xmlrpc/functions/xmlrpc-set-type.xml
+++ b/reference/xmlrpc/functions/xmlrpc-set-type.xml
@@ -50,6 +50,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Issues E_WARNING with type unsupported by XMLRPC.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -85,13 +92,6 @@ echo xmlrpc_encode($params);
   </para>
  </refsect1>
 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Issues E_WARNING with type unsupported by XMLRPC.
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/xmlwriter/setup.xml b/reference/xmlwriter/setup.xml
index 9387c3c7b3..e79d7438f6 100644
--- a/reference/xmlwriter/setup.xml
+++ b/reference/xmlwriter/setup.xml
@@ -15,11 +15,7 @@
  <section xml:id="xmlwriter.installation">
   &reftitle.install;
   <para>
-   The XMLWriter extension was initially a PECL extension for PHP 5. It
-   was later added to the PHP source (bundled) as of PHP 5.1.2. This
-   extension is enabled by default.
-  </para>
-  <para>
+   The XMLWriter ships with PHP source.
    &installation.enabled.disable;
    <option role="configure">--disable-xmlwriter</option>
   </para>
diff --git a/reference/xmlwriter/xmlwriter/startattribute.xml b/reference/xmlwriter/xmlwriter/startattribute.xml
index 2c3c24b036..93ae898863 100644
--- a/reference/xmlwriter/xmlwriter/startattribute.xml
+++ b/reference/xmlwriter/xmlwriter/startattribute.xml
@@ -74,7 +74,7 @@
 <?php
 $writer = new XMLWriter;
 $writer->openURI('php://output');
-$writer->startDocument('1.0', 'UTF-8');?>
+$writer->startDocument('1.0', 'UTF-8');
 $writer->startElement('element');
 $writer->startAttribute('attribute');
 $writer->text('value');
diff --git a/reference/xsl/configure.xml b/reference/xsl/configure.xml
index e443974e27..2d4f0b33db 100644
--- a/reference/xsl/configure.xml
+++ b/reference/xsl/configure.xml
@@ -3,7 +3,7 @@
 <section xml:id="xsl.installation" xmlns="http://docbook.org/ns/docbook">
  &reftitle.install;
   <para>
-   PHP 5 includes the XSL extension by default and can be enabled
+   PHP includes the XSL extension by default and can be enabled
    by adding the argument <option role="configure">--with-xsl[=DIR]</option>
    to your configure line (<literal>DIR</literal> being the libxslt installation
    directory).
diff --git a/reference/xsl/constants.xml b/reference/xsl/constants.xml
index ea0384ffc1..b0bb5ec128 100644
--- a/reference/xsl/constants.xml
+++ b/reference/xsl/constants.xml
@@ -41,7 +41,7 @@
    </term>
    <listitem>
     <simpara>
-     libxslt version like 10117. Available as of PHP 5.1.2.
+     libxslt version like 10117.
     </simpara>
    </listitem>
   </varlistentry>
@@ -52,7 +52,7 @@
    </term>
    <listitem>
     <simpara>
-     libxslt version like 1.1.17. Available as of PHP 5.1.2.
+     libxslt version like 1.1.17.
     </simpara>
    </listitem>
   </varlistentry>
@@ -63,7 +63,7 @@
    </term>
    <listitem>
     <simpara>
-     libexslt version like 813. Available as of PHP 5.1.2.
+     libexslt version like 813.
     </simpara>
    </listitem>
   </varlistentry>
@@ -74,7 +74,7 @@
    </term>
    <listitem>
     <simpara>
-     libexslt version like 1.1.17. Available as of PHP 5.1.2.
+     libexslt version like 1.1.17.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/xsl/xsltprocessor/hasexsltsupport.xml b/reference/xsl/xsltprocessor/hasexsltsupport.xml
index 32b6af1384..a8aacfc218 100644
--- a/reference/xsl/xsltprocessor/hasexsltsupport.xml
+++ b/reference/xsl/xsltprocessor/hasexsltsupport.xml
@@ -5,6 +5,7 @@
   <refname>XSLTProcessor::hasExsltSupport</refname>
   <refpurpose>Determine if PHP has EXSLT support</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -16,12 +17,19 @@
    xlink:href="&url.exsltlib;">EXSLT library</link>.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -44,6 +52,7 @@ if (!$proc->hasExsltSupport()) {
    </example>
   </para>
  </refsect1>
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/yac/book.xml b/reference/yac/book.xml
index 142a22879e..450d4a32bb 100644
--- a/reference/yac/book.xml
+++ b/reference/yac/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.yac" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Yac</title>
  <titleabbrev>Yac</titleabbrev>
 
diff --git a/reference/yac/yac/construct.xml b/reference/yac/yac/construct.xml
index f65d9cad95..fc414bbe76 100644
--- a/reference/yac/yac/construct.xml
+++ b/reference/yac/yac/construct.xml
@@ -44,7 +44,14 @@
  </refsect1>
  -->
 
-
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws an <classname>Exception</classname> if Yac is not enabled. Throws 
+   <classname>Exception</classname> if <parameter>prefix</parameter> exceeds 
+   max key length of 48 (<constant>YAC_MAX_KEY_LEN</constant>) bytes.
+  </para>
+ </refsect1>
 
 </refentry>
 
diff --git a/reference/yaconf/book.xml b/reference/yaconf/book.xml
index a3273fa605..2bd59cde81 100644
--- a/reference/yaconf/book.xml
+++ b/reference/yaconf/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.yaconf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Yaconf</title>
  <titleabbrev>Yaconf</titleabbrev>
 
@@ -43,7 +44,7 @@ arr.0=val
 arr[]=val
 ;use PHP constants
 version=PHP_VERION
-;use enviroment
+;use environment
 env=${PATH}
 ]]>
    </programlisting>
diff --git a/reference/yaf/book.xml b/reference/yaf/book.xml
index 4e8a1de4f9..a38b4091ce 100644
--- a/reference/yaf/book.xml
+++ b/reference/yaf/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.yaf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Yet Another Framework</title>
  <titleabbrev>Yaf</titleabbrev>
 
@@ -11,9 +12,6 @@
    The <literal>Yet Another Framework</literal> (<acronym>Yaf</acronym>) extension 
    is a PHP framework that is used to develop web applications.
   </para>
-  <para>
-   Yaf requires PHP 5.2.1 or greater. Earlier versions may not work.
-  </para>
   <para>
    A simple Yaf benchmark can be found at <link
     xlink:href="&url.yaf.benchmarks;">Yaf Performance</link>.
diff --git a/reference/yaf/ini.xml b/reference/yaf/ini.xml
index df704c420b..6692264923 100644
--- a/reference/yaf/ini.xml
+++ b/reference/yaf/ini.xml
@@ -256,7 +256,7 @@
      </term>
      <listitem>
       <para>
-       Only works as of PHP 5.3, if this value is On, All classes of Yaf will
+       If this value is On, All classes of Yaf will
        named in namespace style.
       </para>
       <para>
diff --git a/reference/yaf/yaf-action-abstract.xml b/reference/yaf/yaf-action-abstract.xml
index 6079f0de87..7ace6e927e 100644
--- a/reference/yaf/yaf-action-abstract.xml
+++ b/reference/yaf/yaf-action-abstract.xml
@@ -17,9 +17,8 @@
     can also be a <classname>Yaf_Action_Abstract</classname> class.
    </para>
    <para>
-    Since there should be a entry point which can be called by Yaf (as of PHP 5.3, 
-    there is a new magic method __invoke, but Yaf is not only works with PHP 5.3+, 
-    Yaf choose another magic method execute), you must implement the abstract method
+    Since there should be a entry point which can be called by Yaf, 
+    you must implement the abstract method
     <methodname>Yaf_Action_Abstract::execute</methodname> in your custom
     action class.
    </para>
diff --git a/reference/yaf/yaf-loader.xml b/reference/yaf/yaf-loader.xml
index 31172c01cf..50e6cb40b3 100644
--- a/reference/yaf/yaf-loader.xml
+++ b/reference/yaf/yaf-loader.xml
@@ -100,7 +100,6 @@ class BarNon_Test
       </programlisting>
     </example>
 
-   As of PHP 5.3, you can use namespace:
    <example>
     <title>Load namespace class example</title>
     <programlisting role="shell">
diff --git a/reference/yaf/yaf_application/bootstrap.xml b/reference/yaf/yaf_application/bootstrap.xml
index a7a47a76b1..9c2d51efdf 100644
--- a/reference/yaf/yaf_application/bootstrap.xml
+++ b/reference/yaf/yaf_application/bootstrap.xml
@@ -73,7 +73,7 @@ class Bootstrap extends Yaf_Bootstrap_Abstract {
 <?php
 
 defined('APPLICATION_PATH')                  // APPLICATION_PATH will be used in the ini config file
-    || define('APPLICATION_PATH', __DIR__)); //__DIR__ was introduced after PHP 5.3
+    || define('APPLICATION_PATH', __DIR__));
 
 $application = new Yaf_Application(APPLICATION_PATH.'/conf/application.ini');
 $application->bootstrap();
diff --git a/reference/yaf/yaf_application/construct.xml b/reference/yaf/yaf_application/construct.xml
index da2b1304fd..0e8c32f09b 100644
--- a/reference/yaf/yaf_application/construct.xml
+++ b/reference/yaf/yaf_application/construct.xml
@@ -105,7 +105,7 @@ ap.modules=Index
 <![CDATA[
 <?php
 defined('APPLICATION_PATH')                  // APPLICATION_PATH will be used in the ini config file
-    || define('APPLICATION_PATH', __DIR__)); //__DIR__ was introduced after PHP 5.3
+    || define('APPLICATION_PATH', __DIR__));
 
 $application = new Yaf_Application(APPLICATION_PATH.'/conf/application.ini');
 $application->bootstrap()->run();
diff --git a/reference/yaf/yaf_controller_abstract/forward.xml b/reference/yaf/yaf_controller_abstract/forward.xml
index 67621a13d9..3a2d6521f2 100644
--- a/reference/yaf/yaf_controller_abstract/forward.xml
+++ b/reference/yaf/yaf_controller_abstract/forward.xml
@@ -4,24 +4,24 @@
 <refentry xml:id="yaf-controller-abstract.forward" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Controller_Abstract::forward</refname>
-  <refpurpose>Foward to another action</refpurpose>
+  <refpurpose>Forward to another action</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Controller_Abstract::forward</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Controller_Abstract::forward</methodname>
    <methodparam><type>string</type><parameter>action</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>paramters</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Controller_Abstract::forward</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Controller_Abstract::forward</methodname>
    <methodparam><type>string</type><parameter>controller</parameter></methodparam>
    <methodparam><type>string</type><parameter>action</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>paramters</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Controller_Abstract::forward</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Controller_Abstract::forward</methodname>
    <methodparam><type>string</type><parameter>module</parameter></methodparam>
    <methodparam><type>string</type><parameter>controller</parameter></methodparam>
    <methodparam><type>string</type><parameter>action</parameter></methodparam>
@@ -77,6 +77,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.success;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -113,14 +120,6 @@ class IndexController extends Yaf_Controller_Abstract
   </example>
  </refsect1>
 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    return FALSE on failure
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/yaf/yaf_dispatcher/autorender.xml b/reference/yaf/yaf_dispatcher/autorender.xml
index f8bcd868ad..7d28115c59 100644
--- a/reference/yaf/yaf_dispatcher/autorender.xml
+++ b/reference/yaf/yaf_dispatcher/autorender.xml
@@ -37,7 +37,7 @@
       <note>
        <para>
         since 2.2.0, if this parameter is not given, then the current state
-        will be renturned
+        will be returned
        </para>
       </note>
      </para>
@@ -56,7 +56,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>Yaf_Dispatcher::autoRender</function>example</title>
+   <title><function>Yaf_Dispatcher::autoRender</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/yaf/yaf_dispatcher/catchexception.xml b/reference/yaf/yaf_dispatcher/catchexception.xml
index e07b25a85c..7e140c4800 100644
--- a/reference/yaf/yaf_dispatcher/catchexception.xml
+++ b/reference/yaf/yaf_dispatcher/catchexception.xml
@@ -16,7 +16,7 @@
   <para>
      While the application.dispatcher.throwException is On(you can also calling
      to <methodname>Yaf_Dispatcher::throwException(TRUE)</methodname> to enable it),  Yaf will throw Exception when
-     error occurrs instead of trigger error. 
+     error occurs instead of trigger error. 
   </para>
   <para>   
      then if you enable <methodname>Yaf_Dispatcher::catchException</methodname>(also can enabled by set
@@ -49,7 +49,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>Yaf_Dispatcher::catchException</function>example</title>
+   <title><function>Yaf_Dispatcher::catchException</function> example</title>
    <programlisting role="php">
 <![CDATA[
 /* if you defined a ErrorController like following */
diff --git a/reference/yaf/yaf_dispatcher/dispatch.xml b/reference/yaf/yaf_dispatcher/dispatch.xml
index 6e72b6c630..01dcec96e8 100644
--- a/reference/yaf/yaf_dispatcher/dispatch.xml
+++ b/reference/yaf/yaf_dispatcher/dispatch.xml
@@ -25,7 +25,7 @@
    <member>Response</member>
   </simplelist>
    Routing takes place exactly once, using the values in the request object
-   when dispatch() is called. Dispatching takes place in a loop; a request may
+   when <function>Yaf_Dispatcher::dispatch</function> is called. Dispatching takes place in a loop; a request may
    either indicate multiple actions to dispatch, or the controller or a plugin
    may reset the request object to force additional actions to dispatch(see
    <classname>Yaf_Plugin_Abstract</classname>. When all is done, the 
diff --git a/reference/yaf/yaf_dispatcher/flushinstantly.xml b/reference/yaf/yaf_dispatcher/flushinstantly.xml
index 7f12170f75..654e4db851 100644
--- a/reference/yaf/yaf_dispatcher/flushinstantly.xml
+++ b/reference/yaf/yaf_dispatcher/flushinstantly.xml
@@ -32,7 +32,7 @@
        <note>
        <para>
         since 2.2.0, if this parameter is not given, then the current state
-        will be renturned
+        will be returned
        </para>
       </note>     
      </para>
diff --git a/reference/yaf/yaf_dispatcher/getapplication.xml b/reference/yaf/yaf_dispatcher/getapplication.xml
index ef8a62509c..d399563d28 100644
--- a/reference/yaf/yaf_dispatcher/getapplication.xml
+++ b/reference/yaf/yaf_dispatcher/getapplication.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="yaf-dispatcher.getapplication" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Dispatcher::getApplication</refname>
-  <refpurpose>Retrive the application</refpurpose>
+  <refpurpose>Retrieve the application</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -14,7 +14,7 @@
    <void />
   </methodsynopsis>
   <para>
-   Retrive the <classname>Yaf_Application</classname> instance. same as
+   Retrieve the <classname>Yaf_Application</classname> instance. same as
    <methodname>Yaf_Application::app</methodname>.
   </para>
 
diff --git a/reference/yaf/yaf_dispatcher/registerplugin.xml b/reference/yaf/yaf_dispatcher/registerplugin.xml
index f7c41f32fe..7403eed8f0 100644
--- a/reference/yaf/yaf_dispatcher/registerplugin.xml
+++ b/reference/yaf/yaf_dispatcher/registerplugin.xml
@@ -47,7 +47,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>Yaf_Dispatcher::registerPlugin</function>example</title>
+   <title><function>Yaf_Dispatcher::registerPlugin</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/yaf/yaf_dispatcher/seterrorhandler.xml b/reference/yaf/yaf_dispatcher/seterrorhandler.xml
index babbb28183..7eeee1ac48 100644
--- a/reference/yaf/yaf_dispatcher/seterrorhandler.xml
+++ b/reference/yaf/yaf_dispatcher/seterrorhandler.xml
@@ -17,7 +17,7 @@
   <para>
     Set error handler for Yaf. when <link
      linkend="configuration.yaf.dispatcher.throwexception">application.dispatcher.throwException</link>
-    is off, Yaf will trigger catchable error while unexpected errors occrred.
+    is off, Yaf will trigger catchable error while unexpected errors occurred.
   </para>
   <para>
    Thus, this error handler will be called while the error raise.
diff --git a/reference/yaf/yaf_dispatcher/setview.xml b/reference/yaf/yaf_dispatcher/setview.xml
index 49f80d2715..0f4b8633c5 100644
--- a/reference/yaf/yaf_dispatcher/setview.xml
+++ b/reference/yaf/yaf_dispatcher/setview.xml
@@ -27,7 +27,7 @@
     <term><parameter>view</parameter></term>
     <listitem>
      <para>
-       A Yaf_View_Interface instance
+       A <classname>Yaf_View_Interface</classname> instance
      </para>
     </listitem>
    </varlistentry>
@@ -44,7 +44,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>A custom View engine</function>example</title>
+   <title><function>A custom View engine</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -182,7 +182,7 @@ class Smarty_Adapter implements Yaf_View_Interface
    </programlisting>
   </example>
   <example>
-   <title><function>Yaf_Dispatcher::setView</function>example</title>
+   <title><function>Yaf_Dispatcher::setView</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/yaf/yaf_dispatcher/throwexception.xml b/reference/yaf/yaf_dispatcher/throwexception.xml
index cc92a180d4..ebf82ae238 100644
--- a/reference/yaf/yaf_dispatcher/throwexception.xml
+++ b/reference/yaf/yaf_dispatcher/throwexception.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>bool</type><parameter>flag</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Siwtch on/off exception throwing while unexpected error occurring.
+   Switch on/off exception throwing while unexpected error occurring.
    When this is on, Yaf will throwing exceptions instead of triggering
    catchable errors. 
   </para>
@@ -49,7 +49,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>Yaf_Dispatcher::throwexception</function>example</title>
+   <title><function>Yaf_Dispatcher::throwexception</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/yaf/yaf_loader/registernamespace.xml b/reference/yaf/yaf_loader/registernamespace.xml
index 8baad1211a..5f54eab3ca 100644
--- a/reference/yaf/yaf_loader/registernamespace.xml
+++ b/reference/yaf/yaf_loader/registernamespace.xml
@@ -44,7 +44,7 @@
     <term><parameter>path</parameter></term>
     <listitem>
      <para>
-      a string of path, it it better to use abosolute path here for performance
+      a string of path, it is better to use abosolute path here for performance
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/yaf/yaf_request_abstract/getlanguage.xml b/reference/yaf/yaf_request_abstract/getlanguage.xml
index 21b2e72182..419e299472 100644
--- a/reference/yaf/yaf_request_abstract/getlanguage.xml
+++ b/reference/yaf/yaf_request_abstract/getlanguage.xml
@@ -4,7 +4,7 @@
 <refentry xml:id="yaf-request-abstract.getlanguage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Yaf_Request_Abstract::getLanguage</refname>
-  <refpurpose>Retrieve client's prefered language</refpurpose>
+  <refpurpose>Retrieve client's preferred language</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
diff --git a/reference/yaf/yaf_response_abstract/appendbody.xml b/reference/yaf/yaf_response_abstract/appendbody.xml
index a0c625202b..d8979f76f5 100644
--- a/reference/yaf/yaf_response_abstract/appendbody.xml
+++ b/reference/yaf/yaf_response_abstract/appendbody.xml
@@ -82,12 +82,6 @@ Hello World
   &reftitle.seealso;
   <simplelist>
    <member><classname>Yaf_Config_Ini</classname></member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
    <member><methodname>Yaf_Response_Abstract::getBody</methodname></member>
    <member><methodname>Yaf_Response_Abstract::setBody</methodname></member>
    <member><methodname>Yaf_Response_Abstract::prependBody</methodname></member>
@@ -95,7 +89,6 @@ Hello World
   </simplelist>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_route_map/assemble.xml b/reference/yaf/yaf_route_map/assemble.xml
index 0b705cf45d..835a69d14e 100644
--- a/reference/yaf/yaf_route_map/assemble.xml
+++ b/reference/yaf/yaf_route_map/assemble.xml
@@ -41,6 +41,20 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns &string; on success or &null; on failure.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   May throw <classname>Yaf_Exception_TypeError</classname>.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -91,13 +105,6 @@ string(%d) "/foo/bar/_/tkey1/tval1/tkey2/tval2"
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_route_regex/assemble.xml b/reference/yaf/yaf_route_regex/assemble.xml
index 3f8d932303..367b489952 100644
--- a/reference/yaf/yaf_route_regex/assemble.xml
+++ b/reference/yaf/yaf_route_regex/assemble.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Regex::assemble</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Route_Regex::assemble</methodname>
    <methodparam><type>array</type><parameter>info</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
   </methodsynopsis>
@@ -41,6 +41,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns &string; on success or &null; on failure.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -87,13 +94,6 @@ string(49) "/module/controller/action?tkey1=tval1&tkey2=tval2"
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_route_rewrite/assemble.xml b/reference/yaf/yaf_route_rewrite/assemble.xml
index 786cb1f271..8ecab66c97 100644
--- a/reference/yaf/yaf_route_rewrite/assemble.xml
+++ b/reference/yaf/yaf_route_rewrite/assemble.xml
@@ -41,6 +41,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns &string;.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -83,13 +90,6 @@ string(57) "/product/foo/bar/tmpkey1/tmpval1/?tkey1=tval1&tkey2=tval2"
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_route_simple/assemble.xml b/reference/yaf/yaf_route_simple/assemble.xml
index 2a0b29d75a..6d9c973a65 100644
--- a/reference/yaf/yaf_route_simple/assemble.xml
+++ b/reference/yaf/yaf_route_simple/assemble.xml
@@ -41,6 +41,21 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a &string;.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>Yaf_Exception_TypeError</classname> if <parameter>info</parameter> 
+   keys <literal>':c'</literal> or <literal>':a'</literal> are not set.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -78,13 +93,6 @@ string(64) "?m=yafmodule&c=yafcontroller&a=yafaction&tkey1=tval1&tkey2=tval2"
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_route_static/assemble.xml b/reference/yaf/yaf_route_static/assemble.xml
index f52b4698e6..93d8572add 100644
--- a/reference/yaf/yaf_route_static/assemble.xml
+++ b/reference/yaf/yaf_route_static/assemble.xml
@@ -41,6 +41,21 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a &string;.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>Yaf_Exception_TypeError</classname> if <parameter>info</parameter> 
+   keys <literal>':c'</literal> and <literal>':a'</literal> are not set.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -91,13 +106,6 @@ string(%d) "/yafmodule/yafcontroller/yafaction?tkey1=tval1&tkey2=tval2"
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_route_supervar/assemble.xml b/reference/yaf/yaf_route_supervar/assemble.xml
index 3d22453c40..696c1b3758 100644
--- a/reference/yaf/yaf_route_supervar/assemble.xml
+++ b/reference/yaf/yaf_route_supervar/assemble.xml
@@ -41,10 +41,25 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a &string;.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>Yaf_Exception_TypeError</classname> if <parameter>info</parameter> 
+   keys <literal>':c'</literal> and <literal>':a'</literal> are not set.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>Yaf_Route_Supervar::assemble</function>example</title>
+   <title><function>Yaf_Route_Supervar::assemble</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
@@ -96,13 +111,6 @@ string(%d) "You need to specify the controller by ':c'"
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaf/yaf_view_interface/display.xml b/reference/yaf/yaf_view_interface/display.xml
index 2f482ef7e8..ef70ee354a 100644
--- a/reference/yaf/yaf_view_interface/display.xml
+++ b/reference/yaf/yaf_view_interface/display.xml
@@ -15,7 +15,7 @@
    <methodparam choice="opt"><type>array</type><parameter>tpl_vars</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Render a template and output the result immediatly.
+    Render a template and output the result immediately.
   </para>
 
   &warn.undocumented.func;
diff --git a/reference/yaf/yaf_view_simple/construct.xml b/reference/yaf/yaf_view_simple/construct.xml
index 4efde5bb6f..504ea5ad4e 100644
--- a/reference/yaf/yaf_view_simple/construct.xml
+++ b/reference/yaf/yaf_view_simple/construct.xml
@@ -47,6 +47,17 @@
   </variablelist>
  </refsect1>
 
+ <!-- Return values commented out, as constructors generally don't return a
+      value. Uncomment this if you do need a return values section (for
+      example, because there's also a procedural version of the method).
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+
+  </para>
+ </refsect1>
+ -->
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -64,14 +75,6 @@
   </example>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/yaml/book.xml b/reference/yaml/book.xml
index b66fb15587..da77f301f0 100644
--- a/reference/yaml/book.xml
+++ b/reference/yaml/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.yaml" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>YAML Data Serialization</title>
  <titleabbrev>Yaml</titleabbrev>
 
diff --git a/reference/yar/book.xml b/reference/yar/book.xml
index c7a7bc1c5d..8008475333 100644
--- a/reference/yar/book.xml
+++ b/reference/yar/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ --> 
 
 <book xml:id="book.yar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>Yet Another RPC Framework</title>
  <titleabbrev>Yar</titleabbrev>
 
diff --git a/reference/yaz/book.xml b/reference/yaz/book.xml
index 1a64671284..2b48ccd559 100644
--- a/reference/yaz/book.xml
+++ b/reference/yaz/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.yaz" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>YAZ</title>
  
  <!-- {{{ preface -->
diff --git a/reference/yaz/functions/yaz-record.xml b/reference/yaz/functions/yaz-record.xml
index 572921fd16..9b4c7767ad 100644
--- a/reference/yaz/functions/yaz-record.xml
+++ b/reference/yaz/functions/yaz-record.xml
@@ -279,10 +279,6 @@ echo $res;
 ]]>
     </programlisting>
    </para>
-   <para>
-    For PHP 5 the <link linkend="book.xsl">XSL</link> extension must be used
-    instead of Sablotron XSLT.
-   </para>
   </example>
  </refsect1>
 </refentry>
diff --git a/reference/zip/configure.xml b/reference/zip/configure.xml
index e5d223d0f2..1104ebdc81 100644
--- a/reference/zip/configure.xml
+++ b/reference/zip/configure.xml
@@ -13,26 +13,24 @@
     configure option.
     Previously, zip support had to be enabled by using the <option role="configure">--enable-zip</option>
     configure option.
-   </para>
-   <para>
-    As of PHP 5.6.0 a <option role="configure">--with-libzip=DIR</option>
-    configure option has been added to use a system libzip installation. libzip
-    version 0.11 is required, with 0.11.2 or later recommended.
+    As of PHP 7.4.0, the bundled libzip is removed.
    </para>
    <para>
     As of PHP 7.3.0, building against the bundled libzip is discouraged, but
     still possible by adding <option role="configure">--without-libzip</option>
     to the configuration.
-    As of PHP 7.4.0, the bundled libzip is removed.
+   </para>
+   <para>
+    A <option role="configure">--with-libzip=DIR</option>
+    configure option has been added to use a system libzip installation. libzip
+    version 0.11 is required, with 0.11.2 or later recommended.
    </para>
   </section>
   
   <section xml:id="zip.installation.new.windows">
    <title>Windows</title>
    <para>
-    As of PHP 5.3 this extension is built-in. Before,
-    Windows users need to enable <filename>php_zip.dll</filename> inside
-    of &php.ini; in order to use these functions.
+    This extension is built-in.
    </para>
   </section>
  </section>
diff --git a/reference/zip/constants.xml b/reference/zip/constants.xml
index 6da33d7a3b..edc5287bd7 100644
--- a/reference/zip/constants.xml
+++ b/reference/zip/constants.xml
@@ -943,7 +943,7 @@
    </term>
    <listitem>
     <simpara>
-     Since PHP 5.6.0, PECL zip 1.12.4
+     Since PECL zip 1.12.4
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/zip/ziparchive/registercancelcallback.xml b/reference/zip/ziparchive/registercancelcallback.xml
index 70209b86c8..d6a9e397d0 100644
--- a/reference/zip/ziparchive/registercancelcallback.xml
+++ b/reference/zip/ziparchive/registercancelcallback.xml
@@ -6,6 +6,7 @@
   <refname>ZipArchive::registerCancelCallback</refname>
   <refpurpose>Register a callback to allow cancellation during archive close.</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -17,6 +18,7 @@
    Register a <parameter>callback</parameter> function to allow cancellation during archive close. 
   </para>
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -32,6 +34,7 @@
    </variablelist>
   </para>
  </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -39,15 +42,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function is only available if built against libzip ≥ 1.6.0.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
     <para>
@@ -73,6 +67,15 @@ if ($zip->open('php.zip', ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
     </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function is only available if built against libzip ≥ 1.6.0.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -81,6 +84,7 @@ if ($zip->open('php.zip', ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
    </simplelist>
   </para>
  </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zip/ziparchive/registerprogresscallback.xml b/reference/zip/ziparchive/registerprogresscallback.xml
index 391ac42254..e8349225d1 100644
--- a/reference/zip/ziparchive/registerprogresscallback.xml
+++ b/reference/zip/ziparchive/registerprogresscallback.xml
@@ -6,6 +6,7 @@
   <refname>ZipArchive::registerProgressCallback</refname>
   <refpurpose>Register a callback to provide updates during archive close.</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -18,6 +19,7 @@
    Register a <parameter>callback</parameter> function to provide updates during archive close. 
   </para>
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -41,6 +43,7 @@
    </variablelist>
   </para>
  </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -48,15 +51,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function is only available if built against libzip ≥ 1.3.0.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
     <para>
@@ -81,6 +75,15 @@ if ($zip->open('php.zip', ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
     </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function is only available if built against libzip ≥ 1.3.0.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -89,6 +92,7 @@ if ($zip->open('php.zip', ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
    </simplelist>
   </para>
  </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zip/ziparchive/setencryptionindex.xml b/reference/zip/ziparchive/setencryptionindex.xml
index 854e18d556..d73a229dfa 100644
--- a/reference/zip/ziparchive/setencryptionindex.xml
+++ b/reference/zip/ziparchive/setencryptionindex.xml
@@ -5,6 +5,7 @@
   <refname>ZipArchive::setEncryptionIndex</refname>
   <refpurpose>Set the encryption method of an entry defined by its index</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -17,6 +18,7 @@
    Set the encryption method of an entry defined by its index.
   </para>
  </refsect1>
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
@@ -48,6 +50,7 @@
    </variablelist>
   </para>
  </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -55,15 +58,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function is only available if built against libzip ≥ 1.2.0.
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -86,6 +80,15 @@
   </informaltable>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This function is only available if built against libzip ≥ 1.2.0.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -95,6 +98,7 @@
    </simplelist>
   </para>
  </refsect1>
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/zip/ziparchive/setmtimeindex.xml b/reference/zip/ziparchive/setmtimeindex.xml
index 0b4b374a0b..f4fa5bd5e5 100644
--- a/reference/zip/ziparchive/setmtimeindex.xml
+++ b/reference/zip/ziparchive/setmtimeindex.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>ZipArchive::setMtimeIndex</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setMtimeIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
diff --git a/reference/zip/ziparchive/setmtimename.xml b/reference/zip/ziparchive/setmtimename.xml
index dd009b61a2..a4c8ef4868 100644
--- a/reference/zip/ziparchive/setmtimename.xml
+++ b/reference/zip/ziparchive/setmtimename.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>ZipArchive::setMtimeName</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setMtimeName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
diff --git a/reference/zlib/book.xml b/reference/zlib/book.xml
index 0f0c930c64..0849cffdf4 100644
--- a/reference/zlib/book.xml
+++ b/reference/zlib/book.xml
@@ -18,20 +18,7 @@
   </para>
   <note>
    <para>
-    Version 4.0.4 introduced a fopen-wrapper for <filename>.gz</filename>-files, so that
-    you can use a special <filename>zlib:</filename> URL to access
-    compressed files transparently using the normal f*() file access
-    functions if you prefix the filename or path with
-    <filename>zlib:</filename> when calling <function>fopen</function>. This
-    feature requires a C runtime library that provides the
-    <literal>fopencookie()</literal> function. Up to now the GNU libc
-    seems to be the only library that provides this feature.
-   </para>
-   <para>
-    In PHP 4.3.0, <filename>zlib:</filename> has been changed to
-    <filename>compress.zlib://</filename> to prevent ambiguities with
-    filenames containing '<literal>:</literal>' characters. The
-    <literal>fopencookie()</literal> function is no longer required.
+    PHP comes with a fopen-wrapper for <filename>.gz</filename>-files.
     More information is available in the section about
     <xref linkend="wrappers.compression" />.
    </para>
diff --git a/reference/zlib/constants.xml b/reference/zlib/constants.xml
index 62c60b2112..4ef314f083 100644
--- a/reference/zlib/constants.xml
+++ b/reference/zlib/constants.xml
@@ -33,7 +33,7 @@
    </term>
    <listitem>
     <simpara>
-     DEFLATE algorithm as per RFC 1951. Available as of PHP 7.0.0.
+     DEFLATE algorithm as per RFC 1951.
     </simpara>
    </listitem>
   </varlistentry>
@@ -44,7 +44,7 @@
    </term>
    <listitem>
     <simpara>
-     ZLIB compression algorithm as per RFC 1950. Available as of PHP 7.0.0.
+     ZLIB compression algorithm as per RFC 1950.
     </simpara>
    </listitem>
   </varlistentry>
@@ -55,7 +55,7 @@
    </term>
    <listitem>
     <simpara>
-     GZIP algorithm as per RFC 1952. Available as of PHP 7.0.0.
+     GZIP algorithm as per RFC 1952.
     </simpara>
    </listitem>
   </varlistentry>
@@ -66,7 +66,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -77,7 +77,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -88,7 +88,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -99,7 +99,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -110,7 +110,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -121,7 +121,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -132,7 +132,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -143,7 +143,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -154,7 +154,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+ 
     </simpara>
    </listitem>
   </varlistentry>
@@ -165,7 +165,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
@@ -176,7 +176,7 @@
    </term>
    <listitem>
     <simpara>
-      Available as of PHP 7.0.0.
+
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/zlib/examples.xml b/reference/zlib/examples.xml
index 126195d799..021b16f2e9 100644
--- a/reference/zlib/examples.xml
+++ b/reference/zlib/examples.xml
@@ -50,7 +50,7 @@ echo "</pre>\n</body>\n</html>\n";
   </programlisting>
  </example>
  <example>
-  <title>Working with the incremental compression and decompression API as of PHP 7.0.0</title>
+  <title>Working with the incremental compression and decompression API</title>
   <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/zlib/functions/gzencode.xml b/reference/zlib/functions/gzencode.xml
index d2b0c3fac5..9fa74624da 100644
--- a/reference/zlib/functions/gzencode.xml
+++ b/reference/zlib/functions/gzencode.xml
@@ -56,12 +56,7 @@
        or <constant>FORCE_DEFLATE</constant>. 
       </para>
       <para>
-       Prior to PHP 5.4.0, using <constant>FORCE_DEFLATE</constant> results in
-       a standard zlib deflated string (inclusive zlib headers) after a gzip
-       file header but without the trailing crc32 checksum.
-      </para>
-      <para>
-       In PHP 5.4.0 and later, <constant>FORCE_DEFLATE</constant> generates
+       <constant>FORCE_DEFLATE</constant> generates
        RFC 1950 compliant output, consisting of a zlib header, the deflated
        data, and an Adler checksum.
       </para>
@@ -88,11 +83,9 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$data = implode("", file("bigfile.txt"));
+$data = file_get_contents("bigfile.txt");
 $gzdata = gzencode($data, 9);
-$fp = fopen("bigfile.txt.gz", "w");
-fwrite($fp, $gzdata);
-fclose($fp);
+file_put_contents("bigfile.txt.gz", $gzdata);
 ?>
 ]]>
     </programlisting>
diff --git a/reference/zlib/functions/gzwrite.xml b/reference/zlib/functions/gzwrite.xml
index cf42d2378a..0d52e796de 100644
--- a/reference/zlib/functions/gzwrite.xml
+++ b/reference/zlib/functions/gzwrite.xml
@@ -48,15 +48,6 @@
        written or the end of <parameter>data</parameter> is reached,
        whichever comes first.
       </para>
-      <note>
-       <para>
-        Note that if the <parameter>length</parameter> argument is given,
-        then the <link
-        linkend="ini.magic-quotes-runtime">magic_quotes_runtime</link>
-        configuration option will be ignored and no slashes will be
-        stripped from <parameter>data</parameter>.
-       </para>
-      </note>
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/zlib/functions/zlib-get-coding-type.xml b/reference/zlib/functions/zlib-get-coding-type.xml
index bdd3e5b595..4bcdf5c58d 100644
--- a/reference/zlib/functions/zlib-get-coding-type.xml
+++ b/reference/zlib/functions/zlib-get-coding-type.xml
@@ -5,6 +5,7 @@
   <refname>zlib_get_coding_type</refname>
   <refpurpose>Returns the coding type used for output compression</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -15,6 +16,12 @@
    Returns the coding type used for output compression.  
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -22,6 +29,7 @@
    or &false;.
   </para>
  </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -34,6 +42,7 @@
    </simplelist>
   </para>
  </refsect1>
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/zlib/setup.xml b/reference/zlib/setup.xml
index 5a2e546257..45e565568c 100644
--- a/reference/zlib/setup.xml
+++ b/reference/zlib/setup.xml
@@ -10,8 +10,7 @@
   <para>
    This module uses the functions of <link xlink:href="&url.zlib;">zlib</link>
    by Jean-loup Gailly and Mark Adler. You have to use a zlib
-   version &gt;= 1.0.9 with this module. As of PHP 5.4.0 you have to use zlib
-   &gt;= 1.2.0.4.
+   version &gt;= 1.2.0.4 with this module.
   </para>
  </section>
  <!-- }}} -->
diff --git a/reference/zmq/book.xml b/reference/zmq/book.xml
index c32821cc36..d7d7ed1682 100644
--- a/reference/zmq/book.xml
+++ b/reference/zmq/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
 
 <book xml:id="book.zmq" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>ZMQ</title>
  <titleabbrev>0MQ messaging</titleabbrev>
 
diff --git a/reference/zmq/zmqcontext/construct.xml b/reference/zmq/zmqcontext/construct.xml
index 9847398588..1fe6719657 100644
--- a/reference/zmq/zmqcontext/construct.xml
+++ b/reference/zmq/zmqcontext/construct.xml
@@ -44,7 +44,14 @@
    </variablelist>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ZMQContextException</classname> if context initialization fails.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
  &reftitle.examples;
   <para>
@@ -77,13 +84,6 @@ $message = $socket->recv();
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Throws ZMQContextException if context initialization fails.
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zmq/zmqcontext/getsocket.xml b/reference/zmq/zmqcontext/getsocket.xml
index c50f6e78b1..94f2e42291 100644
--- a/reference/zmq/zmqcontext/getsocket.xml
+++ b/reference/zmq/zmqcontext/getsocket.xml
@@ -54,7 +54,21 @@
    </variablelist>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns a <classname>ZMQSocket</classname> object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ZMQSocketException</classname> on error.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
  &reftitle.examples;
   <para>
@@ -88,14 +102,6 @@ echo "Received message: {$message}\n";
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a ZMQSocket object on success. Throws ZMQSocketException on error.
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zmq/zmqdevice/getidletimeout.xml b/reference/zmq/zmqdevice/getidletimeout.xml
index c7bd9fb623..90d70b05f0 100644
--- a/reference/zmq/zmqdevice/getidletimeout.xml
+++ b/reference/zmq/zmqdevice/getidletimeout.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -25,7 +30,6 @@
   </para>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zmq/zmqdevice/gettimertimeout.xml b/reference/zmq/zmqdevice/gettimertimeout.xml
index 5a6b1849a7..535b197399 100644
--- a/reference/zmq/zmqdevice/gettimertimeout.xml
+++ b/reference/zmq/zmqdevice/gettimertimeout.xml
@@ -18,6 +18,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -25,7 +30,6 @@
   </para>
  </refsect1>
 
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zmq/zmqpoll/poll.xml b/reference/zmq/zmqpoll/poll.xml
index f1f6b62d24..58325577d4 100644
--- a/reference/zmq/zmqpoll/poll.xml
+++ b/reference/zmq/zmqpoll/poll.xml
@@ -58,7 +58,21 @@
    </variablelist>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an integer representing the amount of items with activity.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ZMQPollException</classname> on error.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
  &reftitle.examples;
   <para>
@@ -134,14 +148,6 @@ while (true) {
   </para>
  </refsect1> 
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer representing amount of items with activity. Throws ZMQPollException on error.
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zmq/zmqsocket/connect.xml b/reference/zmq/zmqsocket/connect.xml
index 65db2c7071..fe6612f5ff 100644
--- a/reference/zmq/zmqsocket/connect.xml
+++ b/reference/zmq/zmqsocket/connect.xml
@@ -43,7 +43,21 @@
    </variablelist>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the current object.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ZMQSocketException</classname> on error.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
  &reftitle.examples;
   <para>
@@ -84,14 +98,6 @@ echo "<p>Server said: {$message}</p>";
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current object. Throws ZMQSocketException on error.
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zmq/zmqsocket/construct.xml b/reference/zmq/zmqsocket/construct.xml
index 9eee5f9c6d..18317bf05e 100644
--- a/reference/zmq/zmqsocket/construct.xml
+++ b/reference/zmq/zmqsocket/construct.xml
@@ -60,21 +60,33 @@
        Callback function, which is executed when a new socket structure is created. This function does not get invoked
        if the underlying persistent connection is re-used.
       </para>
+      <methodsynopsis>
+       <methodname><replaceable>callback</replaceable></methodname>
+       <methodparam><type>ZMQSocket</type><parameter>socket</parameter></methodparam>
+       <methodparam choice="opt"><type>string</type><parameter>persistent_id</parameter><initializer>&null;</initializer></methodparam>
+      </methodsynopsis>
      </listitem>
     </varlistentry>    
    </variablelist>
   </para>
  </refsect1>
- 
-  <refsect1 role="examples">
-  &reftitle.examples;
-   <para>
-    <example>
-     <title>A <function>ZMQSocket</function> example</title>
-     <para>
-      Using callback the bind/connect socket
-     </para>
-     <programlisting role="php">
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ZMQSocketException</classname> on error.
+  </para>
+ </refsect1>
+
+ <refsect1 role="examples">
+ &reftitle.examples;
+  <para>
+   <example>
+    <title>A <function>ZMQSocket</function> example</title>
+    <para>
+     Using callback the bind/connect socket
+    </para>
+    <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -101,29 +113,10 @@ $message = $socket->recv();
 echo "Received message: {$message}\n";
 ?>
 ]]>
-     </programlisting>
-    </example>
-   </para>
-  </refsect1> 
- 
-  <refsect1 role="notes">
-   <para>
-    The callback signature
-    <note>
-     <para>
-      function on_new_socket_cb(ZMQSocket $socket, string $persistent_id = null);
-     </para>
-    </note>
-   </para>
-  </refsect1> 
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Throws ZMQSocketException on error.
+    </programlisting>
+   </example>
   </para>
- </refsect1>
-
+ </refsect1> 
 
 </refentry>
 
diff --git a/reference/zmq/zmqsocket/recv.xml b/reference/zmq/zmqsocket/recv.xml
index c9d5db5c66..b9a2e2820d 100644
--- a/reference/zmq/zmqsocket/recv.xml
+++ b/reference/zmq/zmqsocket/recv.xml
@@ -37,7 +37,22 @@
    </variablelist>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns the message. If <constant>ZMQ::MODE_DONTWAIT</constant> 
+   is used and the operation would block &false; shall be returned.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ZMQSocketException</classname> on error. 
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
  &reftitle.examples;
   <para>
@@ -96,16 +111,6 @@ Got response: This is a message
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the message. Throws ZMQSocketException in error. 
-   If <constant>ZMQ::MODE_DONTWAIT</constant> is used and the operation would 
-   block &boolean; false shall be returned.
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zookeeper/book.xml b/reference/zookeeper/book.xml
index ee7c606e61..6c5ac92f65 100644
--- a/reference/zookeeper/book.xml
+++ b/reference/zookeeper/book.xml
@@ -2,6 +2,7 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.zookeeper" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <?phpdoc extension-membership="pecl" ?>
  <title>ZooKeeper</title>
  <titleabbrev>ZooKeeper</titleabbrev>
  
diff --git a/reference/zookeeper/functions/zookeeper_dispatch.xml b/reference/zookeeper/functions/zookeeper_dispatch.xml
index 43800a8f78..f0c3be2045 100644
--- a/reference/zookeeper/functions/zookeeper_dispatch.xml
+++ b/reference/zookeeper/functions/zookeeper_dispatch.xml
@@ -5,6 +5,7 @@
   <refname>zookeeper_dispatch</refname>
   <refpurpose>Calls callbacks for pending operations</refpurpose>
  </refnamediv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -28,6 +29,18 @@
 
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/zookeeper/setup.xml b/reference/zookeeper/setup.xml
index ca22dd76a3..91ed2b3050 100644
--- a/reference/zookeeper/setup.xml
+++ b/reference/zookeeper/setup.xml
@@ -8,10 +8,8 @@
  <section xml:id="zookeeper.requirements">
   &reftitle.required;
   <para>
-   This extension requires <link xlink:href="&url.zookeeper;">ZooKeeper</link> C Binding (version 3.4.1 or greater). For more information, see <link xlink:href="&url.zookeeper.doc.cbinding;">ZooKeeper Programmer's Guide</link>.
-  </para>
-  <para>
-   This extension requires PHP version 5.2.0 or higher. Since 0.6.0, it requires PHP version 7.0.0 or higher.
+   This extension requires <link xlink:href="&url.zookeeper;">ZooKeeper</link> C Binding (version 3.4.1 or greater).
+   For more information, see <link xlink:href="&url.zookeeper.doc.cbinding;">ZooKeeper Programmer's Guide</link>.
   </para>
  </section>
  <!-- }}} -->
diff --git a/reference/zookeeper/zookeeper/close.xml b/reference/zookeeper/zookeeper/close.xml
index 654f4e4e3e..a61fb26eab 100644
--- a/reference/zookeeper/zookeeper/close.xml
+++ b/reference/zookeeper/zookeeper/close.xml
@@ -16,6 +16,18 @@
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/zookeeper/zookeeper/connect.xml b/reference/zookeeper/zookeeper/connect.xml
index b885e4b71c..92032d9353 100644
--- a/reference/zookeeper/zookeeper/connect.xml
+++ b/reference/zookeeper/zookeeper/connect.xml
@@ -52,6 +52,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/zookeeper/zookeeper/construct.xml b/reference/zookeeper/zookeeper/construct.xml
index 68d3889369..dbb69ba72c 100644
--- a/reference/zookeeper/zookeeper/construct.xml
+++ b/reference/zookeeper/zookeeper/construct.xml
@@ -51,6 +51,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/zookeeper/zookeeper/getclientid.xml b/reference/zookeeper/zookeeper/getclientid.xml
index 31732224ba..8fcc5281cf 100644
--- a/reference/zookeeper/zookeeper/getclientid.xml
+++ b/reference/zookeeper/zookeeper/getclientid.xml
@@ -16,6 +16,11 @@
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/zookeeper/zookeeper/getconfig.xml b/reference/zookeeper/zookeeper/getconfig.xml
index 9344b004a3..a9ed2c8fa5 100644
--- a/reference/zookeeper/zookeeper/getconfig.xml
+++ b/reference/zookeeper/zookeeper/getconfig.xml
@@ -16,10 +16,15 @@
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns instance of ZookeeperConfig.
+   Returns instance of <classname>ZookeeperConfig</classname>.
   </para>
  </refsect1>
 
diff --git a/reference/zookeeper/zookeeper/getrecvtimeout.xml b/reference/zookeeper/zookeeper/getrecvtimeout.xml
index f46ebe7460..d5005319f3 100644
--- a/reference/zookeeper/zookeeper/getrecvtimeout.xml
+++ b/reference/zookeeper/zookeeper/getrecvtimeout.xml
@@ -16,6 +16,11 @@
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/zookeeper/zookeeper/getstate.xml b/reference/zookeeper/zookeeper/getstate.xml
index aae4411453..3ba10cac8e 100644
--- a/reference/zookeeper/zookeeper/getstate.xml
+++ b/reference/zookeeper/zookeeper/getstate.xml
@@ -16,6 +16,11 @@
   </methodsynopsis>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/zookeeper/zookeeper/isrecoverable.xml b/reference/zookeeper/zookeeper/isrecoverable.xml
index 74aa500083..8625cbbecf 100644
--- a/reference/zookeeper/zookeeper/isrecoverable.xml
+++ b/reference/zookeeper/zookeeper/isrecoverable.xml
@@ -19,6 +19,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/zookeeper/zookeeperconfig/add.xml b/reference/zookeeper/zookeeperconfig/add.xml
index 8e58ecdf8b..17df9df74d 100644
--- a/reference/zookeeper/zookeeperconfig/add.xml
+++ b/reference/zookeeper/zookeeperconfig/add.xml
@@ -49,6 +49,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/zookeeper/zookeeperconfig/remove.xml b/reference/zookeeper/zookeeperconfig/remove.xml
index c942fee84b..c686583c26 100644
--- a/reference/zookeeper/zookeeperconfig/remove.xml
+++ b/reference/zookeeper/zookeeperconfig/remove.xml
@@ -48,6 +48,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/zookeeper/zookeeperconfig/set.xml b/reference/zookeeper/zookeeperconfig/set.xml
index 1adf9e5463..e0e904cf99 100644
--- a/reference/zookeeper/zookeeperconfig/set.xml
+++ b/reference/zookeeper/zookeeperconfig/set.xml
@@ -48,6 +48,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/security/cgi-bin.xml b/security/cgi-bin.xml
index a940e74dc2..4050d59940 100644
--- a/security/cgi-bin.xml
+++ b/security/cgi-bin.xml
@@ -84,9 +84,9 @@
      these configuration options.  If your web server does not allow
      you to do redirects, or the server does not have a way to
      communicate to the PHP binary that the request is a safely
-     redirected request, you can specify the option <link
-     linkend="configure.enable-force-cgi-redirect">--enable-force-cgi-redirect</link>
-     to the configure script.  You still have to make sure your PHP
+     redirected request, you can enable the
+     <link linkend="ini.cgi.force-redirect">cgi.force_redirect</link>
+     ini directive.  You still have to make sure your PHP
      scripts do not rely on one or another way of calling the script,
      neither by directly <filename
      role="php">http://my.host/cgi-bin/php/dir/script.php</filename>
@@ -216,9 +216,8 @@ AddHandler php-script .php
     <para>
      To get PHP to handle <envar>PATH_INFO</envar> and
      <envar>PATH_TRANSLATED</envar> information correctly with this
-     setup, the PHP parser should be compiled with the <link
-     linkend="configure.enable-discard-path">--enable-discard-path</link>
-     configure option.
+     setup, the <link linkend="ini.cgi.discard-path">cgi.discard_path</link>
+     ini directive has to be enabled.
     </para>
    </sect1>
 
diff --git a/security/sessions.xml b/security/sessions.xml
index 855dc52c1e..da087d8c19 100644
--- a/security/sessions.xml
+++ b/security/sessions.xml
@@ -5,7 +5,7 @@
 
   <para>
    It is important keeping HTTP session management secure. Session
-   releated security is described in 
+   related security is described in
    <link linkend="session.security">Session Security</link> section
    of <link linkend="book.session">Session module</link> reference.
   </para>